diff options
| -rw-r--r-- | h-source/Application/Controllers/GenericController.php | 22 | ||||
| -rw-r--r-- | h-source/Application/Include/hardware.php | 18 | ||||
| -rw-r--r-- | h-source/Application/Include/myFunctions.php | 8 |
3 files changed, 37 insertions, 11 deletions
diff --git a/h-source/Application/Controllers/GenericController.php b/h-source/Application/Controllers/GenericController.php index 5c96b76..49685f3 100644 --- a/h-source/Application/Controllers/GenericController.php +++ b/h-source/Application/Controllers/GenericController.php @@ -36,22 +36,22 @@ class GenericController extends BaseController $popup->name = gtext('sort by'); switch ($this->controller) { - case 'wifi': - $popup->itemsName = array('last inserted','alphabetically','alphabetically desc'); - $popup->itemsValue = array('last-inserted','alphabetically','alphabetically-desc'); - break; - case 'videocards': - $popup->itemsName = array('last inserted','alphabetically','alphabetically desc'); - $popup->itemsValue = array('last-inserted','alphabetically','alphabetically-desc'); + case 'printers': + $popup->itemsName = array('last inserted','alphabetically','alphabetically desc','compatibility'); + $popup->itemsValue = array('last-inserted','alphabetically','alphabetically-desc','compatibility'); break; - case 'soundcards': - $popup->itemsName = array('last inserted','alphabetically','alphabetically desc'); - $popup->itemsValue = array('last-inserted','alphabetically','alphabetically-desc'); + case 'notebooks': + $popup->itemsName = array('last inserted','alphabetically','alphabetically desc','compatibility'); + $popup->itemsValue = array('last-inserted','alphabetically','alphabetically-desc','compatibility'); break; - default: + case 'scanners': $popup->itemsName = array('last inserted','alphabetically','alphabetically desc','compatibility'); $popup->itemsValue = array('last-inserted','alphabetically','alphabetically-desc','compatibility'); break; + default: + $popup->itemsName = array('last inserted','alphabetically','alphabetically desc'); + $popup->itemsValue = array('last-inserted','alphabetically','alphabetically-desc'); + break; } $this->orderPopup = $popup; diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php index 069c6e7..5a8d3e2 100644 --- a/h-source/Application/Include/hardware.php +++ b/h-source/Application/Include/hardware.php @@ -461,20 +461,28 @@ class Webcams extends Hardware { public static $vendors = array( "Acer" => "Acer", + "Active Pixel" => "Active-Pixel", + "ADOMAX technology" => "ADOMAX-technology", "Aiptek Inc" => "Aiptek-Inc", "Arkmicro Technologies Inc" => "Arkmicro-Technologies-Inc", "Askey Computer Corporation" => "Askey-Computer-Corporation", + "Astak Inc" => "Astak-Inc", "Chicony Electronics CO" => "Chicony-Electronics-CO", + "Cisco" => "Cisco", "Conexant Systems, Inc" => "Conexant-Systems-Inc", "Creative Technology, Ltd" => "Creative-Technology-Ltd", + "D-Link" => "D-Link", "Divio" => "Divio", "Dynex" => "Dynex", "eMPIA Technology, Inc" => "eMPIA-Technology-Inc", + "Encore Electronics Inc" => "Encore-Electronics-Inc", "Gembird" => "Gembird", "Genesys Logic, Inc" => "Genesys-Logic-Inc", "Hama Trading Co" => "Hama-Trading-Co", + "Hamlet" => "Hamlet", "Hewlett Packard" => "Hewlett-Packard", "IMC Networks" => "IMC-Networks", + "iMicro Electronics" => "iMicro-Electronics", "Importek" => "Importek", "iPassion Technology Inc" => "iPassion-Technology-Inc", "KYE Systems Corp" => "KYE-Systems-Corp", @@ -482,14 +490,22 @@ class Webcams extends Hardware "Lenovo" => "Lenovo", "LG Electronics" => "LG-Electronics", "Logitech" => "Logitech", + "LOREX Technology Inc" => "LOREX-Technology-Inc", + "Linksys" => "Linksys", + "Mediacom" => "Mediacom", "Microdia-Ltd" => "Microdia-Ltd", + "Micron" => "Micron", + "Microsoft" => "Microsoft", + "Omega Technology Corp" => "Omega-Technology-Corp", "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", + "Revoltec" => "Revoltec", "Ricoh Company, Ltd" => "Ricoh-Company-Ltd", + "Shenzhen Vigor Electronic" => "Shenzhen-Vigor-Electronic", "Sony Corporation" => "Sony-Corporation", "STMicroelectronics" => "STMicroelectronics", "Syntek Semiconductor Ltd" => "Syntek-Semiconductor-Ltd", @@ -499,9 +515,11 @@ class Webcams extends Hardware "Trust International" => "Trust-International", "USRobotics" => "USRobotics", "ViewQuest Technologies, Inc" => "ViewQuest-Technologies-Inc", + "Vimicro Corp" => "Vimicro-Corp", "Vista Imaging, Inc" => "Vista-Imaging-Inc", "Xirlink" => "Xirlink", "Z-Star Microelectronics Corporation" => "Z-Star-Microelectronics-Corporation", + "Zonet" => "Zonet", ); public static $select = 'yes,no'; diff --git a/h-source/Application/Include/myFunctions.php b/h-source/Application/Include/myFunctions.php index fefc376..20b5ae9 100644 --- a/h-source/Application/Include/myFunctions.php +++ b/h-source/Application/Include/myFunctions.php @@ -394,6 +394,14 @@ function betterVendor($string) "PRO-NETS_Technology_Corp" => "PRO-NETS Technology Corp", "Sparklan-comunications-Inc" => "Sparklan comunications, Inc", "Unex-Technology-Corp" => "Unex Technology Corp", + "Vimicro-Corp" => "Vimicro Corp", + "LOREX-Technology-Inc" => "LOREX Technology Inc", + "ADOMAX-technology" => "ADOMAX technology", + "Omega-Technology-Corp" => "Omega Technology Corp", + "Shenzhen-Vigor-Electronic" => "Shenzhen Vigor Electronic", + "Astak-Inc" => "Astak Inc", + "iMicro-Electronics" => "iMicro Electronics", + "Active-Pixel" => "Active Pixel", ); return (array_key_exists($string,$names)) ? $names[$string] : $string; |