improved the way validate conditions are set

1 files changed, 8 insertions, 43 deletions

diff --git a/h-source/Application/Controllers/AcquisitioncardsController.php b/h-source/Application/Controllers/AcquisitioncardsController.php
index 0a4090a..4e320d9 100644
--- a/h-source/Application/Controllers/AcquisitioncardsController.php
+++ b/h-source/Application/Controllers/AcquisitioncardsController.php
@@ -27,6 +27,10 @@ class AcquisitioncardsController extends GenericController
 	{
 		
 		$this->_topMenuClasses['hardware'] = " class='currentitem'";
+
+		$worksOptions = Acquisitioncards::$select;
+		$worksField = 'compatibility';
+		$interfaceOptions = Acquisitioncards::$interface;
 		
 		parent::__construct($model, $controller, $queryString);
 		
@@ -41,47 +45,8 @@ class AcquisitioncardsController extends GenericController
 		$this->m['HardwareModel']->id_user = $this->s['registered']->status['id_user'];
 		$this->m['HardwareModel']->type = 'acquisition-card';
 
-		//hardware conditions
-		$this->m['HardwareModel']->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",
-			"++checkIsStrings|".Wifi::$commYear	=> 	"comm_year",
-			"+++checkIsStrings|".Acquisitioncards::$select 	=> 	"compatibility",
-			"++++checkIsStrings|".Acquisitioncards::$interface	=> 	"interface",
-		);
-
-		$this->m['HardwareModel']->strongConditions['insert'] = 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",
-			"++checkIsStrings|".Wifi::$commYear	=> 	"comm_year",
-			"+++checkIsStrings|".Acquisitioncards::$select 	=> 	"compatibility",
-			"++++checkIsStrings|".Acquisitioncards::$interface	=> 	"interface",
-		);
+		$this->m['HardwareModel']->setConditions($worksOptions,$worksField,$interfaceOptions);
 
-		$this->m['HardwareModel']->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",
-		);
-		
-		$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",
-			"++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",
-		);
-		
 		$this->m['HardwareModel']->setFields('model,kernel,description,distribution,comm_year,compatibility,pci_id,interface,driver,other_names','sanitizeAll');
 		
 		$argKeys = array(
@@ -98,9 +63,9 @@ class AcquisitioncardsController extends GenericController
 		
 		$data['title'] = 'Acquisition cards';
 
-		$data['intefaceOptions'] = Acquisitioncards::$interface;
-		$data['worksOptions'] = Acquisitioncards::$select;
-		$data['worksField'] = 'compatibility';
+		$data['intefaceOptions'] = $interfaceOptions;
+		$data['worksOptions'] = $worksOptions;
+		$data['worksField'] = $worksField;
 		$this->append($data);
 	}