From 930a411469143eab9ee3922fc628c7d0b5665438 Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Tue, 19 Apr 2011 15:24:36 +0000 Subject: h-source:added acquisition cards and fingerptint readers - part 2 --- .../Application/Controllers/DownloadController.php | 25 ++++++++++++++++++--- .../Application/Controllers/WikiController.php | 7 +++++- h-source/Application/Include/hardware.php | 2 +- h-source/Application/Include/languages.php | 2 ++ h-source/Application/Views/Download/index.php | 8 +++++++ h-source/Application/Views/Hardware/left.php | 2 +- h-source/Config/Route.php | 2 ++ h-source/Credits.txt | 4 ++++ h-source/Public/Img/fingerprint_icon-22.png | Bin 0 -> 1314 bytes h-source/Public/Img/fingerprint_icon.png | Bin 0 -> 5032 bytes 10 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 h-source/Public/Img/fingerprint_icon-22.png create mode 100644 h-source/Public/Img/fingerprint_icon.png 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".$row['hardware']['compatibility']."\n"; } - + if ($type === 'notebook') { $xml .= "\t\t".$row['hardware']['wifi_type']."\n"; @@ -128,7 +128,17 @@ class DownloadController extends BaseController $xml .= "\t\t".$row['hardware']['video_card_works']."\n"; } - $devicesWithDriverEntry = array('printer','scanner','soundcard','webcam','bluetooth','wifi','videocard'); + if ($type === 'acquisition-card') + { + $xml .= "\t\t".$row['hardware']['compatibility']."\n"; + } + + if ($type === 'fingerprint-reader') + { + $xml .= "\t\t".$row['hardware']['fingerprint_works']."\n"; + } + + $devicesWithDriverEntry = array('printer','scanner','soundcard','webcam','bluetooth','wifi','videocard','acquisition-card','fingerprint-reader'); if (in_array($type,$devicesWithDriverEntry)) { $xml .= "\t\t".$row['hardware']['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 acquisition cards in the database" => "Scarica il file xml di tutte le schede di acquisizione presenti nel database", + "Download the xml file of all the fingerprint readers in the database" => "Scarica il file xml di tutti i lettori di impronte digitali 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 @@ bluetooth devices in the database");?> "> + + acquisition cards in the database");?> + "> + + + fingerprint readers in the database");?> + "> + 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 @@
- Fingerprint readers + Fingerprint readers
\ No newline at end of file diff --git a/h-source/Config/Route.php b/h-source/Config/Route.php index e340a53..5ede113 100644 --- a/h-source/Config/Route.php +++ b/h-source/Config/Route.php @@ -101,6 +101,8 @@ class Route 'download,soundcards', 'download,webcams', 'download,bluetooth', + 'download,acquisitioncards', + 'download,fingerprintreaders', 'history,hide', 'history,show', 'history,block', diff --git a/h-source/Credits.txt b/h-source/Credits.txt index 0e2adb1..83407f6 100644 --- a/h-source/Credits.txt +++ b/h-source/Credits.txt @@ -32,3 +32,7 @@ license: GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Icons: The icons used inside h-node.com are taken from the ACUN Simgeleri 0.7 incon theme (http://kde-look.org/content/show.php/ACUN+Simgeleri?content=83018) and from the H2O Icon Theme 0.0.5 (http://kde-look.org/content/show.php/ACUN+Simgeleri?content=83018), both licensed under the GNU GPL license, from the Crystal Projects icons (http://www.everaldo.com/crystal/?action=downloads), licensed under the LGPL, from the glaze icons set (http://www.notmart.org/index.php/Graphics) (LGPL) and from the DarkGlass_Reworked icons theme (http://kde-look.org/content/show.php/Dark-Glass+reviewed?content=67902) (GPL). The flag icons are taken from the FAMFAMFAM (http://www.famfamfam.com/lab/icons/flags/) icons set (Public Domain) +Fingerprint icons: +The fingerprint icons (listed below) are a derived work from a wikipedia fingerprint icon (http://en.wikipedia.org/wiki/File:Fingerprint_picture.svg) licensed under Creative Commons Attribution-Share Alike 3.0 Unported (http://creativecommons.org/licenses/by-sa/3.0/deed.en) +Public/Img/fingerprint_icon.png +Public/Img/fingerprint_icon-22.png \ No newline at end of file diff --git a/h-source/Public/Img/fingerprint_icon-22.png b/h-source/Public/Img/fingerprint_icon-22.png new file mode 100644 index 0000000..5593419 Binary files /dev/null and b/h-source/Public/Img/fingerprint_icon-22.png differ diff --git a/h-source/Public/Img/fingerprint_icon.png b/h-source/Public/Img/fingerprint_icon.png new file mode 100644 index 0000000..989ba28 Binary files /dev/null and b/h-source/Public/Img/fingerprint_icon.png differ -- cgit v1.2.3