From 799376543af81e836b175b1eb71368f321b84416 Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Fri, 4 Feb 2011 11:26:22 +0000 Subject: added webcams - part 2 --- .../Application/Controllers/DownloadController.php | 30 ++++++--- h-source/Application/Include/languages.php | 10 +++ h-source/Application/Views/Download/index.php | 24 ++++--- h-source/Application/Views/Download/index_es.php | 78 ---------------------- h-source/Application/Views/Download/index_fr.php | 78 ---------------------- h-source/Application/Views/Download/index_it.php | 78 ---------------------- h-source/Config/Route.php | 1 + 7 files changed, 46 insertions(+), 253 deletions(-) delete mode 100644 h-source/Application/Views/Download/index_es.php delete mode 100644 h-source/Application/Views/Download/index_fr.php delete mode 100644 h-source/Application/Views/Download/index_it.php diff --git a/h-source/Application/Controllers/DownloadController.php b/h-source/Application/Controllers/DownloadController.php index cf5aa3c..6ad04dc 100644 --- a/h-source/Application/Controllers/DownloadController.php +++ b/h-source/Application/Controllers/DownloadController.php @@ -98,11 +98,9 @@ class DownloadController extends BaseController $xml .= "\t\t".$row['hardware']['wifi_type']."\n"; $xml .= "\t\t".$row['hardware']['video_card_type']."\n"; $xml .= "\t\t".$row['hardware']['webcam_type']."\n"; - } - - if ($type === 'notebook') - { $xml .= "\t\t".$row['hardware']['wifi_works']."\n"; + $xml .= "\t\t".$row['hardware']['video_card_works']."\n"; + $xml .= "\t\t".$row['hardware']['webcam_works']."\n"; } if ($type === '3G-card' or $type === 'wifi') @@ -114,21 +112,22 @@ class DownloadController extends BaseController { $xml .= "\t\t".$row['hardware']['sound_card_works']."\n"; } - - if ($type === 'notebook' or $type === 'videocard') + + if ($type === 'webcam') { - $xml .= "\t\t".$row['hardware']['video_card_works']."\n"; + $xml .= "\t\t".$row['hardware']['webcam_works']."\n"; } - if ($type === 'notebook') + if ($type === 'videocard') { - $xml .= "\t\t".$row['hardware']['webcam_works']."\n"; + $xml .= "\t\t".$row['hardware']['video_card_works']."\n"; } if ($type === 'printer' or $type === 'scanner' or $type === 'soundcard') { $xml .= "\t\t".$row['hardware']['driver']."\n"; } + $xml .= "\t\t\n"; $xml .= "\t\t".$this->baseUrl."/".MyStrings::$reverse[$type]."/view/".$this->lang."/".$row['hardware']['id_hard']."/".encodeUrl($row['hardware']['model'])."\n"; @@ -245,4 +244,17 @@ class DownloadController extends BaseController $this->clean(); $this->load('xml'); } + + 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'); + } } \ No newline at end of file diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php index a7498b7..e457f2e 100644 --- a/h-source/Application/Include/languages.php +++ b/h-source/Application/Include/languages.php @@ -157,6 +157,16 @@ class Lang "The following devices has not been found in the database" => "I seguenti device non sono stati trovati nel database", "can you please insert them?" => "puoi gentilmente inserirli?", "No webcams found" => "Non è stata trovata alcuna webcam", + "Download the xml file of all the database" => "Scarica il file xml di tutto il database", + "Download the xml file of all the notebooks in the database" => "Scarica il file xml di tutti i notebook presenti nel database", + "Download the xml file of all the wifi cards in the database" => "Scarica il file xml di tutte le schede wifi presenti nel database", + "Download the xml file of all the video cards in the database" => "Scarica il file xml di tutte le schede video presenti nel database", + "Download the xml file of all the printers in the database" => "Scarica il file xml di tutte le stampanti presenti nel database", + "Download the xml file of all the 3G cards in the database" => "Scarica il file xml di tutte le schede 3G presenti nel database", + "Download the xml file of all the sound cards in the database" => "Scarica il file xml di tutte le schede audio presenti nel database", + "Download the xml file of all the webcams in the database" => "Scarica il file xml di tutte le webcams presenti nel database", + "You can download all the h-node database in one unique xml file in order to parse its contents by means of some proper script (for example a Python or Perl or PHP script)" => "Puoi scaricare l'intero database di h-node in un unico file xml per analizzarne i contenuti utilizzando uno script appropriato (ad esempio uno script Python o Perl o PHP)", + "Download the h-node hardware database in xml format" => "Scarica il database dell'hardware di h-node in formato xml", ), 'es' => array ( diff --git a/h-source/Application/Views/Download/index.php b/h-source/Application/Views/Download/index.php index c13e0b3..c153fb8 100644 --- a/h-source/Application/Views/Download/index.php +++ b/h-source/Application/Views/Download/index.php @@ -29,46 +29,50 @@
- Download the h-node hardware database in xml format: + :
- You can download all the h-node database in one unique xml file in order to parse its contents by means of some proper script (for example a Python or Perl or PHP script) +
- + - + - + - + - + - + - + - + + + + +
Download the xml file of all the database ">
Download the xml file of all the notebooks in the databasenotebooks in the database");?> ">
Download the xml file of all the wifi cards in the databasewifi cards in the database");?> ">
Download the xml file of all the video cards in the databasevideo cards in the database");?> ">
Download the xml file of all the printers in the databaseprinters in the database");?> ">
Download the xml file of all the scanners in the databasescanners in the database");?> ">
Download the xml file of all the 3G cards in the database3G cards in the database");?> ">
Download the xml file of all the soundcards in the databasesound cards in the database");?> ">
webcams in the database");?>">
diff --git a/h-source/Application/Views/Download/index_es.php b/h-source/Application/Views/Download/index_es.php deleted file mode 100644 index 10051a4..0000000 --- a/h-source/Application/Views/Download/index_es.php +++ /dev/null @@ -1,78 +0,0 @@ - - -. -?> - -
- -
- ">Home » download -
- -
- -
- Descargue la base de datos de h-node.com en formato xml: -
- -
- Puede descargar toda la base de datos de h-node en un único archivo xml en orden de procesar sus contenidos por medio de un algoritmo (por ejemplo un algoritmo en Python o Perl o PHP) - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Descargue el archivo xml de toda la base de datos">
Descargue el archivo xml de todas las laptops en la base de datos">
Descargue el archivo xml de todas las tarjetas inalámbricas en la base de datos">
Descargue el archivo xml de todas las tarjetas de video en la base de datos">
Descargue el archivo xml de todas las impresoras en la base de datos">
Download the xml file of all the scanners in the database">
Download the xml file of all the 3G cards in the database">
Download the xml file of all the soundcards in the database">
-
-
- -
- -
diff --git a/h-source/Application/Views/Download/index_fr.php b/h-source/Application/Views/Download/index_fr.php deleted file mode 100644 index d178a6a..0000000 --- a/h-source/Application/Views/Download/index_fr.php +++ /dev/null @@ -1,78 +0,0 @@ - - -. -?> - -
- -
- ">Home » download -
- -
- -
- Télécharger la base de donnée h-node au format XML: -
- -
- Vous pouvez télécharger toute la base de donnée de h-node dans un unique fichier xml afin de gérer son contenus avec des scripts (Par exemple un script python perl ou php) - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Télécharger toute la base de donnée au format XML">
Télécharger la base de donnée de notebooks au format XML">
Télécharger la base de donnée de cartes wifi au format XML">
Télécharger la base de donnée de cartes graphique au format XML">
Télécharger la base de donnée d’imprimantes au format XML">
Télécharger la base de donnée de scanners au format XML">
Download the xml file of all the 3G cards in the database">
Download the xml file of all the soundcards in the database">
-
-
- -
- -
diff --git a/h-source/Application/Views/Download/index_it.php b/h-source/Application/Views/Download/index_it.php deleted file mode 100644 index 1428202..0000000 --- a/h-source/Application/Views/Download/index_it.php +++ /dev/null @@ -1,78 +0,0 @@ - - -. -?> - -
- -
- ">Home » download -
- -
- -
- Scarica il database dell'hardware di h-node in formato xml: -
- -
- Puoi scaricare l'intero database di h-node in un unico file xml per analizzarne i contenuti utilizzando uno script appropriato (ad esempio uno script Python o Perl o PHP) - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Scarica il file xml dell'intero database">
Scarica il file xml di tutti i notebooks del database">
Scarica il file xml di tutte le schede wifi del database">
Scarica il file xml di tutte le schede video del database">
Scarica il file xml di tutte le stampanti del database">
Scarica il file xml di tutti gli scanner del database">
Scarica il file xml di tutte le schede 3G cards del database">
Scarica il file xml di tutte le schede audio del database">
-
-
- -
- -
diff --git a/h-source/Config/Route.php b/h-source/Config/Route.php index 967bdc4..f0e91c8 100644 --- a/h-source/Config/Route.php +++ b/h-source/Config/Route.php @@ -98,6 +98,7 @@ class Route 'download,scanners', 'download,threegcards', 'download,soundcards', + 'download,webcams', 'history,hide', 'history,show', 'history,block', -- cgit v1.2.3