diff options
| -rw-r--r-- | h-source/Application/Controllers/GenericController.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Include/myFunctions.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Include/vendors.php | 1 | ||||
| -rw-r--r-- | h-source/Application/Models/WikiModel.php | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/h-source/Application/Controllers/GenericController.php b/h-source/Application/Controllers/GenericController.php index 0bc3705..b6a5aac 100644 --- a/h-source/Application/Controllers/GenericController.php +++ b/h-source/Application/Controllers/GenericController.php @@ -292,7 +292,7 @@ class GenericController extends BaseController else { $this->m['HardwareModel']->result = false; - $this->m['HardwareModel']->notice = "<div class='alert'>Vendorid code non present in the list, please open an issue <a href='".$this->baseUrl."/issues/viewall/".Lang::$current."'>here</a> in order to ask the insertion of your vendor. NB: if it is a USB device, please choose the right interface. If it is not a USB device, and you are not sure about the right interface, choose not-defined, and it should work fine</div>\n"; + $this->m['HardwareModel']->notice = "<div class='alert'>Your vendor has not been found.<br /><br />Your vendorid code is not present in the list. If it is a USB device, please choose the right interface (USB), otherwise the system will check inside the PCI ID vendors' list. If it is not a USB device, and you are not sure about the right interface, choose not-defined, and it should work fine (the system will check inside the PCI ID vendors' list if you choose an interface other than USB). <br/><br />If your vendor has not been found yet, please open an issue <a href='".$this->baseUrl."/issues/viewall/".Lang::$current."'>here</a> in order to ask the insertion of your vendor.<br /><br />If your vendor has not been found you could also send your PCI ID or USB ID to the PCI ID repository (http://pciids.sourceforge.net/) or to the USB ID repository (http://www.linux-usb.org/usb-ids.html).</div>\n"; return false; } } 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\+\&]+)+)?(#[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\+\&]+)+)?(#[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\+\&]+)+)?(#[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( diff --git a/h-source/Application/Models/WikiModel.php b/h-source/Application/Models/WikiModel.php index 4c5e0d3..bfbc4ad 100644 --- a/h-source/Application/Models/WikiModel.php +++ b/h-source/Application/Models/WikiModel.php @@ -49,7 +49,7 @@ class WikiModel extends Model_Map { 'page' => gtext('the text of the wiki page'), ); - $this->fieldsWithBreaks = array(gtext('wiki page')); + $this->fieldsWithBreaks = array(gtext('the text of the wiki page')); $this->strongConditions['insert'] = array( "checkNotEmpty" => 'title', |