From 712b1acd9cef92e121f7b5af95bcced91dbcc597 Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Wed, 20 Jun 2012 12:14:19 +0000 Subject: changed the regular expr for the model name --- h-source/Application/Include/hardware.php | 2 +- h-source/Application/Include/myFunctions.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'h-source') diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php index e25c47c..507fcbc 100644 --- a/h-source/Application/Include/hardware.php +++ b/h-source/Application/Include/hardware.php @@ -41,7 +41,7 @@ class Hardware "kernel" => "/^[a-zA-Z0-9\-\_\.\+\s\(\)\,]+$/", "driver" => "/^[a-zA-Z0-9\-\_\.\+\s\/\,\:\;\(\)\[\]]+$/", "vendorid_productid" => "/^[a-zA-Z0-9]{4}(\:)[a-zA-Z0-9]{4}$/", - "model" => "/^[a-zA-Z0-9\-\_\.\+\s\(\)\@\[\]\/\,]+$/", + "model" => "/^[a-zA-Z0-9\-\_\.\+\s\(\)\@\[\]\/\,\']+$/", ); public static function translate($string) diff --git a/h-source/Application/Include/myFunctions.php b/h-source/Application/Include/myFunctions.php index bfcd8db..4f830f4 100644 --- a/h-source/Application/Include/myFunctions.php +++ b/h-source/Application/Include/myFunctions.php @@ -30,6 +30,7 @@ function encodeUrl($url) $url = str_replace('(','-',$url); $url = str_replace(')','-',$url); $url = str_replace('/','-',$url); + $url = str_replace(''','-',$url); $url = str_replace('@','-at-',$url); $url = str_replace('?','-',$url); -- cgit v1.2.3