added webcams - part 1

4 files changed, 111 insertions, 2 deletions

diff --git a/h-source/Application/Include/distributions.php b/h-source/Application/Include/distributions.php
index acfed40..5b91346 100644
--- a/h-source/Application/Include/distributions.php
+++ b/h-source/Application/Include/distributions.php
@@ -38,6 +38,7 @@ class Distributions
 		'ututo_xs_2009'	=>	'UTUTO XS 2009',
 		'ututo_xs_2010'	=>	'UTUTO XS 2010',
 		'venenux_0_8'	=>	'VENENUX 0.8',
+		'venenux_0_8_2'	=>	'VENENUX-EC 0.8.2',
 	);
 	
 	public static function getList()
diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php
index e4fc3e2..2ad9056 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'); //used by UsersController::login()
+	public static $controllers = array('notebooks','wifi','videocards','printers','scanners','threegcards','soundcards','webcams'); //used by UsersController::login()
 
 	//classId => controller
 	public static $deviceClasses = array(
@@ -41,6 +41,7 @@ class Hardware
 		'scanner'	=>	'H2O/scanner_22.png',
 		'3G-card'	=>	'Crystal/usb_22.png',
 		'soundcard'	=>	'H2O/audio-card_22.png',
+		'webcam'	=>	'H2O/camera-web_22.png',
 	);
 
 	public static $typeToController = array(
@@ -51,6 +52,7 @@ class Hardware
 		'scanner'	=>	'scanners',
 		'3G-card'	=>	'threegcards',
 		'soundcard'	=>	'soundcards',
+		'webcam'	=>	'webcams',
 	);
 
 	public static function getControllerFromType($type)
@@ -156,6 +158,7 @@ class Wifi extends Hardware
 {
 	public static $vendors = array(
 		"A-LINK"			=>	"A-LINK",
+		"Acer"	=>	"Acer",
 		"Airlink101"			=>	"Airlink101",
 		"Atheros"			=>	"Atheros",
 		"Belkin" 			=>	"Belkin",
@@ -168,10 +171,12 @@ class Wifi extends Hardware
 		"Linksys"			=>	"Linksys",
 		"NEC"				=>	"NEC",
 		"Netgear"			=>	"Netgear",
+		"Micro Star International"	=>	"Micro-Star-International",
 		"Ralink"			=>	"Ralink",
 		"Realtek"			=>	"Realtek",
 		"TOSHIBA"			=>	"TOSHIBA",
 		"TP-LINK"			=>	"TP-LINK",
+		"VIA Technologies, Inc"	=>	"VIA-Technologies-Inc",
 	);
 	
 	public static $interface = array(
@@ -229,7 +234,7 @@ class Videocard extends Hardware
 		"does_not_work"		=>	"it does not work",
 	);
 	
-	public static $interface = "not-specified,PCI,AGP,PCI-E,ISA";
+	public static $interface = "not-specified,PCI,AGP,PCI-E,ISA,MCA,VLB";
 	
 	public static function vendorsList()
 	{
@@ -420,4 +425,60 @@ class Soundcards extends Hardware
 	{
 		return implode(',',array_values(self::$vendors));
 	}
+}
+
+class Webcams extends Hardware
+{
+	public static $vendors = array(
+		"Acer"	=>	"Acer",
+		"Aiptek Inc"	=>	"Aiptek-Inc",
+		"Arkmicro Technologies Inc"	=>	"Arkmicro-Technologies-Inc",
+		"Askey Computer Corporation"	=>	"Askey-Computer-Corporation",
+		"Chicony Electronics CO"	=>	"Chicony-Electronics-CO",
+		"Conexant Systems, Inc"	=>	"Conexant-Systems-Inc",
+		"Creative Technology, Ltd"	=>	"Creative-Technology-Ltd",
+		"Divio"	=>	"Divio",
+		"Dynex"	=>	"Dynex",
+		"eMPIA Technology, Inc"	=>	"eMPIA-Technology-Inc",
+		"Genesys Logic, Inc"	=>	"Genesys-Logic-Inc",
+		"Hama Trading Co"	=>	"Hama-Trading-Co",
+		"Hewlett Packard" 		=>	"Hewlett-Packard",
+		"IMC Networks"	=>	"IMC-Networks",
+		"Importek"	=>	"Importek",
+		"iPassion Technology Inc"	=>	"iPassion-Technology-Inc",
+		"KYE Systems Corp"	=>	"KYE-Systems-Corp",
+		"Kinstone"	=>	"Kinstone",
+		"Lenovo"	=>	"Lenovo",
+		"LG Electronics"	=>	"LG-Electronics",
+		"Logitech"	=>	"Logitech",
+		"Microdia-Ltd"	=>	"Microdia-Ltd",
+		"OmniVision Technologies, Inc"	=>	"OmniVision-Technologies-Inc",
+		"Panasonic"	=>	"Panasonic",
+		"Philips"	=>	"Philips",
+		"PixArt Imaging Inc"	=>	"PixArt-Imaging-Inc",
+		"Primax Electronics Ltd"	=>	"Primax-Electronics-Ltd",
+		"Quanta Computer Inc."	=>	"Quanta-Computer-Inc",
+		"Ricoh Company, Ltd"	=>	"Ricoh-Company-Ltd",
+		"Sony Corporation"	=>	"Sony-Corporation",
+		"STMicroelectronics"	=>	"STMicroelectronics",
+		"Syntek Semiconductor Ltd"	=>	"Syntek-Semiconductor-Ltd",
+		"Sunplus Technology Co"	=>	"Sunplus-Technology-Co",
+		"Suyin"	=>	"Suyin",
+		"Tekom Technologies, Inc" =>	"Tekom-Technologies-Inc",
+		"Trust International"	=>	"Trust-International",
+		"USRobotics"	=>	"USRobotics",
+		"ViewQuest Technologies, Inc"	=>	"ViewQuest-Technologies-Inc",
+		"Vista Imaging, Inc"	=>	"Vista-Imaging-Inc",
+		"Xirlink"	=>	"Xirlink",
+		"Z-Star Microelectronics Corporation"	=>	"Z-Star-Microelectronics-Corporation",
+	);
+
+	public static $select = 'yes,no';
+
+	public static $interface = "not-specified,USB,Firewire,Parallel,Wifi,Serial";
+
+	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 00fbeec..a7498b7 100644
--- a/h-source/Application/Include/languages.php
+++ b/h-source/Application/Include/languages.php
@@ -156,6 +156,7 @@ class Lang
 				"no"	=>	"no",
 				"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",
 			),
 		'es'	=>	array
 			(
@@ -397,6 +398,10 @@ class MyStrings
 			'soundcards' => array(
 				'element' => 'sound card',
 			),
+
+			'webcams' => array(
+				'element' => 'webcam',
+			),
 		),
 		
 		'fr' =>	array(
@@ -428,6 +433,10 @@ class MyStrings
 			'soundcards' => array(
 				'element' => 'sound card',
 			),
+
+			'webcams' => array(
+				'element' => 'webcam',
+			),
 		),
 		
 		'it' =>	array(
@@ -459,6 +468,10 @@ class MyStrings
 			'soundcards' => array(
 				'element' => 'sound card',
 			),
+
+			'webcams' => array(
+				'element' => 'webcam',
+			),
 		),
 		
 		'es' =>	array(
@@ -490,6 +503,10 @@ class MyStrings
 			'soundcards' => array(
 				'element' => 'sound card',
 			),
+
+			'webcams' => array(
+				'element' => 'webcam',
+			),
 		),
 	);
 	
@@ -502,6 +519,7 @@ class MyStrings
 		'scanner'	=>	'scanners',
 		'3G-card'	=>	'threegcards',
 		'soundcard'	=>	'soundcards',
+		'webcam'	=>	'webcams',
 	);
 
 	public static function getTypes()
diff --git a/h-source/Application/Include/myFunctions.php b/h-source/Application/Include/myFunctions.php
index a7ccf58..b7fe7e4 100644
--- a/h-source/Application/Include/myFunctions.php
+++ b/h-source/Application/Include/myFunctions.php
@@ -351,6 +351,35 @@ function betterVendor($string)
 		"VIA-Technologies-Inc"	=>	"VIA Technologies Inc",
 		"Xilinx-Corporation"	=>	"Xilinx Corporation",
 		"Yamaha-Corporation"	=>	"Yamaha Corporation",
+		"Aiptek-Inc"	=>	"Aiptek Inc",
+		"Arkmicro-Technologies-Inc"	=>	"Arkmicro Technologies Inc",
+		"Askey-Computer-Corporation"	=>	"Askey Computer Corporation",
+		"Chicony-Electronics-CO"	=>	"Chicony Electronics CO",
+		"Conexant-Systems-Inc"	=>	"Conexant Systems, Inc",
+		"Creative-Technology-Ltd"	=>	"Creative Technology, Ltd",
+		"eMPIA-Technology-Inc"	=>	"eMPIA Technology, Inc",
+		"Genesys-Logic-Inc"	=>	"Genesys Logic, Inc",
+		"Hama-Trading-Co"	=>	"Hama Trading Co",
+		"Hewlett-Packard" 		=>	"Hewlett Packard",
+		"IMC-Networks"	=>	"IMC Networks",
+		"iPassion-Technology-Inc"	=>	"iPassion Technology Inc",
+		"KYE-Systems-Corp"	=>	"KYE Systems Corp",
+		"LG-Electronics"	=>	"LG Electronics",
+		"OmniVision-Technologies-Inc"	=>	"OmniVision Technologies, Inc",
+		"PixArt-Imaging-Inc"	=>	"PixArt Imaging Inc",
+		"Primax-Electronics-Ltd"	=>	"Primax Electronics Ltd",
+		"Quanta-Computer-Inc"	=>	"Quanta Computer Inc.",
+		"Ricoh-Company-Ltd"	=>	"Ricoh Company, Ltd",
+		"Sony-Corporation"	=>	"Sony Corporation",
+		"Syntek-Semiconductor-Ltd"	=>	"Syntek Semiconductor Ltd",
+		"Sunplus-Technology-Co"	=>	"Sunplus Technology Co",
+		"Tekom-Technologies-Inc" =>	"Tekom Technologies, Inc",
+		"Trust-International"	=>	"Trust International",
+		"ViewQuest-Technologies-Inc"	=>	"ViewQuest Technologies, Inc",
+		"Vista-Imaging-Inc"	=>	"Vista Imaging, Inc",
+		"Z-Star-Microelectronics-Corporation"	=>	"Z-Star Microelectronics Corporation",
+		"Micro-Star-International"	=>	"Micro Star International",
+		"VIA-Technologies-Inc"	=>	"VIA Technologies, Inc",
 	);
 	
 	return (array_key_exists($string,$names)) ? $names[$string] : $string;