h-source:added acquisition cards and fingerptint readers - part 2

6 files changed, 40 insertions, 6 deletions

diff --git a/h-source/Application/Controllers/DownloadController.php b/h-source/Application/Controllers/DownloadController.php
index fba20f0..bfc4346 100644
--- a/h-source/Application/Controllers/DownloadController.php
+++ b/h-source/Application/Controllers/DownloadController.php
@@ -92,7 +92,7 @@ class DownloadController extends BaseController
 			{
 				$xml .= "\t\t<compatibility>".$row['hardware']['compatibility']."</compatibility>\n";
 			}
-			
+
 			if ($type === 'notebook')
 			{
 				$xml .= "\t\t<wifi_card>".$row['hardware']['wifi_type']."</wifi_card>\n";
@@ -128,7 +128,17 @@ class DownloadController extends BaseController
 				$xml .= "\t\t<it_works>".$row['hardware']['video_card_works']."</it_works>\n";
 			}
 
-			$devicesWithDriverEntry = array('printer','scanner','soundcard','webcam','bluetooth','wifi','videocard');
+			if ($type === 'acquisition-card')
+			{
+				$xml .= "\t\t<it_works>".$row['hardware']['compatibility']."</it_works>\n";
+			}
+
+			if ($type === 'fingerprint-reader')
+			{
+				$xml .= "\t\t<it_works>".$row['hardware']['fingerprint_works']."</it_works>\n";
+			}
+			
+			$devicesWithDriverEntry = array('printer','scanner','soundcard','webcam','bluetooth','wifi','videocard','acquisition-card','fingerprint-reader');
 			if (in_array($type,$devicesWithDriverEntry))
 			{
 				$xml .= "\t\t<driver>".$row['hardware']['driver']."</driver>\n";
@@ -209,5 +219,14 @@ class DownloadController extends BaseController
 	{
 		$this->printXml($lang, array('type'=>'bluetooth','-deleted'=>'no'));
 	}
-	
+
+	public function acquisitioncards($lang = 'en')
+	{
+		$this->printXml($lang, array('type'=>'acquisition-card','-deleted'=>'no'));
+	}
+
+	public function fingerprintreaders($lang = 'en')
+	{
+		$this->printXml($lang, array('type'=>'fingerprint-reader','-deleted'=>'no'));
+	}
 }
\ No newline at end of file
diff --git a/h-source/Application/Controllers/WikiController.php b/h-source/Application/Controllers/WikiController.php
index 8f389e5..0e05ffd 100644
--- a/h-source/Application/Controllers/WikiController.php
+++ b/h-source/Application/Controllers/WikiController.php
@@ -61,6 +61,7 @@ class WikiController extends BaseController
 				if ($this->m['WikiModel']->queryResult)
 				{
 					header('Location: http://'.DOMAIN_NAME.'/wiki/page/'.$this->lang.'/'.$this->m['WikiModel']->lastTitleClean);
+					die();
 				}
 			}
 			
@@ -120,6 +121,7 @@ class WikiController extends BaseController
 					if ($this->m['WikiModel']->queryResult)
 					{
 						header('Location: http://'.DOMAIN_NAME.'/wiki/page/'.$this->lang.'/'.$this->m['WikiModel']->lastTitleClean);
+						die();
 					}
 				}
 
@@ -140,6 +142,7 @@ class WikiController extends BaseController
 			else
 			{
 				header('Location: http://'.DOMAIN_NAME."/users/login/".$this->lang."?redirect=".$this->controller."/page/".$this->lang."/".titleForRedirect($title));
+				die();
 			}
 		}
 		else
@@ -200,6 +203,7 @@ class WikiController extends BaseController
 					$newTitle = $this->m['WikiModel']->getTheModelName($clean['idWiki']);
 					$n = titleForRedirect($newTitle);
 					header('Location: http://'.DOMAIN_NAME.'/wiki/page/'.$this->lang.'/'.$n);
+					die();
 				}
 				else
 				{
@@ -425,6 +429,7 @@ class WikiController extends BaseController
 					if ($this->m['WikiModel']->queryResult)
 					{
 						header('Location: http://'.DOMAIN_NAME.'/wiki/page/'.$this->lang.'/'.$this->m['WikiModel']->lastTitleClean);
+						die();
 					}
 
 					$data['notice'] = $this->m['WikiModel']->notice;
@@ -476,7 +481,7 @@ class WikiController extends BaseController
 				if ($this->m['WikitalkModel']->queryResult)
 				{
 					header('Refresh: 0;url=http://'.DOMAIN_NAME.$_SERVER['REQUEST_URI']);
-					exit;
+					die();
 				}
 			}
 		}
diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php
index c55515c..17ea425 100644
--- a/h-source/Application/Include/hardware.php
+++ b/h-source/Application/Include/hardware.php
@@ -44,7 +44,7 @@ class Hardware
 		'webcam'				=>	'H2O/camera-web_22.png',
 		'bluetooth'				=>	'H2O/preferences-system-bluetooth-22.png',
 		'acquisition-card'		=>	'Crystal/cam_mount-22.png',
-		'fingerprint-reader'	=>	'Crystal/cam_mount-22.png',
+		'fingerprint-reader'	=>	'fingerprint_icon-22.png',
 	);
 
 	public static $typeToController = array(
diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php
index 6f80831..db2d717 100644
--- a/h-source/Application/Include/languages.php
+++ b/h-source/Application/Include/languages.php
@@ -218,6 +218,8 @@ class Lang
 				"License information"	=>	"Informazioni sulla licenza",
 				"No acquisition card found"	=>	"Non è stata trovata alcuna scheda d'acquisizione",
 				"No fingerprint readers found"	=>	"Non è stato trovato alcun lettore di impronte digitali",
+				"Download the xml file of all the <b>acquisition cards</b> in the database"	=>	"Scarica il file xml di tutte le <b>schede di acquisizione</b> presenti nel database",
+				"Download the xml file of all the <b>fingerprint readers</b> in the database"	=>	"Scarica il file xml di tutti i <b>lettori di impronte digitali</b> presenti nel database",
 			),
 		'es'	=>	array
 			(
diff --git a/h-source/Application/Views/Download/index.php b/h-source/Application/Views/Download/index.php
index 1eb2a63..5fbbef8 100644
--- a/h-source/Application/Views/Download/index.php
+++ b/h-source/Application/Views/Download/index.php
@@ -77,6 +77,14 @@
 							<td><?php echo gtext("Download the xml file of all the <b>bluetooth devices</b> in the database");?></td>
 							<td><a href="<?php echo $this->baseUrl."/download/bluetooth/$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>acquisition cards</b> in the database");?></td>
+							<td><a href="<?php echo $this->baseUrl."/download/acquisitioncards/$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>fingerprint readers</b> in the database");?></td>
+							<td><a href="<?php echo $this->baseUrl."/download/fingerprintreaders/$lang";?>"><img src="<?php echo $this->baseUrl?>/Public/Img/H2O/download.png"></a></td>
+						</tr>
 					</table>
 				</div>
 			</div>
diff --git a/h-source/Application/Views/Hardware/left.php b/h-source/Application/Views/Hardware/left.php
index 4583a9c..101a6ce 100644
--- a/h-source/Application/Views/Hardware/left.php
+++ b/h-source/Application/Views/Hardware/left.php
@@ -67,7 +67,7 @@
 		</div>
 
 		<div class="hardware_element">
-			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/cam_mount.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/fingerprintreaders/catalogue/<?php echo $lang;?>">Fingerprint readers</a>
+			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/fingerprint_icon.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/fingerprintreaders/catalogue/<?php echo $lang;?>">Fingerprint readers</a>
 		</div>
 		
 	</div>
\ No newline at end of file