aboutsummaryrefslogtreecommitdiff
path: root/h-source/Application/Include
diff options
context:
space:
mode:
authorAntonio Gallo <tonicucoz@gmail.com>2011-03-04 10:22:52 +0000
committerAntonio Gallo <tonicucoz@gmail.com>2011-03-04 10:22:52 +0000
commit0a1bbc3293fc57494286a13b520aac77028993b9 (patch)
treece141853add4924f59aa41ffdaeb558d00ca3261 /h-source/Application/Include
parent5b9a78c91853f019fb5252da7021bc81b92da9cc (diff)
minor improvements
Diffstat (limited to 'h-source/Application/Include')
-rw-r--r--h-source/Application/Include/myFunctions.php2
-rw-r--r--h-source/Application/Include/vendors.php1
2 files changed, 2 insertions, 1 deletions
diff --git a/h-source/Application/Include/myFunctions.php b/h-source/Application/Include/myFunctions.php
index efa4eca..cdb5358 100644
--- a/h-source/Application/Include/myFunctions.php
+++ b/h-source/Application/Include/myFunctions.php
@@ -268,7 +268,7 @@ function checkUrl($url)
{
// $match = '/^http\:\/\/(www\.)?[a-zA-Z0-9\-\_]+(\.[a-zA-Z0-9\-\_]+)?\.(com|net|it|info|org|eu|uk)((\/[a-zA-Z0-9\_\-\+]+)+[\/]?)?(\?([a-zA-Z0-9\_\-\+\s]+\=[a-zA-Z0-9\_\-\s\+\&amp;]+)+)?(#[a-zA-Z0-9\_\-\+\s]+)?([\s]*)?$/';
- $match = '/^http\:\/\/(www\.)?[a-zA-Z0-9\-\_]+(\.[a-zA-Z0-9\-\_]+)?\.(com|net|it|info|org|eu|uk|ca)((\/[a-zA-Z0-9\_\-\+]+)*(\/([a-zA-Z0-9\_\-\.\+]+\.(php|html|htm|asp|aspx|jsp|cgi))?)?)?(\?([a-zA-Z0-9\_\-\+\s]+\=[a-zA-Z0-9\_\-\s\+\&amp;]+)+)?(#[a-zA-Z0-9\_\-\+\s]+)?([\s]*)?$/';
+ $match = '/^http\:\/\/(www\.)?[a-zA-Z0-9\-\_]+(\.[a-zA-Z0-9\-\_]+)?\.(com|net|it|info|org|eu|uk|ca|us|cl)((\/[a-zA-Z0-9\_\-\+]+)*(\/([a-zA-Z0-9\_\-\.\+]+\.(php|html|htm|asp|aspx|jsp|cgi))?)?)?(\?([a-zA-Z0-9\_\-\+\s]+\=[a-zA-Z0-9\_\-\s\+\&amp;]+)+)?(#[a-zA-Z0-9\_\-\+\s]+)?([\s]*)?$/';
if (preg_match($match,$url))
{
diff --git a/h-source/Application/Include/vendors.php b/h-source/Application/Include/vendors.php
index 3210349..3473195 100644
--- a/h-source/Application/Include/vendors.php
+++ b/h-source/Application/Include/vendors.php
@@ -1807,6 +1807,7 @@ class Vendors
'fede' => 'Fedetec-Inc.',
'fffd' => 'XenSource-Inc.',
'1039' => 'Silicon-Integrated-Systems',
+ 'A259' => 'Hewlett-Packard',
);
public static $usbId = array(