diff options
Diffstat (limited to 'h-source/Application/Models')
| -rw-r--r-- | h-source/Application/Models/HardwareModel.php | 20 | 
1 files changed, 10 insertions, 10 deletions
| diff --git a/h-source/Application/Models/HardwareModel.php b/h-source/Application/Models/HardwareModel.php index 9a40e4b..7978593 100644 --- a/h-source/Application/Models/HardwareModel.php +++ b/h-source/Application/Models/HardwareModel.php @@ -77,10 +77,10 @@ class HardwareModel extends Model_Map {  	{  		$this->strongConditions['update'] = array(  			"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", +			"checkMatch|".Hardware::$regExpressions['model']	=>	"model|characters not allowed in the <i>model name</i> entry", +			"+checkMatch|".Hardware::$regExpressions['vendorid_productid']	=>	"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",  			"+++checkIsStrings|".$worksOptions 	=> 	$worksField,  			"++++checkIsStrings|".$interfaceOptions	=> 	"interface", @@ -89,12 +89,12 @@ class HardwareModel extends Model_Map {  		$this->strongConditions['insert'] = $this->strongConditions['update'];  		$this->softConditions['update'] = array( -			"checkMatch|/^[a-zA-Z0-9\-\_\.\+\s]+$/"			=>	"kernel|characters not allowed in the <i>kernel</i> entry", -			"checkLength|20000"							=>	"description", -			"+checkLength|49"							=>	"kernel", -			"++checkLength|49"							=>	"driver", -			"++checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\/\,\:\;\(\)\[\]]+$/"	=>	"driver|only the following characters are allowed for the <i>driver</i> entry: a-z A-Z 0-9 - _ . + s / , : ; ( ) [ ]", -			"+++checkLength|1000"							=>	"other_names|the <i>other names</i> entry exceeds the value of 1000 characters", +			"checkMatch|".Hardware::$regExpressions['kernel']	=>	"kernel|characters not allowed in the <i>kernel</i> entry", +			"checkLength|20000"	=>	"description", +			"+checkLength|49"	=>	"kernel", +			"++checkLength|49"	=>	"driver", +			"++checkMatch|".Hardware::$regExpressions['driver']	=>	"driver|only the following characters are allowed for the <i>driver</i> entry: a-z A-Z 0-9 - _ . + s / , : ; ( ) [ ]", +			"+++checkLength|1000"	=>	"other_names|the <i>other names</i> entry exceeds the value of 1000 characters",  		);  		$this->softConditions['insert'] = $this->softConditions['update']; | 
