aboutsummaryrefslogtreecommitdiff
path: root/h-source/Application
diff options
context:
space:
mode:
authorAntonio Gallo <tonicucoz@gmail.com>2012-06-20 12:14:19 +0000
committerAntonio Gallo <tonicucoz@gmail.com>2012-06-20 12:14:19 +0000
commit712b1acd9cef92e121f7b5af95bcced91dbcc597 (patch)
tree7d9f5c5caa275f9496c0524c6a3357cbc0cfda28 /h-source/Application
parent52fab44f032332d1e6b53b99a09b5321f6a9e965 (diff)
changed the regular expr for the model name
Diffstat (limited to 'h-source/Application')
-rw-r--r--h-source/Application/Include/hardware.php2
-rw-r--r--h-source/Application/Include/myFunctions.php1
2 files changed, 2 insertions, 1 deletions
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('&#039;','-',$url);
$url = str_replace('@','-at-',$url);
$url = str_replace('?','-',$url);