added modems category - michael issue

2 files changed, 27 insertions, 4 deletions

diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php
index 91a66be..8248316 100644
--- a/h-source/Application/Include/hardware.php
+++ b/h-source/Application/Include/hardware.php
@@ -42,8 +42,6 @@ class Hardware
 		return $string;
 	}
 	
-	public static $controllers = array('notebooks','wifi','videocards','printers','scanners','threegcards','soundcards','webcams','bluetooth','acquisitioncards','fingerprintreaders','ethernetcards','sdcardreaders'); //used by UsersController::login()
-
 	//classId => controller
 	public static $deviceClasses = array(
 		'0403'	=>	'soundcards',
@@ -69,7 +67,8 @@ class Hardware
 		'acquisition-card'		=>	'Crystal/cam_mount-22.png',
 		'fingerprint-reader'	=>	'fingerprint_icon-22.png',
 		'ethernet-card'			=>	'H2O/network-wired_22.png',
-		'sd-card-reader'			=>	'H2O/media-flash-sd-mmc_22.png',
+		'sd-card-reader'		=>	'H2O/media-flash-sd-mmc_22.png',
+		'modem'					=>	'Crystal/modem_22.png',
 	);
 
 	public static $typeToController = array(
@@ -86,6 +85,7 @@ class Hardware
 		'fingerprint-reader'	=>	'fingerprintreaders',
 		'ethernet-card'			=>	'ethernetcards',
 		'sd-card-reader'		=>	'sdcardreaders',
+		'modem'					=>	'modems',
 	);
 
 	public static function getTypes()
@@ -427,4 +427,13 @@ class Sdcardreaders extends Hardware
 
 	public static $interface = "not-specified,USB,PCI,PCI-E,mini-PCI,mini-PCI-E,ExpressCard,PC-Card,Firewire,Parallel,Serial";
 
+}
+
+class Modems 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 a4c4254..ad67f4d 100644
--- a/h-source/Application/Include/languages.php
+++ b/h-source/Application/Include/languages.php
@@ -312,7 +312,10 @@ class Lang
 				/*0264*/"This issue is closed"	=>	"Questa questione è stata chiusa",
 				/*0265*/"This issue is opened"	=>	"Questa questione è aperta",
 				/*0266*/"does it adopt any techniques to track users?"	=>	"adotta qualche tecnica per tracciare gli utenti?",
-				/*0267*/"Actions carried out by users"	=>	"Azioni compiute dagli utenti"
+				/*0267*/"Actions carried out by users"	=>	"Azioni compiute dagli utenti",
+				/*0268*/"No modems found"	=>	"Non è stato trovato alcun modem",
+				/*0269*/"Download the xml file of all the <b>modems</b> in the database"	=>	"Scarica il file xml di tutti i <b>modem</b> presenti nel database",
+				/*0270*/"Modems and ADSL cards"	=>	"Modem e schede ADSL",
 			),
 		'es'	=>	array
 			(
@@ -1046,6 +1049,7 @@ class Lang
 			'fingerprintreaders'		=>	'fingerprint reader',
 			'ethernetcards'		=>	'ethernet card',
 			'sdcardreaders'		=>	'sd card reader',
+			'modems'		=>	'modem',
 		),
 		'it'	=>	array(
 			'notebooks'		=>	'notebook',
@@ -1061,6 +1065,7 @@ class Lang
 			'fingerprintreaders'		=>	'lettore di impronte digitali',
 			'ethernetcards'		=>	'scheda ethernet',
 			'sdcardreaders'		=>	'lettore di schede sd',
+			'modems'		=>	'modem',
 		),
 		'es'	=>	array(
 			'notebooks'		=>	'portátil',
@@ -1076,6 +1081,7 @@ class Lang
 			'fingerprintreaders'		=>	'lector de huella digital',
 			'ethernetcards'		=>	'tarjeta de ethernet',
 			'sdcardreaders'		=>	'lector de tarjetas sd',
+			'modems'		=>	'modem',
 		),
 		'fr'	=>	array(
 			'notebooks'		=>	'notebook',
@@ -1091,6 +1097,7 @@ class Lang
 			'fingerprintreaders'		=>	'lecteur d\'empreintes digitales',
 			'ethernetcards'		=>	'carte ethernet',
 			'sdcardreaders'		=>	'sd card reader',
+			'modems'		=>	'modem',
 		),
 		'de'	=>	array(
 			'notebooks'		=>	'notebook',
@@ -1106,6 +1113,7 @@ class Lang
 			'fingerprintreaders'		=>	'fingerprint reader',
 			'ethernetcards'		=>	'ethernet card',
 			'sdcardreaders'		=>	'sd card reader',
+			'modems'		=>	'modem',
 		),
 	);
 
@@ -1124,6 +1132,7 @@ class Lang
 			'fingerprintreaders'		=>	'fingerprint readers',
 			'ethernetcards'		=>	'ethernet cards',
 			'sdcardreaders'		=>	'sd card readers',
+			'modems'		=>	'modems',
 		),
 		'it'	=>	array(
 			'notebooks'		=>	'notebook',
@@ -1139,6 +1148,7 @@ class Lang
 			'fingerprintreaders'		=>	'lettori di impronte digitali',
 			'ethernetcards'		=>	'schede ethernet',
 			'sdcardreaders'		=>	'lettori di schede sd',
+			'modems'		=>	'modem',
 		),
 		'es'	=>	array(
 			'notebooks'		=>	'portátiles',
@@ -1154,6 +1164,7 @@ class Lang
 			'fingerprintreaders'		=>	'lectores de huella digital',
 			'ethernetcards'		=>	'tarjetas de ethernet',
 			'sdcardreaders'		=>	'lectores de tarjetas sd',
+			'modems'		=>	'modems',
 		),
 		'fr'	=>	array(
 			'notebooks'		=>	'notebooks',
@@ -1169,6 +1180,7 @@ class Lang
 			'fingerprintreaders'		=>	'lecteurs d\'empreintes digitales ',
 			'ethernetcards'		=>	'cartes ethernet',
 			'sdcardreaders'		=>	'sd card readers',
+			'modems'		=>	'modems',
 		),
 		'de'	=>	array(
 			'notebooks'		=>	'notebooks',
@@ -1184,6 +1196,7 @@ class Lang
 			'fingerprintreaders'		=>	'fingerprint readers',
 			'ethernetcards'		=>	'ethernet cards',
 			'sdcardreaders'		=>	'sd card readers',
+			'modems'		=>	'modems',
 		),
 	);
 	
@@ -1238,6 +1251,7 @@ class MyStrings
 		'fingerprint-reader'	=>	'fingerprintreaders',
 		'ethernet-card'		=>	'ethernetcards',
 		'sd-card-reader'	=>	'sdcardreaders',
+		'modem'				=>	'modems',
 	);
 
 	public static function getTypes()