diff options
Diffstat (limited to 'h-source/Application/Controllers/WifiController.php')
| -rw-r--r-- | h-source/Application/Controllers/WifiController.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/h-source/Application/Controllers/WifiController.php b/h-source/Application/Controllers/WifiController.php index 8cf38e7..3b8f0f0 100644 --- a/h-source/Application/Controllers/WifiController.php +++ b/h-source/Application/Controllers/WifiController.php @@ -43,9 +43,9 @@ class WifiController extends GenericController //hardware conditions $this->m['HardwareModel']->strongConditions['update'] = array( - "checkIsStrings|".Wifi::vendorsList() => "vendor", "checkNotEmpty" => "model|you have to fill the <i>model name</i> entry", "checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\(\)\[\]\/]+$/" => "model|characters not allowed in the <i>model name</i> entry", + "+checkMatch|/^[a-zA-Z0-9]{4}(\:)[a-zA-Z0-9]{4}$/" => "pci_id|<i>VendorID:ProductID</i> has to have the following format: [a-zA-Z0-9]{4}(\:)[a-zA-Z0-9]{4}", "checkLength|99" => "model", "+checkLength|299" => "distribution", "++checkIsStrings|".Wifi::$commYear => "comm_year", @@ -54,9 +54,9 @@ class WifiController extends GenericController ); $this->m['HardwareModel']->strongConditions['insert'] = array( - "checkIsStrings|".Wifi::vendorsList() => "vendor", "checkNotEmpty" => "model|you have to fill the <i>model name</i> entry", "checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\(\)\[\]\/]+$/" => "model|characters not allowed in the <i>model name</i> entry", + "+checkMatch|/^[a-zA-Z0-9]{4}(\:)[a-zA-Z0-9]{4}$/" => "pci_id|<i>VendorID:ProductID</i> has to have the following format: [a-zA-Z0-9]{4}(\:)[a-zA-Z0-9]{4}", "checkLength|99" => "model", "+checkLength|299" => "distribution", "++checkIsStrings|".Wifi::$commYear => "comm_year", @@ -68,17 +68,15 @@ class WifiController extends GenericController "checkMatch|/^[a-zA-Z0-9\-\_\.\+\s]+$/" => "kernel|characters not allowed in the <i>kernel</i> entry", "checkLength|20000" => "description", "+checkLength|49" => "kernel", - "+checkMatch|/^[a-zA-Z0-9]{4}(\:)[a-zA-Z0-9]{4}$/" => "pci_id|<i>VendorID:ProductID</i> has to have the following format: [a-zA-Z0-9]{4}(\:)[a-zA-Z0-9]{4}", ); $this->m['HardwareModel']->softConditions['insert'] = array( "checkMatch|/^[a-zA-Z0-9\-\_\.\+\s]+$/" => "kernel|characters not allowed in the <i>kernel</i> entry", "checkLength|20000" => "description", "+checkLength|49" => "kernel", - "+checkMatch|/^[a-zA-Z0-9]{4}(\:)[a-zA-Z0-9]{4}$/" => "pci_id|<i>VendorID:ProductID</i> has to have the following format: [a-zA-Z0-9]{4}(\:)[a-zA-Z0-9]{4}", ); - $this->m['HardwareModel']->setFields('vendor,model,kernel,description,distribution,comm_year,wifi_works,pci_id,interface','sanitizeAll'); + $this->m['HardwareModel']->setFields('model,kernel,description,distribution,comm_year,wifi_works,pci_id,interface','sanitizeAll'); $argKeys = array( 'page:forceNat' => 1, |