improved hardware.php

1 files changed, 8 insertions, 167 deletions

diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php
index cd5fcab..89ea519 100644
--- a/h-source/Application/Include/hardware.php
+++ b/h-source/Application/Include/hardware.php
@@ -113,27 +113,13 @@ class Hardware
 		return null;
 	}
 
-	public static $commYear = 'not-specified,2010,2009,2008,2007,2006,2005,2004,2003,2002,2001,2000,1999,1998,1997,1996,1995,1994,1993,1992';
+	public static $commYear = 'not-specified,2011,2010,2009,2008,2007,2006,2005,2004,2003,2002,2001,2000,1999,1998,1997,1996,1995,1994,1993,1992';
 
 }
 
 class Printer extends Hardware
 {
-	public static $vendors = array(
-		"brother"				=>	"brother",
-		"Canon"					=>	"Canon",
-		"EPSON"					=>	"EPSON",
-		"Lexmark"				=>	"Lexmark",
-		"KONICA-MINOLTA"		=>	"KONICA-MINOLTA",
-		"Hewlett-Packard" 		=>	"Hewlett-Packard",
-		"Panasonic" 			=>	"Panasonic",
-		"RICOH"					=>	"RICOH",
-		"SAMSUNG"				=>	"SAMSUNG",
-		"SHARP"					=>	"SHARP",
-		"TOSHIBA"				=>	"TOSHIBA",
-		"XEROX"					=>	"XEROX",
-	);
-	
+
 	public static $compatibility = array(
 		"A Full" 				=>	"A-Full",
 		"B Partial"				=>	"B-Partial",
@@ -143,12 +129,7 @@ class Printer extends Hardware
 	public static $interface = "not-specified,USB,Serial,Parallel,Firewire,SCSI,Ethernet";
 	
 	public static $subtype = "not-specified,laser,inkjet,other";
-	
-	public static function vendorsList()
-	{
-		return implode(',',array_values(self::$vendors));
-	}
-	
+
 	public static function compatibilityList()
 	{
 		return implode(',',array_values(self::$compatibility));
@@ -158,58 +139,7 @@ class Printer extends Hardware
 
 class Wifi extends Hardware
 {
-	public static $vendors = array(
-		"A-LINK"			=>	"A-LINK",
-		"Acer"	=>	"Acer",
-		"Airlink101"		=>	"Airlink101",
-		"ALFA NETWORK Inc"	=>	"ALFA-NETWORK-Inc",
-		"Amigo Technology Inc"	=>	"Amigo-Technology-Inc",
-		"amit Inc"			=>	"amit-Inc",
-		"Atheros"			=>	"Atheros",
-		"Atlantis S.p.A."	=>	"Atlantis_S-p-A",
-		"Belkin" 			=>	"Belkin",
-		"Broadcom"			=>	"Broadcom",
-		"Buffalo Technology, Ltd"	=>	"Buffalo-Technology-Ltd",
-		"CANYON"			=>	"CANYON",
-		"Compex Systems Pte Ltd"	=>	"Compex-Systems-Pte-Ltd",
-		"Conceptronic"		=>	"Conceptronic",
-		"D-Link"			=>	"D-Link",
-		"Digitus"			=>	"Digitus",
-		"E-Tech"			=>	"E-Tech",
-		"Eminent"			=>	"Eminent",
-		"Encore Electronics Inc"	=>	"Encore-Electronics-Inc",
-		"Fiberline"			=>	"Fiberline",
-		"Gigabyte"			=>	"Gigabyte",
-		"Hawking"			=>	"Hawking",
-		"iNexQ"				=>	"iNexQ",
-		"JAHT Technologies Corp"	=>	"JAHT-Technologies-Corp",
-		"Intel"				=>	"Intel",
-		"LevelOne"			=>	"LevelOne",
-		"Linksys"			=>	"Linksys",
-		"NEC"				=>	"NEC",
-		"Netgear"			=>	"Netgear",
-		"Micronet Communications, Inc"	=>	"Micronet-Communications-Inc",
-		"Micro Star International"	=>	"Micro-Star-International",
-		"Minitar Corporation"	=>	"Minitar-Corporation",
-		"MSI"				=>	"MSI",
-		"OvisLink Technologies Corp"	=>	"OvisLink-Technologies-Corp",
-		"PheeNet"			=>	"PheeNet",
-		"PRO-NETS Technology Corp"	=>	"PRO-NETS_Technology_Corp",
-		"Ralink"			=>	"Ralink",
-		"Realtek"			=>	"Realtek",
-		"Roline"			=>	"Roline",
-		"Sitecom"			=>	"Sitecom",
-		"Sparklan comunications, Inc"	=>	"Sparklan-comunications-Inc",
-		"Surecom"			=>	"Surecom",
-		"Sweex"				=>	"Sweex",
-		"TOSHIBA"			=>	"TOSHIBA",
-		"TP-LINK"			=>	"TP-LINK",
-		"Unex Technology Corp"	=>	"Unex-Technology-Corp",
-		"VIA Technologies, Inc"	=>	"VIA-Technologies-Inc",
-		"Zinwell"			=>	"Zinwell",
-		"Zonet"				=>	"Zonet",
-	);
-	
+
 	public static $interface = array(
 		"not-specified"	 	=>	"not-specified",
 		"USB"				=>	"USB",
@@ -234,11 +164,6 @@ class Wifi extends Hardware
 	
 	public static $wifiSelect = 'yes,no';
 	
-	public static function vendorsList()
-	{
-		return implode(',',array_values(self::$vendors));
-	}
-	
 	public static function interfaceList()
 	{
 		return implode(',',array_values(self::$interface));
@@ -247,14 +172,7 @@ class Wifi extends Hardware
 
 class Videocard extends Hardware
 {
-	public static $vendors = array(
-		"ATI" 			=>	"ATI",
-		"NVIDIA"		=>	"NVIDIA",
-		"Intel"			=>	"Intel",
-		"Silicon Integrated Systems Corp"	=>	"Silicon-Integrated-Systems-Corp",
-		"VIA Technologies, Inc"	=>	"VIA-Technologies-Inc",
-	);
-	
+
 	public static $videoSelect = array(
 		"works with 3D acceleration" 				=>	"works_with_3D",
 		"works, but without 3D acceleration"		=>	"works_without_3D",
@@ -269,11 +187,6 @@ class Videocard extends Hardware
 	
 	public static $interface = "not-specified,PCI,AGP,PCI-E,ISA,MCA,VLB";
 	
-	public static function vendorsList()
-	{
-		return implode(',',array_values(self::$vendors));
-	}
-	
 	public static function videoList()
 	{
 		return implode(',',array_values(self::$videoSelect));
@@ -395,107 +308,35 @@ class Notebooks extends Hardware
 
 class ThreeGcards extends Wifi
 {
-	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 $select = 'yes,no';
-	
-	public static function vendorsList()
-	{
-		return implode(',',array_values(self::$vendors));
-	}
+
+
 }
 
 class Soundcards extends Hardware
 {
-	public static $vendors = array(
-		"ALi Corporation" => "ALi-Corporation",
-		"Advanced Micro Devices (AMD)"	=>	"Advanced-Micro-Devices",
-		"Analog Devices"	=>	"Analog-Devices",
-		"ATI Technologies Inc"	=>	"ATI-Technologies-Inc",
-		"Aureal Semiconductor"	=>	"Aureal-Semiconductor",
-		"Avance Logic Inc (ALI)"	=>	"Avance-Logic-Inc",
-		"Aztech System Ltd"	=>	"Aztech-System-Ltd",
-		"Brooktree Corporation"	=>	"Brooktree-Corporation",
-		"C-Media Electronics Inc"	=>	"C-Media-Electronics-Inc",
-		"Cirrus Logic"	=>	"Cirrus-Logic",
-		"Creative Labs"	=>	"Creative-Labs",
-		"Ensoniq"	=>	"Ensoniq",
-		"ESI"	=>	"ESI",
-		"ESS Technology"	=>	"ESS-Technology",
-		"ForteMedia Inc"	=>	"ForteMedia-Inc",
-		"Intel Corporation"	=>	"Intel-Corporation",
-		"Motorola"	=>	"Motorola",
-		"National Semiconductor Corporation"	=>	"National-Semiconductor-Corporation",
-		"Neomagic Corp"	=>	"Neomagic-Corp",
-		"nVidia Corporation"	=>	"nVidia-Corporation",
-		"Realtek"	=>	"Realtek",
-		"RME"	=>	"RME",
-		"S3 Inc"	=>	"S3-Inc",
-		"Silicon Integrated Systems (SiS)"	=>	"Silicon-Integrated-Systems",
-		"Trident Microsystems"	=>	"Trident-Microsystems",
-		"VIA Technologies Inc"	=>	"VIA-Technologies-Inc",
-		"Xilinx Corporation"	=>	"Xilinx-Corporation",
-		"Yamaha Corporation"	=>	"Yamaha-Corporation",
-	);
-	
+
 	public static $audioSelect = 'yes,no';
 	
 	public static $interface = "not-specified,PCI,ISA,USB,Firewire,Parallel,PCI-E,PCMCIA";
 
-	public static function vendorsList()
-	{
-		return implode(',',array_values(self::$vendors));
-	}
 }
 
 class Webcams extends Hardware
 {
-	public static $vendors = array(
-		"Chicony Electronics CO"	=>	"Chicony-Electronics-CO",
-		"KYE Systems Corp"	=>	"KYE-Systems-Corp",
-		"Logitech"	=>	"Logitech",
-		"Microdia Ltd"	=>	"Microdia-Ltd",
-		"Microsoft"	=>	"Microsoft",
-		"mijuki"	=>	"mijuki",
-		"Philips"	=>	"Philips",
-		"Vimicro Corp"	=>	"Vimicro-Corp",
-	);
 
 	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));
-	}
 }
 
 class Bluetooth extends Hardware
 {
-	public static $vendors = array(
-		"Samsung"	=>	"Samsung",
-	);
 
 	public static $select = 'yes,no';
 
 	public static $interface = "not-specified,USB,PCI,PCI-E,mini-PCI,mini-PCI-E,ExpressCard,PC-Card";
 
-	public static function vendorsList()
-	{
-		return implode(',',array_values(self::$vendors));
-	}
 }
\ No newline at end of file