dropped pcmcia controller, added generic host controller with subtype

3 files changed, 24 insertions, 16 deletions

diff --git a/h-source/Application/Controllers/DownloadController.php b/h-source/Application/Controllers/DownloadController.php
index 5e15e7e..98f362e 100644
--- a/h-source/Application/Controllers/DownloadController.php
+++ b/h-source/Application/Controllers/DownloadController.php
@@ -63,7 +63,7 @@ class DownloadController extends BaseController
 			$xml .= "\t\t<id>".$row['hardware']['id_hard']."</id>\n";
 			$xml .= "\t\t<type>".$row['hardware']['type']."</type>\n";
 			
-			if ($type === 'notebook' or $type === 'printer')
+			if ($type === 'notebook' or $type === 'printer' or $type === 'host-controller' )
 			{
 				$xml .= "\t\t<subtype>".$row['hardware']['subtype']."</subtype>\n";
 			}
@@ -116,7 +116,7 @@ class DownloadController extends BaseController
 			{
 				$xml .= "\t\t<it_works>".$row['hardware']['video_card_works']."</it_works>\n";
 			}
-			else if ($type === 'acquisition-card' or $type === 'modem' or $type === 'RAID-adapter' or $type === 'PCMCIA-controller')
+			else if ($type === 'acquisition-card' or $type === 'modem' or $type === 'RAID-adapter' or $type === 'host-controller')
 			{
 				$xml .= "\t\t<it_works>".$row['hardware']['compatibility']."</it_works>\n";
 			}
@@ -259,8 +259,8 @@ class DownloadController extends BaseController
 		$this->printXml($lang, array('type'=>'RAID-adapter','-deleted'=>'no'));
 	}
 	
-	public function pcmcia($lang = 'en')
+	public function hostcontrollers($lang = 'en')
 	{
-		$this->printXml($lang, array('type'=>'PCMCIA-controller','-deleted'=>'no'));
+		$this->printXml($lang, array('type'=>'host-controller','-deleted'=>'no'));
 	}
 }
\ No newline at end of file
diff --git a/h-source/Application/Controllers/PcmciaController.php b/h-source/Application/Controllers/HostcontrollersController.php
index 889ca0f..b1c9404 100644
--- a/h-source/Application/Controllers/PcmciaController.php
+++ b/h-source/Application/Controllers/HostcontrollersController.php
@@ -20,32 +20,36 @@
 
 if (!defined('EG')) die('Direct access not allowed!');
 
-class PcmciaController extends GenericController
+class HostcontrollersController extends GenericController
 {
 
 	public function __construct($model, $controller, $queryString)
 	{
 
-		$worksOptions = PCMCIAControllers::$select;
+		$worksOptions = Hostcontrollers::$select;
 		$worksField = 'compatibility';
-		$interfaceOptions = PCMCIAControllers::$interface;
+		$interfaceOptions = Hostcontrollers::$interface;
 		
 		parent::__construct($model, $controller, $queryString);
 		
 		//load the model
 		$this->model('HardwareModel');
 		$this->model('RevisionsModel');
-		$this->model('PcmciaModel');
+		$this->model('HostcontrollersModel');
 		$this->model('TalkModel');
 		
-		$this->mod = $this->m['PcmciaModel'];
+		$this->mod = $this->m['HostcontrollersModel'];
 		
 		$this->m['HardwareModel']->id_user = $this->s['registered']->status['id_user'];
-		$this->m['HardwareModel']->type = 'PCMCIA-controller';
+		$this->m['HardwareModel']->type = 'host-controller';
 
 		$this->m['HardwareModel']->setConditions($worksOptions,$worksField,$interfaceOptions);
 
-		$this->m['HardwareModel']->setFields('model,kernel,description,distribution,comm_year,compatibility,pci_id,interface,driver,other_names','sanitizeAll');
+		$this->m['HardwareModel']->strongConditions['insert']["+++++checkIsStrings|".Hostcontrollers::subtypeList()] = "subtype";
+		
+		$this->m['HardwareModel']->strongConditions['update'] = $this->m['HardwareModel']->strongConditions['insert'];
+		
+		$this->m['HardwareModel']->setFields('model,kernel,description,distribution,comm_year,compatibility,pci_id,interface,driver,subtype,other_names','sanitizeAll');
 		
 		$argKeys = array(
 			'page:forceNat'						=>	1,
@@ -53,26 +57,28 @@ class PcmciaController extends GenericController
 			'vendor:sanitizeString'				=>	'undef',
 			'comm_year:sanitizeString'			=>	'undef',
 			'compatibility:sanitizeString'		=>	'undef',
-			'interface:sanitizeString'			=>	'undef',
+			'subtype:sanitizeString'			=>	'undef',
 			'sort-by:sanitizeString'			=>	'undef',
 			'search_string:sanitizeString'		=>	'undef'
 		);
 
 		$this->setArgKeys($argKeys);
 		
-		$data['title'] = 'Acquisition cards';
+		$data['title'] = 'Host controller';
 
 		$data['intefaceOptions'] = $interfaceOptions;
 		$data['worksOptions'] = $worksOptions;
 		$data['worksField'] = $worksField;
 
-		$data['notFoundString'] = "No PCMCIA Controller found";
+		$data['notFoundString'] = "No Host Controller found";
+		
+		$data['subtypeHelpLabel'] = "PCMCIA, USB, Firewire, HECI";
 		
 		$this->append($data);
 	}
 	
 	public function catalogue($lang = 'en')
-	{		
+	{
 		$this->shift(1);
 		
 		$whereArray = array(
@@ -80,7 +86,7 @@ class PcmciaController extends GenericController
 			'vendor'			=>	$this->viewArgs['vendor'],
 			'comm_year'			=>	$this->viewArgs['comm_year'],
 			'compatibility'		=>	$this->viewArgs['compatibility'],
-			'interface'			=>	$this->viewArgs['interface'],
+			'subtype'			=>	$this->viewArgs['subtype'],
 		);
 		
 		$this->mod->setWhereQueryClause($whereArray);
diff --git a/h-source/Application/Controllers/PrintersController.php b/h-source/Application/Controllers/PrintersController.php
index baedda8..acf1b59 100644
--- a/h-source/Application/Controllers/PrintersController.php
+++ b/h-source/Application/Controllers/PrintersController.php
@@ -89,6 +89,8 @@ class PrintersController extends GenericController
 
 		$data['notFoundString'] = "No printers found";
 		
+		$data['subtypeHelpLabel'] = "laser, inkjet, ..";
+		
 		$this->append($data);
 	}