From 931861e0513be7e110fc1d98e366cbd4efb831ce Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Mon, 18 Apr 2011 16:09:47 +0000 Subject: h-source:added acquisition cards and fingerprint readers - part 1 --- h-source/Application/Include/distributions.php | 1 + h-source/Application/Include/hardware.php | 65 ++++++++++++++++++-------- h-source/Application/Include/languages.php | 30 ++++++++---- 3 files changed, 68 insertions(+), 28 deletions(-) (limited to 'h-source/Application/Include') diff --git a/h-source/Application/Include/distributions.php b/h-source/Application/Include/distributions.php index 5b91346..e15c224 100644 --- a/h-source/Application/Include/distributions.php +++ b/h-source/Application/Include/distributions.php @@ -26,6 +26,7 @@ class Distributions public static $allowed = array( 'blag_90001' => 'BLAG 90001', 'blag_120000' => 'BLAG 120000', + 'blag_140000' => 'BLAG 140000', 'dragora_1_1' => 'Dragora 1.1', 'dragora_2_0' => 'Dragora 2.0 Ardi', 'dynebolic_2_5_2' => 'Dynebolic 2.5.2 DHORUBA', diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php index 89ea519..c55515c 100644 --- a/h-source/Application/Include/hardware.php +++ b/h-source/Application/Include/hardware.php @@ -24,7 +24,7 @@ if (!defined('EG')) die('Direct access not allowed!'); class Hardware { - public static $controllers = array('notebooks','wifi','videocards','printers','scanners','threegcards','soundcards','webcams','bluetooth'); //used by UsersController::login() + public static $controllers = array('notebooks','wifi','videocards','printers','scanners','threegcards','soundcards','webcams','bluetooth','acquisitioncards','fingerprintreaders'); //used by UsersController::login() //classId => controller public static $deviceClasses = array( @@ -34,29 +34,38 @@ class Hardware ); public static $icons = array( - 'notebook' => 'H2O/computer-laptop_22.png', - 'wifi' => 'H2O/network-wireless_22.png', - 'videocard' => 'Crystal/1282042976_hardware.png', - 'printer' => 'H2O/printer_22.png', - 'scanner' => 'H2O/scanner_22.png', - '3G-card' => 'Crystal/usb_22.png', - 'soundcard' => 'H2O/audio-card_22.png', - 'webcam' => 'H2O/camera-web_22.png', - 'bluetooth' => 'H2O/preferences-system-bluetooth-22.png', + 'notebook' => 'H2O/computer-laptop_22.png', + 'wifi' => 'H2O/network-wireless_22.png', + 'videocard' => 'Crystal/1282042976_hardware.png', + 'printer' => 'H2O/printer_22.png', + 'scanner' => 'H2O/scanner_22.png', + '3G-card' => 'Crystal/usb_22.png', + 'soundcard' => 'H2O/audio-card_22.png', + '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', ); public static $typeToController = array( - 'notebook' => 'notebooks', - 'wifi' => 'wifi', - 'videocard' => 'videocards', - 'printer' => 'printers', - 'scanner' => 'scanners', - '3G-card' => 'threegcards', - 'soundcard' => 'soundcards', - 'webcam' => 'webcams', - 'bluetooth' => 'bluetooth', + 'notebook' => 'notebooks', + 'wifi' => 'wifi', + 'videocard' => 'videocards', + 'printer' => 'printers', + 'scanner' => 'scanners', + '3G-card' => 'threegcards', + 'soundcard' => 'soundcards', + 'webcam' => 'webcams', + 'bluetooth' => 'bluetooth', + 'acquisition-card' => 'acquisitioncards', + 'fingerprint-reader' => 'fingerprintreaders', ); + public static function getTypes() + { + return implode(',',array_keys(self::$typeToController)); + } + public static function getControllerFromType($type) { if (array_key_exists($type,self::$typeToController)) @@ -339,4 +348,22 @@ class Bluetooth extends Hardware public static $interface = "not-specified,USB,PCI,PCI-E,mini-PCI,mini-PCI-E,ExpressCard,PC-Card"; +} + +class Acquisitioncards extends Hardware +{ + + public static $select = 'yes,no'; + + public static $interface = "not-specified,USB,PCI,PCI-E,mini-PCI,mini-PCI-E,ExpressCard,PC-Card,Firewire,Parallel,Serial"; + +} + +class Fingerprintreaders extends Hardware +{ + + public static $select = 'yes,no'; + + public static $interface = "not-specified,USB,PCI,PCI-E,mini-PCI,mini-PCI-E,ExpressCard,PC-Card,Firewire,Parallel,Serial"; + } \ No newline at end of file diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php index 87f6eb3..6f80831 100644 --- a/h-source/Application/Include/languages.php +++ b/h-source/Application/Include/languages.php @@ -216,6 +216,8 @@ class Lang "learn how to find it" => "scopri come individuarlo", "Download the xml file of all the bluetooth devices in the database" => "Scarica il file xml di tutti i dispositivi bluetooth presenti nel database", "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", ), 'es' => array ( @@ -545,6 +547,7 @@ class Lang 'soundcards' => 'soundcard', 'webcams' => 'webcam', 'bluetooth' => 'bluetooth device', + 'acquisitioncards' => 'acquisition card', ), 'it' => array( 'notebooks' => 'notebook', @@ -556,6 +559,7 @@ class Lang 'soundcards' => 'soundcard', 'webcams' => 'webcam', 'bluetooth' => 'bluetooth device', + 'acquisitioncards' => 'acquisition card', ), 'es' => array( 'notebooks' => 'notebook', @@ -567,6 +571,7 @@ class Lang 'soundcards' => 'soundcard', 'webcams' => 'webcam', 'bluetooth' => 'bluetooth device', + 'acquisitioncards' => 'acquisition card', ), 'fr' => array( 'notebooks' => 'notebook', @@ -578,6 +583,7 @@ class Lang 'soundcards' => 'soundcard', 'webcams' => 'webcam', 'bluetooth' => 'bluetooth device', + 'acquisitioncards' => 'acquisition card', ), ); @@ -592,6 +598,7 @@ class Lang 'soundcards' => 'soundcards', 'webcams' => 'webcams', 'bluetooth' => 'bluetooth devices', + 'acquisitioncards' => 'acquisition cards', ), 'it' => array( 'notebooks' => 'notebooks', @@ -603,6 +610,7 @@ class Lang 'soundcards' => 'soundcards', 'webcams' => 'webcams', 'bluetooth' => 'bluetooth devices', + 'acquisitioncards' => 'acquisition cards', ), 'es' => array( 'notebooks' => 'notebooks', @@ -614,6 +622,7 @@ class Lang 'soundcards' => 'soundcards', 'webcams' => 'webcams', 'bluetooth' => 'bluetooth devices', + 'acquisitioncards' => 'acquisition cards', ), 'fr' => array( 'notebooks' => 'notebooks', @@ -625,6 +634,7 @@ class Lang 'soundcards' => 'soundcards', 'webcams' => 'webcams', 'bluetooth' => 'bluetooth devices', + 'acquisitioncards' => 'acquisition cards', ), ); @@ -666,15 +676,17 @@ class MyStrings //type => controller public static $reverse = array( - 'notebook' => 'notebooks', - 'wifi' => 'wifi', - 'videocard' => 'videocards', - 'printer' => 'printers', - 'scanner' => 'scanners', - '3G-card' => 'threegcards', - 'soundcard' => 'soundcards', - 'webcam' => 'webcams', - 'bluetooth' => 'bluetooth', + 'notebook' => 'notebooks', + 'wifi' => 'wifi', + 'videocard' => 'videocards', + 'printer' => 'printers', + 'scanner' => 'scanners', + '3G-card' => 'threegcards', + 'soundcard' => 'soundcards', + 'webcam' => 'webcams', + 'bluetooth' => 'bluetooth', + 'acquisition-card' => 'acquisitioncards', + 'fingerprint-reader' => 'fingerprintreaders', ); public static function getTypes() -- cgit v1.2.3