added 3G cards

3 files changed, 61 insertions, 43 deletions

diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php
index 67df1f6..828585f 100644
--- a/h-source/Application/Include/hardware.php
+++ b/h-source/Application/Include/hardware.php
@@ -22,7 +22,7 @@ if (!defined('EG')) die('Direct access not allowed!');
 class Hardware
 {
 	
-	public static $controllers = array('notebooks','wifi','videocards','printers','scanners'); //used by UsersController::login()
+	public static $controllers = array('notebooks','wifi','videocards','printers','scanners','threegcards'); //used by UsersController::login()
 
 	public static $commYear = 'not-specified,2010,2009,2008,2007,2006,2005,2004,2003,2002,2001,2000,1999,1998,1997,1996,1995,1994,1993,1992';
 
@@ -216,4 +216,31 @@ class Notebooks extends Hardware
 		return implode(',',array_values(self::$compatibility));
 	}
 	
+}
+
+class ThreeGcards extends hardware
+{
+	public static $vendors = array(
+		"AT&T"				=>	"AT-T",
+		"BandRich"			=>	"BandRich",
+		"Franklin Wireless Corporation"	=>	"Franklin-Wireless-Corporation",
+		"Huawei"			=>	"Huawei",
+		"Novatel Wireless"	=>	"Novatel-Wireless",
+		"Option"			=>	"Option",
+		"Sierra Wireless"	=>	"Sierra-Wireless",
+		"T-Mobile"			=>	"T-Mobile",
+		"UTStarcom"			=>	"UTStarcom",
+		"verizon"			=>	"verizon",
+		"Vodafone"			=>	"Vodafone",
+		"ZTE"				=>	"ZTE",
+	);
+
+	public static $interface = "not-specified,USB,PCI,PCI-E,mini-PCI,mini-PCI-E,ExpressCard,PC-Card";
+	
+	public static $select = 'yes,no';
+	
+	public static function vendorsList()
+	{
+		return implode(',',array_values(self::$vendors));
+	}
 }
\ No newline at end of file
diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php
index 8351a88..e442c33 100644
--- a/h-source/Application/Include/languages.php
+++ b/h-source/Application/Include/languages.php
@@ -94,6 +94,8 @@ class Lang
 				"No wifi cards found"		=>	"Non è stata trovata alcuna scheda wifi",
 				"does it work with free software?"	=>	"funziona con il software libero?",
 				"differences in the entry"		=>	"differenze nel campo",
+				"No 3G cards found"			=>	"Non è stata trovata alcuna scheda 3G",
+				"Please specify in the below description entry the Internet Service Provider (ISP) and the country where the service is provided"	=>	"Per favore specifica nel sottostante campo descrizione l'Internet Service Provider (ISP) e il Paese dove il servizio viene fornito",
 			),
 		'es'	=>	array
 			(
@@ -173,134 +175,109 @@ class MyStrings
 	public static $view = array(
 		
 		'en' =>	array(
-		
 			'notebooks' => array(
-			
 				'element' => 'notebook'
-				
 			),
 			
 			'wifi'		=>	array(
-			
 				'element' => 'wifi card'
-				
 			),
 			
 			'videocards'=>	array(
-			
 				'element' => 'video card'
-				
 			),
 			
 			'printers'=>	array(
-			
 				'element' => 'printer'
-				
 			),
 			
 			'scanners'=>	array(
-			
 				'element' => 'scanner'
-				
+			),
+
+			'threegcards' => array(
+				'element' => '3G-card',
 			),
 		),
 		
 		'fr' =>	array(
 		
 			'notebooks' => array(
-			
 				'element' => 'notebook'
-				
 			),
 			
 			'wifi'		=>	array(
-			
 				'element' => 'wifi card'
-				
 			),
 			
 			'videocards'=>	array(
-			
 				'element' => 'video card'
-				
 			),
 			
 			'printers'=>	array(
-			
 				'element' => 'printer'
-				
 			),
 			
 			'scanners'=>	array(
-			
 				'element' => 'scanner'
-				
+			),
+			
+			'threegcards' => array(
+				'element' => '3G-card',
 			),
 		),
 		
 		'it' =>	array(
 		
 			'notebooks' => array(
-			
 				'element' => 'notebook'
-				
 			),
 			
 			'wifi'		=>	array(
-			
 				'element' => 'wifi card'
-				
 			),
 			
 			'videocards'=>	array(
-			
 				'element' => 'video card'
-				
 			),
 			
 			'printers'=>	array(
-			
 				'element' => 'printer'
-				
 			),
 			
 			'scanners'=>	array(
-			
 				'element' => 'scanner'
-				
+			),
+
+			'threegcards' => array(
+				'element' => '3G-card',
 			),
 		),
 		
 		'es' =>	array(
 		
 			'notebooks' => array(
-			
 				'element' => 'notebook'
-				
 			),
 			
 			'wifi'		=>	array(
-			
 				'element' => 'wifi card'
-				
 			),
 			
 			'videocards'=>	array(
-			
 				'element' => 'video card'
-				
 			),
 			
 			'printers'=>	array(
-			
 				'element' => 'printer'
-				
 			),
 			
 			'scanners'=>	array(
-			
 				'element' => 'scanner'
-				
+			),
+			
+			'threegcards' => array(
+				'element' => '3G-card',
 			),
 		),
 	);
@@ -312,6 +289,7 @@ class MyStrings
 		'videocard'	=>	'videocards',
 		'printer'	=>	'printers',
 		'scanner'	=>	'scanners',
+		'3G-card'	=>	'threegcards'
 	);
 	
 	public static function getTypes()
diff --git a/h-source/Application/Include/myFunctions.php b/h-source/Application/Include/myFunctions.php
index a5e3934..b72be6c 100644
--- a/h-source/Application/Include/myFunctions.php
+++ b/h-source/Application/Include/myFunctions.php
@@ -327,4 +327,17 @@ function gtext($string)
 		return Lang::$i18n[Lang::$current][$string];
 	}
 	return $string;	
-}
\ No newline at end of file
+}
+
+//rewrite the vendor name
+function betterVendor($string)
+{
+	$names = array(
+		"AT-T"	=>	"AT&T",
+		"Franklin-Wireless-Corporation"	=>	"Franklin Wireless Corporation",
+		"Novatel-Wireless"	=>	"Novatel Wireless",
+		"Sierra-Wireless"	=>	"Sierra Wireless",
+	);
+	
+	return (array_key_exists($string,$names)) ? $names[$string] : $string;
+}