From fdd5ccda63a6c6825035f99c3e6b6df93814cebe Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Wed, 2 Mar 2011 23:48:56 +0000 Subject: vendor is now automatically obtained from vendorid, except for notebooks --- h-source/Application/Controllers/BluetoothController.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'h-source/Application/Controllers/BluetoothController.php') diff --git a/h-source/Application/Controllers/BluetoothController.php b/h-source/Application/Controllers/BluetoothController.php index c763aa6..4730081 100644 --- a/h-source/Application/Controllers/BluetoothController.php +++ b/h-source/Application/Controllers/BluetoothController.php @@ -43,7 +43,6 @@ class BluetoothController extends GenericController //hardware conditions $this->m['HardwareModel']->strongConditions['update'] = array( - "checkIsStrings|".Bluetooth::vendorsList() => "vendor", "checkNotEmpty" => "model|you have to fill the model name entry", "checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\(\)\@\[\]\/]+$/" => "model|characters not allowed in the model name entry", "checkLength|99" => "model", @@ -54,7 +53,6 @@ class BluetoothController extends GenericController ); $this->m['HardwareModel']->strongConditions['insert'] = array( - "checkIsStrings|".Bluetooth::vendorsList() => "vendor", "checkNotEmpty" => "model|you have to fill the model name entry", "checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\(\)\@\[\]\/]+$/" => "model|characters not allowed in the model name entry", "checkLength|99" => "model", @@ -82,7 +80,7 @@ class BluetoothController extends GenericController "++checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\/\,\:\;\(\)\[\]]+$/" => "driver|only the following characters are allowed for the driver entry: a-z A-Z 0-9 - _ . + s / , : ; ( ) [ ]", ); - $this->m['HardwareModel']->setFields('vendor,model,kernel,description,distribution,comm_year,bluetooth_works,pci_id,interface,driver','sanitizeAll'); + $this->m['HardwareModel']->setFields('model,kernel,description,distribution,comm_year,bluetooth_works,pci_id,interface,driver','sanitizeAll'); $argKeys = array( 'page:forceNat' => 1, -- cgit v1.2.3