From 32e60f1c2228e2a46707d15bec10cd54e476076c Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Thu, 21 Jul 2011 14:17:28 +0000 Subject: added ethernet cards to the list of allowed hardware --- .../Application/Controllers/DownloadController.php | 5 + .../Controllers/EthernetcardsController.php | 164 +++++++++++++++++++++ .../Application/Controllers/GenericController.php | 14 +- h-source/Application/Include/hardware.php | 17 ++- h-source/Application/Include/languages.php | 2 + h-source/Application/Include/params.php | 2 + h-source/Application/Models/EthernetcardsModel.php | 70 +++++++++ h-source/Application/Views/Download/index.php | 4 + .../Application/Views/Ethernetcards/catalogue.php | 89 +++++++++++ h-source/Application/Views/Hardware/left.php | 5 +- 10 files changed, 363 insertions(+), 9 deletions(-) create mode 100644 h-source/Application/Controllers/EthernetcardsController.php create mode 100644 h-source/Application/Models/EthernetcardsModel.php create mode 100644 h-source/Application/Views/Ethernetcards/catalogue.php (limited to 'h-source/Application') diff --git a/h-source/Application/Controllers/DownloadController.php b/h-source/Application/Controllers/DownloadController.php index 2fcacfa..a51fc1d 100644 --- a/h-source/Application/Controllers/DownloadController.php +++ b/h-source/Application/Controllers/DownloadController.php @@ -231,4 +231,9 @@ class DownloadController extends BaseController { $this->printXml($lang, array('type'=>'fingerprint-reader','-deleted'=>'no')); } + + public function ethernetcards($lang = 'en') + { + $this->printXml($lang, array('type'=>'ethernet-card','-deleted'=>'no')); + } } \ No newline at end of file diff --git a/h-source/Application/Controllers/EthernetcardsController.php b/h-source/Application/Controllers/EthernetcardsController.php new file mode 100644 index 0000000..40b90de --- /dev/null +++ b/h-source/Application/Controllers/EthernetcardsController.php @@ -0,0 +1,164 @@ +. + +if (!defined('EG')) die('Direct access not allowed!'); + +class EthernetcardsController extends GenericController +{ + + public function __construct($model, $controller, $queryString) + { + + $this->_topMenuClasses['hardware'] = " class='currentitem'"; + + parent::__construct($model, $controller, $queryString); + + //load the model + $this->model('HardwareModel'); + $this->model('RevisionsModel'); + $this->model('EthernetcardsModel'); + $this->model('TalkModel'); + + $this->mod = $this->m['EthernetcardsModel']; + + $this->m['HardwareModel']->id_user = $this->s['registered']->status['id_user']; + $this->m['HardwareModel']->type = 'ethernet-card'; + + //hardware conditions + $this->m['HardwareModel']->strongConditions['update'] = array( + "checkNotEmpty" => "model|you have to fill the model name entry", + "checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\(\)\@\[\]\/]+$/" => "model|characters not allowed in the model name entry", + "+checkMatch|/^[a-zA-Z0-9]{4}(\:)[a-zA-Z0-9]{4}$/" => "pci_id|VendorID:ProductID has to have the following format: [a-zA-Z0-9]{4}(\:)[a-zA-Z0-9]{4}", + "checkLength|99" => "model", + "+checkLength|299" => "distribution", + "++checkIsStrings|".Wifi::$commYear => "comm_year", + "+++checkIsStrings|".Ethernetcards::$select => "ethernet_card_works", + "++++checkIsStrings|".Ethernetcards::$interface => "interface", + ); + + $this->m['HardwareModel']->strongConditions['insert'] = array( + "checkNotEmpty" => "model|you have to fill the model name entry", + "checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\(\)\@\[\]\/]+$/" => "model|characters not allowed in the model name entry", + "+checkMatch|/^[a-zA-Z0-9]{4}(\:)[a-zA-Z0-9]{4}$/" => "pci_id|VendorID:ProductID has to have the following format: [a-zA-Z0-9]{4}(\:)[a-zA-Z0-9]{4}", + "checkLength|99" => "model", + "+checkLength|299" => "distribution", + "++checkIsStrings|".Wifi::$commYear => "comm_year", + "+++checkIsStrings|".Ethernetcards::$select => "ethernet_card_works", + "++++checkIsStrings|".Ethernetcards::$interface => "interface", + ); + + $this->m['HardwareModel']->softConditions['update'] = array( + "checkMatch|/^[a-zA-Z0-9\-\_\.\+\s]+$/" => "kernel|characters not allowed in the kernel entry", + "checkLength|20000" => "description", + "+checkLength|49" => "kernel", + "++checkLength|49" => "driver", + "++checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\/\,\:\;\(\)\[\]]+$/" => "driver|only the following characters are allowed for the driver entry: a-z A-Z 0-9 - _ . + s / , : ; ( ) [ ]", + "+++checkLength|1000" => "other_names|the other names entry exceeds the value of 1000 characters", + ); + + $this->m['HardwareModel']->softConditions['insert'] = array( + "checkMatch|/^[a-zA-Z0-9\-\_\.\+\s]+$/" => "kernel|characters not allowed in the kernel entry", + "checkLength|20000" => "description", + "+checkLength|49" => "kernel", + "++checkLength|49" => "driver", + "++checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\/\,\:\;\(\)\[\]]+$/" => "driver|only the following characters are allowed for the driver entry: a-z A-Z 0-9 - _ . + s / , : ; ( ) [ ]", + "+++checkLength|1000" => "other_names|the other names entry exceeds the value of 1000 characters", + ); + + $this->m['HardwareModel']->setFields('model,kernel,description,distribution,comm_year,ethernet_card_works,pci_id,interface,driver,other_names','sanitizeAll'); + + $argKeys = array( + 'page:forceNat' => 1, + 'history_page:forceNat' => 1, + 'vendor:sanitizeString' => 'undef', + 'comm_year:sanitizeString' => 'undef', + 'ethernet_card_works:sanitizeString' => 'undef', + 'interface:sanitizeString' => 'undef', + 'sort-by:sanitizeString' => 'undef' + ); + + $this->setArgKeys($argKeys); + + $data['title'] = 'Ethernet cards'; + + $data['intefaceOptions'] = Ethernetcards::$interface; + $data['worksOptions'] = Ethernetcards::$select; + $data['worksField'] = 'ethernet_card_works'; + $this->append($data); + } + + public function catalogue($lang = 'en') + { + $this->shift(1); + + $whereArray = array( + 'type' => $this->mod->type, + 'vendor' => $this->viewArgs['vendor'], + 'comm_year' => $this->viewArgs['comm_year'], + 'ethernet_card_works' => $this->viewArgs['ethernet_card_works'], + 'interface' => $this->viewArgs['interface'], + ); + + $this->mod->setWhereQueryClause($whereArray); + + parent::catalogue($lang); + } + + public function view($lang = 'en', $id = 0, $name = null) + { + parent::view($lang, $id, $name); + } + + public function history($lang = 'en', $id = 0) + { + parent::history($lang, $id); + } + + public function revision($lang = 'en', $id_rev = 0) + { + parent::revision($lang, $id_rev); + } + + public function insert($lang = 'en', $token = '') + { + parent::insert($lang, $token); + } + + public function update($lang = 'en', $token = '') + { + parent::update($lang, $token); + } + + public function differences($lang = 'en', $id_hard = 0, $id_rev = 0) + { + parent::differences($lang, $id_hard, $id_rev); + } + + public function climb($lang = 'en', $id_rev = 0, $token = '') + { + parent::climb($lang, $id_rev, $token); + } + + public function talk($lang = 'en', $id_hard = 0, $token = '') + { + parent::talk($lang, $id_hard, $token); + } + +} \ No newline at end of file diff --git a/h-source/Application/Controllers/GenericController.php b/h-source/Application/Controllers/GenericController.php index 8ab98ba..f955820 100644 --- a/h-source/Application/Controllers/GenericController.php +++ b/h-source/Application/Controllers/GenericController.php @@ -75,8 +75,8 @@ class GenericController extends BaseController $this->s['registered']->checkStatus(); -// if ($this->s['registered']->status['status'] === 'logged') -// { + if ($this->s['registered']->status['status'] === 'logged' or Website::$allowAnonymousSubmission === "yes") + { // if (!$this->s['registered']->checkCsrf($clean['token'])) $this->redirect($this->controller.'/catalogue/'.$this->lang,2,'wrong token..'); // if ($this->m['UsersModel']->isBlocked($this->s['registered']->status['id_user'])) $this->redirect('my/home/'.$this->lang,2,'your account has been blocked..'); @@ -145,11 +145,11 @@ class GenericController extends BaseController $this->clean(); $this->load('xml_response'); } -// } -// else -// { -// $this->redirect("users/login/".$this->lang."?redirect=".$this->controller."/catalogue/".$this->lang,0); -// } + } + else + { + $this->redirect("users/login/".$this->lang."?redirect=".$this->controller."/catalogue/".$this->lang,0); + } } public function del($lang = 'en', $token = '') diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php index 5f6ea9b..999a540 100644 --- a/h-source/Application/Include/hardware.php +++ b/h-source/Application/Include/hardware.php @@ -24,13 +24,17 @@ if (!defined('EG')) die('Direct access not allowed!'); class Hardware { - public static $controllers = array('notebooks','wifi','videocards','printers','scanners','threegcards','soundcards','webcams','bluetooth','acquisitioncards','fingerprintreaders'); //used by UsersController::login() + public static $controllers = array('notebooks','wifi','videocards','printers','scanners','threegcards','soundcards','webcams','bluetooth','acquisitioncards','fingerprintreaders','ethernetcards'); //used by UsersController::login() //classId => controller public static $deviceClasses = array( '0403' => 'soundcards', '0280' => 'wifi', '0300' => 'videocards', + '0200' => 'ethernetcards', + '0400' => 'acquisitioncards', + '0401' => 'acquisitioncards', + '0480' => 'acquisitioncards', ); public static $icons = array( @@ -45,6 +49,7 @@ class Hardware 'bluetooth' => 'H2O/preferences-system-bluetooth-22.png', 'acquisition-card' => 'Crystal/cam_mount-22.png', 'fingerprint-reader' => 'fingerprint_icon-22.png', + 'ethernet-card' => 'H2O/network-wired_22.png', ); public static $typeToController = array( @@ -59,6 +64,7 @@ class Hardware 'bluetooth' => 'bluetooth', 'acquisition-card' => 'acquisitioncards', 'fingerprint-reader' => 'fingerprintreaders', + 'ethernet-card' => 'ethernetcards', ); public static function getTypes() @@ -369,4 +375,13 @@ class Fingerprintreaders extends Hardware public static $interface = "not-specified,USB,PCI,PCI-E,mini-PCI,mini-PCI-E,ExpressCard,PC-Card,Firewire,Parallel,Serial"; +} + +class Ethernetcards 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 940ea02..986f42a 100644 --- a/h-source/Application/Include/languages.php +++ b/h-source/Application/Include/languages.php @@ -244,6 +244,7 @@ class Lang /*0206*/"The device page has to be approved by an administrator of the website" => "La pagina del dispositivo deve essere approvata da un amministratore del sito", /*0207*/"permanently delete the device page" => "cancella definitivamente la pagina", /*0208*/"This page has been permanently deleted by an administrator of the website" => "Questa pagina è stata definitivamente cancellata da un amministratore del sito", + /*0209*/"No ethernet devices found" => "Non è stata trovata alcuna scheda ethernet", ), 'es' => array ( @@ -1011,6 +1012,7 @@ class MyStrings 'bluetooth' => 'bluetooth', 'acquisition-card' => 'acquisitioncards', 'fingerprint-reader' => 'fingerprintreaders', + 'ethernet-card' => 'ethernetcards', ); public static function getTypes() diff --git a/h-source/Application/Include/params.php b/h-source/Application/Include/params.php index 1d3533b..ba4fef3 100644 --- a/h-source/Application/Include/params.php +++ b/h-source/Application/Include/params.php @@ -31,6 +31,8 @@ class Website static public $mailServer = ""; static public $mailPassword = ""; + + static public $allowAnonymousSubmission = "yes"; } class Account diff --git a/h-source/Application/Models/EthernetcardsModel.php b/h-source/Application/Models/EthernetcardsModel.php new file mode 100644 index 0000000..1727f71 --- /dev/null +++ b/h-source/Application/Models/EthernetcardsModel.php @@ -0,0 +1,70 @@ +. + +if (!defined('EG')) die('Direct access not allowed!'); + +class EthernetcardsModel extends GenericModel +{ + + public $type = 'ethernet-card'; //device type + + public function __construct() + { + + $this->_popupItemNames = array( + 'vendor' => 'vendor', + 'comm_year' => 'comm_year', + 'ethernet_card_works' => 'ethernet_card_works', + 'interface' => 'interface', + ); + + $this->_popupLabels = array( + 'vendor' => gtext("vendor"), + 'comm_year' => gtext("year"), + 'ethernet_card_works' => gtext("does it work?"), + 'interface' => gtext("interface"), + ); + + $this->_popupFunctions = array( + 'vendor' => 'betterVendor', + ); + + $this->createPopupWhere('vendor,ethernet_card_works,comm_year,interface'); + + $this->diffFields = array( + 'vendor' => gtext("vendor"), + 'model' => gtext('model name'), + 'other_names' => gtext('possible other names of the device'), + 'pci_id' => gtext("VendorID:ProductID code of the device"), + 'comm_year' => gtext('year of commercialization'), + 'interface' => gtext("interface"), + 'distribution' => gtext('GNU/Linux distribution used for the test'), + 'kernel' => gtext('tested with the following kernel libre'), + 'ethernet_card_works' => gtext("does it work with free software?"), + 'driver' => gtext("free driver used"), + 'description' => gtext('Description'), + ); + + $this->fieldsWithBreaks = array(gtext('Description'),gtext('possible other names of the device')); + + parent::__construct(); + } + +} \ No newline at end of file diff --git a/h-source/Application/Views/Download/index.php b/h-source/Application/Views/Download/index.php index 5fbbef8..11d53c2 100644 --- a/h-source/Application/Views/Download/index.php +++ b/h-source/Application/Views/Download/index.php @@ -85,6 +85,10 @@ fingerprint readers in the database");?> "> + + ethernet cards in the database");?> + "> + diff --git a/h-source/Application/Views/Ethernetcards/catalogue.php b/h-source/Application/Views/Ethernetcards/catalogue.php new file mode 100644 index 0000000..09cad9a --- /dev/null +++ b/h-source/Application/Views/Ethernetcards/catalogue.php @@ -0,0 +1,89 @@ + + +. +?> + +
+
+ +
+
+
viewArgs['vendor'])?>
+
viewArgs['comm_year']?>
+
viewArgs['ethernet_card_works']?>
+
viewArgs['interface']?>
+
viewArgs['sort-by']?>
+
+
+ + + +
+ .. +
+ + + + +
+ +
+ : +
+ + +
+
:
+
+
+ + +
+
:
+
+
+ +
+
:
+
+
+ +
+
:
+
+
+ +
+
+
+
+ +
+ controller."/view/$lang/".$item['hardware']['id_hard'].'/'.encodeUrl($item['hardware']['model']).$this->viewStatus;?>">.. +
+ +
+ + + +
+ : +
+ \ No newline at end of file diff --git a/h-source/Application/Views/Hardware/left.php b/h-source/Application/Views/Hardware/left.php index 101a6ce..21fa3ec 100644 --- a/h-source/Application/Views/Hardware/left.php +++ b/h-source/Application/Views/Hardware/left.php @@ -69,5 +69,8 @@
Fingerprint readers
- + +
+ Ethernet cards +
\ No newline at end of file -- cgit v1.2.3