added PCMCIA controllers - part 2

4 files changed, 49 insertions, 46 deletions

diff --git a/h-source/Application/Controllers/DownloadController.php b/h-source/Application/Controllers/DownloadController.php
index 7994329..5e15e7e 100644
--- a/h-source/Application/Controllers/DownloadController.php
+++ b/h-source/Application/Controllers/DownloadController.php
@@ -86,6 +86,7 @@ class DownloadController extends BaseController
 			$xml .= "\t\t<kernel_libre>".$row['hardware']['kernel']."</kernel_libre>\n";
 			$xml .= "\t\t<distribution>".$row['hardware']['distribution']."</distribution>\n";
 			$xml .= "\t\t<year>".$row['hardware']['comm_year']."</year>\n";
+			
 			if ($type !== 'notebook')
 			{
 				$xml .= "\t\t<interface>".$row['hardware']['interface']."</interface>\n";
@@ -95,67 +96,58 @@ class DownloadController extends BaseController
 			{
 				$xml .= "\t\t<compatibility>".$row['hardware']['compatibility']."</compatibility>\n";
 			}
-
-			if ($type === 'printer')
-			{
-				$xml .= "\t\t<it_tracks_users>".$row['hardware']['it_tracks_users']."</it_tracks_users>\n";
-			}
-			
-			if ($type === 'notebook')
-			{
-				$xml .= "\t\t<wifi_card>".$row['hardware']['wifi_type']."</wifi_card>\n";
-				$xml .= "\t\t<videocard>".$row['hardware']['video_card_type']."</videocard>\n";
-				$xml .= "\t\t<webcam>".$row['hardware']['webcam_type']."</webcam>\n";
-				$xml .= "\t\t<wifi_works>".$row['hardware']['wifi_works']."</wifi_works>\n";
-				$xml .= "\t\t<videocard_works>".$row['hardware']['video_card_works']."</videocard_works>\n";
-				$xml .= "\t\t<webcam_works>".$row['hardware']['webcam_works']."</webcam_works>\n";
-			}
-			
-			if ($type === '3G-card' or $type === 'wifi')
+			else if ($type === '3G-card' or $type === 'wifi')
 			{
 				$xml .= "\t\t<it_works>".$row['hardware']['wifi_works']."</it_works>\n";
 			}
-			
-			if ($type === 'soundcard')
+			else if ($type === 'soundcard')
 			{
 				$xml .= "\t\t<it_works>".$row['hardware']['sound_card_works']."</it_works>\n";
 			}
-
-			if ($type === 'bluetooth')
+			else if ($type === 'bluetooth')
 			{
 				$xml .= "\t\t<it_works>".$row['hardware']['bluetooth_works']."</it_works>\n";
 			}
-
-			if ($type === 'webcam')
+			else if ($type === 'webcam')
 			{
 				$xml .= "\t\t<it_works>".$row['hardware']['webcam_works']."</it_works>\n";
 			}
-			
-			if ($type === 'videocard')
+			else if ($type === 'videocard')
 			{
 				$xml .= "\t\t<it_works>".$row['hardware']['video_card_works']."</it_works>\n";
 			}
-
-			if ($type === 'acquisition-card' or $type === 'modem' or $type === 'RAID-adapter')
+			else if ($type === 'acquisition-card' or $type === 'modem' or $type === 'RAID-adapter' or $type === 'PCMCIA-controller')
 			{
 				$xml .= "\t\t<it_works>".$row['hardware']['compatibility']."</it_works>\n";
 			}
-
-			if ($type === 'fingerprint-reader')
+			else if ($type === 'fingerprint-reader')
 			{
 				$xml .= "\t\t<it_works>".$row['hardware']['fingerprint_works']."</it_works>\n";
 			}
-
-			if ($type === 'ethernet-card')
+			else if ($type === 'ethernet-card')
 			{
 				$xml .= "\t\t<it_works>".$row['hardware']['ethernet_card_works']."</it_works>\n";
 			}
-
-			if ($type === 'sd-card-reader')
+			else if ($type === 'sd-card-reader')
 			{
 				$xml .= "\t\t<it_works>".$row['hardware']['sd_card_works']."</it_works>\n";
 			}
-
+			
+			if ($type === 'printer')
+			{
+				$xml .= "\t\t<it_tracks_users>".$row['hardware']['it_tracks_users']."</it_tracks_users>\n";
+			}
+			
+			if ($type === 'notebook')
+			{
+				$xml .= "\t\t<wifi_card>".$row['hardware']['wifi_type']."</wifi_card>\n";
+				$xml .= "\t\t<videocard>".$row['hardware']['video_card_type']."</videocard>\n";
+				$xml .= "\t\t<webcam>".$row['hardware']['webcam_type']."</webcam>\n";
+				$xml .= "\t\t<wifi_works>".$row['hardware']['wifi_works']."</wifi_works>\n";
+				$xml .= "\t\t<videocard_works>".$row['hardware']['video_card_works']."</videocard_works>\n";
+				$xml .= "\t\t<webcam_works>".$row['hardware']['webcam_works']."</webcam_works>\n";
+			}
+			
 			if ($type !== "notebook")
 			{
 				$xml .= "\t\t<driver>".$row['hardware']['driver']."</driver>\n";
@@ -266,4 +258,9 @@ class DownloadController extends BaseController
 	{
 		$this->printXml($lang, array('type'=>'RAID-adapter','-deleted'=>'no'));
 	}
+	
+	public function pcmcia($lang = 'en')
+	{
+		$this->printXml($lang, array('type'=>'PCMCIA-controller','-deleted'=>'no'));
+	}
 }
\ No newline at end of file
diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php
index 4ea3ae9..fa87142 100644
--- a/h-source/Application/Include/languages.php
+++ b/h-source/Application/Include/languages.php
@@ -384,6 +384,7 @@ class Lang
 				/*0324*/"Download the xml file of all the <b>RAID adapters</b> in the database"	=>	"Scarica il file xml di tutti gli <b>adattatori RAID</b> presenti nel database",
 				/*0325*/"No PCMCIA Controller found"	=>	"Nessun controller PCMCIA è stato trovato",
 				/*0326*/"PCMCIA Controllers"	=>	"Controller PCMCIA",
+				/*0327*/"Download the xml file of all the <b>PCMCIA Controllers</b> in the database"	=>	"Scarica il file xml di tutti i <b>Controller PCMCIA</b> presenti nel database",
 			),
 		'es'	=>	array
 			(
@@ -1566,7 +1567,7 @@ class Lang
 			/*13*/'sdcardreaders'		=>	'sd card reader',
 			/*14*/'modems'		=>	'modem',
 			/*15*/'raidadapters'		=>	'RAID adapter',
-			/*16*/'pcmcia'		=>	'PCMCIA Controller',
+			/*16*/'pcmcia'		=>	'PCMCIA controller',
 		),
 		'it'	=>	array(
 			'notebooks'		=>	'notebook',
@@ -1584,7 +1585,7 @@ class Lang
 			'sdcardreaders'		=>	'lettore di schede sd',
 			'modems'		=>	'modem',
 			'raidadapters'		=>	'adattatore RAID',
-			'pcmcia'		=>	'Controller PCMCIA',
+			'pcmcia'		=>	'controller PCMCIA',
 		),
 		'es'	=>	array(
 			'notebooks'		=>	'portátil',
@@ -1602,7 +1603,7 @@ class Lang
 			'sdcardreaders'		=>	'lector de tarjetas sd',
 			'modems'		=>	'modem',
 			'raidadapters'		=>	'RAID adapter',
-			'pcmcia'		=>	'PCMCIA Controller',
+			'pcmcia'		=>	'PCMCIA controller',
 		),
 		'fr'	=>	array(
 			'notebooks'		=>	'notebook',
@@ -1620,7 +1621,7 @@ class Lang
 			'sdcardreaders'		=>	'lecteur de carte SD',
 			'modem'		=>	'modem',
 			'raidadapters'		=>	'RAID adapter',
-			'pcmcia'		=>	'PCMCIA Controller',
+			'pcmcia'		=>	'PCMCIA controller',
 		),
 		'de'	=>	array(
 			'notebooks'		=>	'notebook',
@@ -1638,7 +1639,7 @@ class Lang
 			'sdcardreaders'		=>	'sd card reader',
 			'modems'		=>	'modem',
 			'raidadapters'		=>	'RAID adapter',
-			'pcmcia'		=>	'PCMCIA Controller',
+			'pcmcia'		=>	'PCMCIA controller',
 		),
 		'gr'	=>	array(
 			/*01*/'notebooks'		=>	'Υπο-φορητοί υπολογιστές',
@@ -1656,7 +1657,7 @@ class Lang
 			/*13*/'sdcardreaders'		=>	'Συσκευές ανάγνωσης καρτών sd',
 			/*14*/'modems'		=>	'Συσκευές modem',
 			/*15*/'raidadapters'		=>	'RAID adapter',
-			'pcmcia'		=>	'PCMCIA Controller',
+			'pcmcia'		=>	'PCMCIA controller',
 		),
 	);
 
@@ -1677,7 +1678,7 @@ class Lang
 			/*13*/'sdcardreaders'		=>	'sd card readers',
 			/*14*/'modems'		=>	'modems',
 			/*15*/'raidadapters'		=>	'RAID adapters',
-			/*16*/'pcmcia'		=>	'PCMCIA Controllers',
+			/*16*/'pcmcia'		=>	'PCMCIA controllers',
 		),
 		'it'	=>	array(
 			/*01*/'notebooks'		=>	'notebook',
@@ -1695,7 +1696,7 @@ class Lang
 			/*13*/'sdcardreaders'		=>	'lettori di schede sd',
 			/*14*/'modems'		=>	'modem',
 			/*15*/'raidadapters'		=>	'adattatori RAID',
-			/*16*/'pcmcia'		=>	'Controller PCMCIA',
+			/*16*/'pcmcia'		=>	'controller PCMCIA',
 		),
 		'es'	=>	array(
 			/*01*/'notebooks'		=>	'portátiles',
@@ -1713,7 +1714,7 @@ class Lang
 			/*13*/'sdcardreaders'		=>	'lectores de tarjetas sd',
 			/*14*/'modems'		=>	'modems',
 			/*15*/'raidadapters'		=>	'RAID adapters',
-			/*16*/'pcmcia'		=>	'PCMCIA Controllers',
+			/*16*/'pcmcia'		=>	'PCMCIA controllers',
 		),
 		'fr'	=>	array(
 			/*01*/'notebooks'		=>	'notebooks',
@@ -1731,7 +1732,7 @@ class Lang
 			/*13*/'sdcardreaders'		=>	'lecteurs de cartes SD',
 			/*14*/'modems'		=>	'modems',
 			/*15*/'raidadapters'		=>	'RAID adapters',
-			/*16*/'pcmcia'		=>	'PCMCIA Controllers',
+			/*16*/'pcmcia'		=>	'PCMCIA controllers',
 		),
 		'de'	=>	array(
 			/*01*/'notebooks'		=>	'notebooks',
@@ -1749,7 +1750,7 @@ class Lang
 			/*13*/'sdcardreaders'		=>	'sd card readers',
 			/*14*/'modems'		=>	'modems',
 			/*15*/'raidadapters'		=>	'RAID adapters',
-			/*16*/'pcmcia'		=>	'PCMCIA Controllers',
+			/*16*/'pcmcia'		=>	'PCMCIA controllers',
 		),
 		'gr'	=>	array(
 			/*01*/'notebooks'		=>	'Υπο-φορητοί υπολογιστές',
@@ -1767,7 +1768,7 @@ class Lang
 			/*13*/'sdcardreaders'		=>	'Συσκευές ανάγνωσης καρτών sd',
 			/*14*/'modems'		=>	'Συσκευές modem',
 			/*15*/'raidadapters'		=>	'RAID adapters',
-			/*16*/'pcmcia'		=>	'PCMCIA Controllers',
+			/*16*/'pcmcia'		=>	'PCMCIA controllers',
 		),
 	);
 	
diff --git a/h-source/Application/Views/Desktop/Download/index.php b/h-source/Application/Views/Desktop/Download/index.php
index 1ceca5a..31aa3b0 100644
--- a/h-source/Application/Views/Desktop/Download/index.php
+++ b/h-source/Application/Views/Desktop/Download/index.php
@@ -101,6 +101,10 @@
 							<td><?php echo gtext("Download the xml file of all the <b>RAID adapters</b> in the database");?></td>
 							<td><a href="<?php echo $this->baseUrl."/download/raidadapters/$lang";?>"><img src="<?php echo $this->baseUrl?>/Public/Img/H2O/download.png"></a></td>
 						</tr>
+						<tr>
+							<td><?php echo gtext("Download the xml file of all the <b>PCMCIA Controllers</b> in the database");?></td>
+							<td><a href="<?php echo $this->baseUrl."/download/pcmcia/$lang";?>"><img src="<?php echo $this->baseUrl?>/Public/Img/H2O/download.png"></a></td>
+						</tr>
 					</table>
 				</div>
 			</div>
diff --git a/h-source/Config/Route.php b/h-source/Config/Route.php
index 4e93499..46f1908 100644
--- a/h-source/Config/Route.php
+++ b/h-source/Config/Route.php
@@ -126,6 +126,7 @@ class Route
 		'download,sdcardreaders',
 		'download,modems',
 		'download,raidadapters',
+		'download,pcmcia',
 		'history,hide',
 		'history,show',
 		'history,block',