h-source: added the driver entry for wifi and videocards

3 files changed, 32 insertions, 89 deletions

diff --git a/h-source/Application/Controllers/DownloadController.php b/h-source/Application/Controllers/DownloadController.php
index 744d338..fba20f0 100644
--- a/h-source/Application/Controllers/DownloadController.php
+++ b/h-source/Application/Controllers/DownloadController.php
@@ -127,8 +127,9 @@ class DownloadController extends BaseController
 			{
 				$xml .= "\t\t<it_works>".$row['hardware']['video_card_works']."</it_works>\n";
 			}
-			
-			if ($type === 'printer' or $type === 'scanner' or $type === 'soundcard' or $type === 'webcam' or $type === 'bluetooth')
+
+			$devicesWithDriverEntry = array('printer','scanner','soundcard','webcam','bluetooth','wifi','videocard');
+			if (in_array($type,$devicesWithDriverEntry))
 			{
 				$xml .= "\t\t<driver>".$row['hardware']['driver']."</driver>\n";
 			}
@@ -146,133 +147,67 @@ class DownloadController extends BaseController
 		return $xml;
 	}
 
-	public function all($lang = 'en')
+	protected function printXml($lang = 'en', $whereArray)
 	{
 		header ("Content-Type:text/xml");
-		
-		$res = $this->m['HardwareModel']->clear()->select()->where(array('-deleted'=>'no'))->orderBy("type,hardware.id_hard")->send();
+
+		$res = $this->m['HardwareModel']->clear()->select()->where($whereArray)->orderBy("type,hardware.id_hard")->send();
 
 		$data['xml'] = $this->getXml($res);
-		
+
 		$this->append($data);
 		$this->clean();
 		$this->load('xml');
 	}
 
-	public function notebooks($lang = 'en')
+	public function all($lang = 'en')
 	{
-		header ("Content-Type:text/xml");
-
-		$res = $this->m['HardwareModel']->clear()->select()->where(array('type'=>'notebook','-deleted'=>'no'))->orderBy("type,hardware.id_hard")->send();
+		$this->printXml($lang, array('-deleted'=>'no'));
+	}
 
-		$data['xml'] = $this->getXml($res);
-		
-		$this->append($data);
-		$this->clean();
-		$this->load('xml');
+	public function notebooks($lang = 'en')
+	{
+		$this->printXml($lang, array('type'=>'notebook','-deleted'=>'no'));
 	}
 	
 	public function wifi($lang = 'en')
 	{
-		header ("Content-Type:text/xml");
-
-		$res = $this->m['HardwareModel']->clear()->select()->where(array('type'=>'wifi','-deleted'=>'no'))->orderBy("type,hardware.id_hard")->send();
-
-		$data['xml'] = $this->getXml($res);
-		
-		$this->append($data);
-		$this->clean();
-		$this->load('xml');
+		$this->printXml($lang, array('type'=>'wifi','-deleted'=>'no'));
 	}
 	
 	public function videocards($lang = 'en')
 	{
-		header ("Content-Type:text/xml");
-
-		$res = $this->m['HardwareModel']->clear()->select()->where(array('type'=>'videocard','-deleted'=>'no'))->orderBy("type,hardware.id_hard")->send();
-
-		$data['xml'] = $this->getXml($res);
-		
-		$this->append($data);
-		$this->clean();
-		$this->load('xml');
+		$this->printXml($lang, array('type'=>'videocard','-deleted'=>'no'));
 	}
 
 	public function printers($lang = 'en')
 	{
-		header ("Content-Type:text/xml");
-
-		$res = $this->m['HardwareModel']->clear()->select()->where(array('type'=>'printer','-deleted'=>'no'))->orderBy("type,hardware.id_hard")->send();
-
-		$data['xml'] = $this->getXml($res);
-		
-		$this->append($data);
-		$this->clean();
-		$this->load('xml');
+		$this->printXml($lang, array('type'=>'printer','-deleted'=>'no'));
 	}
 	
 	public function scanners($lang = 'en')
 	{
-		header ("Content-Type:text/xml");
-
-		$res = $this->m['HardwareModel']->clear()->select()->where(array('type'=>'scanner','-deleted'=>'no'))->orderBy("type,hardware.id_hard")->send();
-
-		$data['xml'] = $this->getXml($res);
-		
-		$this->append($data);
-		$this->clean();
-		$this->load('xml');
+		$this->printXml($lang, array('type'=>'scanner','-deleted'=>'no'));
 	}
 	
 	public function threegcards($lang = 'en')
 	{
-		header ("Content-Type:text/xml");
-
-		$res = $this->m['HardwareModel']->clear()->select()->where(array('type'=>'3G-card','-deleted'=>'no'))->orderBy("type,hardware.id_hard")->send();
-
-		$data['xml'] = $this->getXml($res);
-		
-		$this->append($data);
-		$this->clean();
-		$this->load('xml');
+		$this->printXml($lang, array('type'=>'3G-card','-deleted'=>'no'));
 	}
 	
 	public function soundcards($lang = 'en')
 	{
-		header ("Content-Type:text/xml");
-
-		$res = $this->m['HardwareModel']->clear()->select()->where(array('type'=>'soundcard','-deleted'=>'no'))->orderBy("type,hardware.id_hard")->send();
-
-		$data['xml'] = $this->getXml($res);
-		
-		$this->append($data);
-		$this->clean();
-		$this->load('xml');
+		$this->printXml($lang, array('type'=>'soundcard','-deleted'=>'no'));
 	}
 
 	public function webcams($lang = 'en')
 	{
-		header ("Content-Type:text/xml");
-
-		$res = $this->m['HardwareModel']->clear()->select()->where(array('type'=>'webcam','-deleted'=>'no'))->orderBy("type,hardware.id_hard")->send();
-
-		$data['xml'] = $this->getXml($res);
-
-		$this->append($data);
-		$this->clean();
-		$this->load('xml');
+		$this->printXml($lang, array('type'=>'webcam','-deleted'=>'no'));
 	}
 
 	public function bluetooth($lang = 'en')
 	{
-		header ("Content-Type:text/xml");
-
-		$res = $this->m['HardwareModel']->clear()->select()->where(array('type'=>'bluetooth','-deleted'=>'no'))->orderBy("type,hardware.id_hard")->send();
-
-		$data['xml'] = $this->getXml($res);
-
-		$this->append($data);
-		$this->clean();
-		$this->load('xml');
+		$this->printXml($lang, array('type'=>'bluetooth','-deleted'=>'no'));
 	}
+	
 }
\ No newline at end of file
diff --git a/h-source/Application/Controllers/VideocardsController.php b/h-source/Application/Controllers/VideocardsController.php
index 3e47961..d6df28c 100644
--- a/h-source/Application/Controllers/VideocardsController.php
+++ b/h-source/Application/Controllers/VideocardsController.php
@@ -68,15 +68,19 @@ class VideocardsController extends GenericController
 			"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 / , : ; ( ) [ ]",
 		);
 		
 		$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 / , : ; ( ) [ ]",
 		);
 		
-		$this->m['HardwareModel']->setFields('model,kernel,description,distribution,video_card_works,comm_year,pci_id,interface','sanitizeAll');
+		$this->m['HardwareModel']->setFields('model,kernel,description,distribution,video_card_works,comm_year,pci_id,interface,driver','sanitizeAll');
 		
 		$argKeys = array(
 			'page:forceNat'					=>	1,
diff --git a/h-source/Application/Controllers/WifiController.php b/h-source/Application/Controllers/WifiController.php
index 3b8f0f0..8002b09 100644
--- a/h-source/Application/Controllers/WifiController.php
+++ b/h-source/Application/Controllers/WifiController.php
@@ -68,15 +68,19 @@ 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",
+			"++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 / , : ; ( ) [ ]",
 		);
 		
 		$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 / , : ; ( ) [ ]",
 		);
 		
-		$this->m['HardwareModel']->setFields('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,driver','sanitizeAll');
 		
 		$argKeys = array(
 			'page:forceNat'					=>	1,