From 3c1f2dfdb82656dc47a1cb467d03e09e52792f24 Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Thu, 12 May 2011 21:51:06 +0000 Subject: h-source:added the other_names entry --- .../Application/Controllers/AcquisitioncardsController.php | 4 +++- h-source/Application/Controllers/BluetoothController.php | 4 +++- h-source/Application/Controllers/DownloadController.php | 1 + .../Application/Controllers/FingerprintreadersController.php | 4 +++- h-source/Application/Controllers/PrintersController.php | 4 +++- h-source/Application/Controllers/ScannersController.php | 4 +++- h-source/Application/Controllers/SoundcardsController.php | 4 +++- h-source/Application/Controllers/ThreegcardsController.php | 4 +++- h-source/Application/Controllers/VideocardsController.php | 4 +++- h-source/Application/Controllers/WebcamsController.php | 4 +++- h-source/Application/Controllers/WifiController.php | 4 +++- h-source/Application/Include/languages.php | 4 ++++ h-source/Application/Models/AcquisitioncardsModel.php | 3 ++- h-source/Application/Models/BluetoothModel.php | 3 ++- h-source/Application/Models/FingerprintreadersModel.php | 3 ++- h-source/Application/Models/PrintersModel.php | 3 ++- h-source/Application/Models/ScannersModel.php | 3 ++- h-source/Application/Models/SoundcardsModel.php | 3 ++- h-source/Application/Models/ThreegcardsModel.php | 3 ++- h-source/Application/Models/VideocardsModel.php | 3 ++- h-source/Application/Models/WebcamsModel.php | 3 ++- h-source/Application/Models/WifiModel.php | 3 ++- h-source/Application/Views/Acquisitioncards/catalogue.php | 7 +++++++ h-source/Application/Views/Acquisitioncards/form.php | 7 ++++++- h-source/Application/Views/Acquisitioncards/page.php | 7 +++++++ h-source/Application/Views/Bluetooth/catalogue.php | 7 +++++++ h-source/Application/Views/Bluetooth/form.php | 7 ++++++- h-source/Application/Views/Bluetooth/page.php | 7 +++++++ h-source/Application/Views/Fingerprintreaders/catalogue.php | 7 +++++++ h-source/Application/Views/Fingerprintreaders/form.php | 7 ++++++- h-source/Application/Views/Fingerprintreaders/page.php | 7 +++++++ h-source/Application/Views/Printers/catalogue.php | 7 +++++++ h-source/Application/Views/Printers/form.php | 7 ++++++- h-source/Application/Views/Printers/page.php | 7 +++++++ h-source/Application/Views/Scanners/catalogue.php | 7 +++++++ h-source/Application/Views/Scanners/form.php | 7 ++++++- h-source/Application/Views/Scanners/page.php | 7 +++++++ h-source/Application/Views/Soundcards/catalogue.php | 7 +++++++ h-source/Application/Views/Soundcards/form.php | 7 ++++++- h-source/Application/Views/Soundcards/page.php | 7 +++++++ h-source/Application/Views/Threegcards/catalogue.php | 7 +++++++ h-source/Application/Views/Threegcards/form.php | 7 ++++++- h-source/Application/Views/Threegcards/page.php | 7 +++++++ h-source/Application/Views/Videocards/catalogue.php | 7 +++++++ h-source/Application/Views/Videocards/form.php | 7 ++++++- h-source/Application/Views/Videocards/page.php | 7 +++++++ h-source/Application/Views/Webcams/catalogue.php | 7 +++++++ h-source/Application/Views/Webcams/form.php | 7 ++++++- h-source/Application/Views/Webcams/page.php | 7 +++++++ h-source/Application/Views/Wifi/catalogue.php | 7 +++++++ h-source/Application/Views/Wifi/form.php | 7 ++++++- h-source/Application/Views/Wifi/page.php | 7 +++++++ h-source/Public/Css/main.css | 12 +++++++++++- h-source/tables.sql | 4 +++- 54 files changed, 269 insertions(+), 32 deletions(-) diff --git a/h-source/Application/Controllers/AcquisitioncardsController.php b/h-source/Application/Controllers/AcquisitioncardsController.php index 6937de0..6979b0e 100644 --- a/h-source/Application/Controllers/AcquisitioncardsController.php +++ b/h-source/Application/Controllers/AcquisitioncardsController.php @@ -70,6 +70,7 @@ class AcquisitioncardsController extends GenericController "+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( @@ -78,9 +79,10 @@ class AcquisitioncardsController extends GenericController "+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,compatibility,pci_id,interface,driver','sanitizeAll'); + $this->m['HardwareModel']->setFields('model,kernel,description,distribution,comm_year,compatibility,pci_id,interface,driver,other_names','sanitizeAll'); $argKeys = array( 'page:forceNat' => 1, diff --git a/h-source/Application/Controllers/BluetoothController.php b/h-source/Application/Controllers/BluetoothController.php index 58269bf..134edff 100644 --- a/h-source/Application/Controllers/BluetoothController.php +++ b/h-source/Application/Controllers/BluetoothController.php @@ -70,6 +70,7 @@ class BluetoothController extends GenericController "+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( @@ -78,9 +79,10 @@ class BluetoothController extends GenericController "+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,bluetooth_works,pci_id,interface,driver','sanitizeAll'); + $this->m['HardwareModel']->setFields('model,kernel,description,distribution,comm_year,bluetooth_works,pci_id,interface,driver,other_names','sanitizeAll'); $argKeys = array( 'page:forceNat' => 1, diff --git a/h-source/Application/Controllers/DownloadController.php b/h-source/Application/Controllers/DownloadController.php index 64eec34..879bded 100644 --- a/h-source/Application/Controllers/DownloadController.php +++ b/h-source/Application/Controllers/DownloadController.php @@ -77,6 +77,7 @@ class DownloadController extends BaseController if ($type !== 'notebook') { + $xml .= "\t\t\n"; $xml .= "\t\t".$row['hardware']['pci_id']."\n"; } diff --git a/h-source/Application/Controllers/FingerprintreadersController.php b/h-source/Application/Controllers/FingerprintreadersController.php index a32ea42..a1d264f 100644 --- a/h-source/Application/Controllers/FingerprintreadersController.php +++ b/h-source/Application/Controllers/FingerprintreadersController.php @@ -70,6 +70,7 @@ class FingerprintreadersController extends GenericController "+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( @@ -78,9 +79,10 @@ class FingerprintreadersController extends GenericController "+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,fingerprint_works,pci_id,interface,driver','sanitizeAll'); + $this->m['HardwareModel']->setFields('model,kernel,description,distribution,comm_year,fingerprint_works,pci_id,interface,driver,other_names','sanitizeAll'); $argKeys = array( 'page:forceNat' => 1, diff --git a/h-source/Application/Controllers/PrintersController.php b/h-source/Application/Controllers/PrintersController.php index 0251808..4a0b29e 100644 --- a/h-source/Application/Controllers/PrintersController.php +++ b/h-source/Application/Controllers/PrintersController.php @@ -72,6 +72,7 @@ class PrintersController extends GenericController "+checkLength|49" => "driver", "++checkLength|49" => "kernel", "++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( @@ -80,9 +81,10 @@ class PrintersController extends GenericController "+checkLength|49" => "driver", "++checkLength|49" => "kernel", "++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,compatibility,distribution,comm_year,pci_id,driver,interface,subtype','sanitizeAll'); + $this->m['HardwareModel']->setFields('model,kernel,description,compatibility,distribution,comm_year,pci_id,driver,interface,subtype,other_names','sanitizeAll'); $argKeys = array( 'page:forceNat' => 1, diff --git a/h-source/Application/Controllers/ScannersController.php b/h-source/Application/Controllers/ScannersController.php index 1030fb8..bbdd350 100644 --- a/h-source/Application/Controllers/ScannersController.php +++ b/h-source/Application/Controllers/ScannersController.php @@ -70,6 +70,7 @@ class ScannersController extends GenericController "+checkLength|49" => "driver", "++checkLength|49" => "kernel", "++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( @@ -78,9 +79,10 @@ class ScannersController extends GenericController "+checkLength|49" => "driver", "++checkLength|49" => "kernel", "++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,compatibility,distribution,comm_year,pci_id,driver,interface','sanitizeAll'); + $this->m['HardwareModel']->setFields('model,kernel,description,compatibility,distribution,comm_year,pci_id,driver,interface,other_names','sanitizeAll'); $argKeys = array( 'page:forceNat' => 1, diff --git a/h-source/Application/Controllers/SoundcardsController.php b/h-source/Application/Controllers/SoundcardsController.php index d1386e0..a45a4eb 100644 --- a/h-source/Application/Controllers/SoundcardsController.php +++ b/h-source/Application/Controllers/SoundcardsController.php @@ -70,6 +70,7 @@ class SoundcardsController extends GenericController "+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( @@ -78,9 +79,10 @@ class SoundcardsController extends GenericController "+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,sound_card_works,pci_id,interface,driver','sanitizeAll'); + $this->m['HardwareModel']->setFields('model,kernel,description,distribution,comm_year,sound_card_works,pci_id,interface,driver,other_names','sanitizeAll'); $argKeys = array( 'page:forceNat' => 1, diff --git a/h-source/Application/Controllers/ThreegcardsController.php b/h-source/Application/Controllers/ThreegcardsController.php index c535005..5770fa8 100644 --- a/h-source/Application/Controllers/ThreegcardsController.php +++ b/h-source/Application/Controllers/ThreegcardsController.php @@ -70,6 +70,7 @@ class ThreegcardsController extends GenericController "+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( @@ -78,9 +79,10 @@ class ThreegcardsController extends GenericController "+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,wifi_works,pci_id,interface,driver','sanitizeAll'); + $this->m['HardwareModel']->setFields('model,kernel,description,distribution,comm_year,wifi_works,pci_id,interface,driver,other_names','sanitizeAll'); $argKeys = array( 'page:forceNat' => 1, diff --git a/h-source/Application/Controllers/VideocardsController.php b/h-source/Application/Controllers/VideocardsController.php index d6df28c..ab869bc 100644 --- a/h-source/Application/Controllers/VideocardsController.php +++ b/h-source/Application/Controllers/VideocardsController.php @@ -70,6 +70,7 @@ class VideocardsController extends GenericController "+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( @@ -78,9 +79,10 @@ class VideocardsController extends GenericController "+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,video_card_works,comm_year,pci_id,interface,driver','sanitizeAll'); + $this->m['HardwareModel']->setFields('model,kernel,description,distribution,video_card_works,comm_year,pci_id,interface,driver,other_names','sanitizeAll'); $argKeys = array( 'page:forceNat' => 1, diff --git a/h-source/Application/Controllers/WebcamsController.php b/h-source/Application/Controllers/WebcamsController.php index 454f2ee..6d91eb2 100644 --- a/h-source/Application/Controllers/WebcamsController.php +++ b/h-source/Application/Controllers/WebcamsController.php @@ -70,6 +70,7 @@ class WebcamsController extends GenericController "+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( @@ -78,9 +79,10 @@ class WebcamsController extends GenericController "+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,webcam_works,pci_id,interface,driver','sanitizeAll'); + $this->m['HardwareModel']->setFields('model,kernel,description,distribution,comm_year,webcam_works,pci_id,interface,driver,other_names','sanitizeAll'); $argKeys = array( 'page:forceNat' => 1, diff --git a/h-source/Application/Controllers/WifiController.php b/h-source/Application/Controllers/WifiController.php index 8002b09..c2b9e20 100644 --- a/h-source/Application/Controllers/WifiController.php +++ b/h-source/Application/Controllers/WifiController.php @@ -70,6 +70,7 @@ class WifiController extends GenericController "+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( @@ -78,9 +79,10 @@ class WifiController extends GenericController "+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,wifi_works,pci_id,interface,driver','sanitizeAll'); + $this->m['HardwareModel']->setFields('model,kernel,description,distribution,comm_year,wifi_works,pci_id,interface,driver,other_names','sanitizeAll'); $argKeys = array( 'page:forceNat' => 1, diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php index 9ab5de9..abd043b 100644 --- a/h-source/Application/Include/languages.php +++ b/h-source/Application/Include/languages.php @@ -221,6 +221,10 @@ class Lang "Download the xml file of all the acquisition cards in the database" => "Scarica il file xml di tutte le schede di acquisizione presenti nel database", "Download the xml file of all the fingerprint readers in the database" => "Scarica il file xml di tutti i lettori di impronte digitali presenti nel database", "architecture" => "architettura", + "Add here the device name as written on the device itself or on the device box. Add it only if it is different from the model name already inserted inside the above entry. Add the new name in such a way that there is one name per row." => "Aggiungi qui il nome del dispositivo così com'è scritto sul dispositivo stesso o sulla confezione. Aggiungi tale nome solo se è diverso dal nome del modello già inserito nel campo precedente. Aggiungi il nuovo nome in modo che ci sia un nome per riga.", + "Write here the model name obtained by the lspci or lsusb command." => "Scrivi qui il nome del modello ottenuto dal comando lspci o dal comando lsusb.", + "This is the name of the chipset of your device." => "Questo è il nome del chipset del tuo dispositivo.", + "possible other names of the device" => "eventuali altri nomi del dispositivo", ), 'es' => array ( diff --git a/h-source/Application/Models/AcquisitioncardsModel.php b/h-source/Application/Models/AcquisitioncardsModel.php index 7114dd3..67d71eb 100644 --- a/h-source/Application/Models/AcquisitioncardsModel.php +++ b/h-source/Application/Models/AcquisitioncardsModel.php @@ -56,6 +56,7 @@ class AcquisitioncardsModel extends GenericModel $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"), @@ -66,7 +67,7 @@ class AcquisitioncardsModel extends GenericModel 'description' => gtext('Description'), ); - $this->fieldsWithBreaks = array(gtext('Description')); + $this->fieldsWithBreaks = array(gtext('Description'),gtext('possible other names of the device')); parent::__construct(); } diff --git a/h-source/Application/Models/BluetoothModel.php b/h-source/Application/Models/BluetoothModel.php index 39445bf..0b7f15d 100644 --- a/h-source/Application/Models/BluetoothModel.php +++ b/h-source/Application/Models/BluetoothModel.php @@ -56,6 +56,7 @@ class BluetoothModel extends GenericModel $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"), @@ -66,7 +67,7 @@ class BluetoothModel extends GenericModel 'description' => gtext('Description'), ); - $this->fieldsWithBreaks = array(gtext('Description')); + $this->fieldsWithBreaks = array(gtext('Description'),gtext('possible other names of the device')); parent::__construct(); } diff --git a/h-source/Application/Models/FingerprintreadersModel.php b/h-source/Application/Models/FingerprintreadersModel.php index 83be7db..ea249a9 100644 --- a/h-source/Application/Models/FingerprintreadersModel.php +++ b/h-source/Application/Models/FingerprintreadersModel.php @@ -56,6 +56,7 @@ class FingerprintreadersModel extends GenericModel $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"), @@ -66,7 +67,7 @@ class FingerprintreadersModel extends GenericModel 'description' => gtext('Description'), ); - $this->fieldsWithBreaks = array(gtext('Description')); + $this->fieldsWithBreaks = array(gtext('Description'),gtext('possible other names of the device')); parent::__construct(); } diff --git a/h-source/Application/Models/PrintersModel.php b/h-source/Application/Models/PrintersModel.php index f69d543..b5b2f49 100644 --- a/h-source/Application/Models/PrintersModel.php +++ b/h-source/Application/Models/PrintersModel.php @@ -52,6 +52,7 @@ class PrintersModel extends GenericModel $this->diffFields = array( 'vendor' => gtext("vendor"), 'model' => gtext('model name'), + 'other_names' => gtext('possible other names of the device'), 'subtype' => gtext('subtype')." (laser, inkjet, ..)", 'pci_id' => gtext("VendorID:ProductID code of the device"), 'comm_year' => gtext('year of commercialization'), @@ -63,7 +64,7 @@ class PrintersModel extends GenericModel 'description' => gtext('Description'), ); - $this->fieldsWithBreaks = array(gtext('Description')); + $this->fieldsWithBreaks = array(gtext('Description'),gtext('possible other names of the device')); parent::__construct(); } diff --git a/h-source/Application/Models/ScannersModel.php b/h-source/Application/Models/ScannersModel.php index f30b505..72825b5 100644 --- a/h-source/Application/Models/ScannersModel.php +++ b/h-source/Application/Models/ScannersModel.php @@ -52,6 +52,7 @@ class ScannersModel extends GenericModel $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"), @@ -62,7 +63,7 @@ class ScannersModel extends GenericModel 'description' => gtext('Description'), ); - $this->fieldsWithBreaks = array(gtext('Description')); + $this->fieldsWithBreaks = array(gtext('Description'),gtext('possible other names of the device')); parent::__construct(); } diff --git a/h-source/Application/Models/SoundcardsModel.php b/h-source/Application/Models/SoundcardsModel.php index f872427..71c8125 100644 --- a/h-source/Application/Models/SoundcardsModel.php +++ b/h-source/Application/Models/SoundcardsModel.php @@ -56,6 +56,7 @@ class SoundcardsModel extends GenericModel $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"), @@ -66,7 +67,7 @@ class SoundcardsModel extends GenericModel 'description' => gtext('Description'), ); - $this->fieldsWithBreaks = array(gtext('Description')); + $this->fieldsWithBreaks = array(gtext('Description'),gtext('possible other names of the device')); parent::__construct(); } diff --git a/h-source/Application/Models/ThreegcardsModel.php b/h-source/Application/Models/ThreegcardsModel.php index 3579e01..5b0a7e7 100644 --- a/h-source/Application/Models/ThreegcardsModel.php +++ b/h-source/Application/Models/ThreegcardsModel.php @@ -57,6 +57,7 @@ class ThreegcardsModel extends GenericModel $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"), @@ -67,7 +68,7 @@ class ThreegcardsModel extends GenericModel 'description' => gtext('Description'), ); - $this->fieldsWithBreaks = array(gtext('Description')); + $this->fieldsWithBreaks = array(gtext('Description'),gtext('possible other names of the device')); parent::__construct(); } diff --git a/h-source/Application/Models/VideocardsModel.php b/h-source/Application/Models/VideocardsModel.php index 637cf21..4cac5a7 100644 --- a/h-source/Application/Models/VideocardsModel.php +++ b/h-source/Application/Models/VideocardsModel.php @@ -52,6 +52,7 @@ class VideocardsModel extends GenericModel $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"), @@ -62,7 +63,7 @@ class VideocardsModel extends GenericModel 'description' => gtext('Description'), ); - $this->fieldsWithBreaks = array(gtext('Description')); + $this->fieldsWithBreaks = array(gtext('Description'),gtext('possible other names of the device')); parent::__construct(); } diff --git a/h-source/Application/Models/WebcamsModel.php b/h-source/Application/Models/WebcamsModel.php index c5634ac..2b5ed9b 100644 --- a/h-source/Application/Models/WebcamsModel.php +++ b/h-source/Application/Models/WebcamsModel.php @@ -56,6 +56,7 @@ class WebcamsModel extends GenericModel $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"), @@ -66,7 +67,7 @@ class WebcamsModel extends GenericModel 'description' => gtext('Description'), ); - $this->fieldsWithBreaks = array(gtext('Description')); + $this->fieldsWithBreaks = array(gtext('Description'),gtext('possible other names of the device')); parent::__construct(); } diff --git a/h-source/Application/Models/WifiModel.php b/h-source/Application/Models/WifiModel.php index 61b4136..3d15aa2 100644 --- a/h-source/Application/Models/WifiModel.php +++ b/h-source/Application/Models/WifiModel.php @@ -56,6 +56,7 @@ class WifiModel extends GenericModel $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"), @@ -66,7 +67,7 @@ class WifiModel extends GenericModel 'description' => gtext('Description'), ); - $this->fieldsWithBreaks = array(gtext('Description')); + $this->fieldsWithBreaks = array(gtext('Description'),gtext('possible other names of the device')); parent::__construct(); } diff --git a/h-source/Application/Views/Acquisitioncards/catalogue.php b/h-source/Application/Views/Acquisitioncards/catalogue.php index 857fd07..f9d86d7 100644 --- a/h-source/Application/Views/Acquisitioncards/catalogue.php +++ b/h-source/Application/Views/Acquisitioncards/catalogue.php @@ -48,6 +48,13 @@ : + +
+
:
+
+
+ +
:
diff --git a/h-source/Application/Views/Acquisitioncards/form.php b/h-source/Application/Views/Acquisitioncards/form.php index cf7668e..2172e6b 100644 --- a/h-source/Application/Views/Acquisitioncards/form.php +++ b/h-source/Application/Views/Acquisitioncards/form.php @@ -40,9 +40,14 @@
- +
+ +
+ + +
diff --git a/h-source/Application/Views/Acquisitioncards/page.php b/h-source/Application/Views/Acquisitioncards/page.php index 2a47417..f163be2 100644 --- a/h-source/Application/Views/Acquisitioncards/page.php +++ b/h-source/Application/Views/Acquisitioncards/page.php @@ -43,6 +43,13 @@
+ +
+
:
+
+
+ +
:
diff --git a/h-source/Application/Views/Bluetooth/catalogue.php b/h-source/Application/Views/Bluetooth/catalogue.php index 0d5897d..e63f337 100644 --- a/h-source/Application/Views/Bluetooth/catalogue.php +++ b/h-source/Application/Views/Bluetooth/catalogue.php @@ -48,6 +48,13 @@ :
+ +
+
:
+
+
+ +
:
diff --git a/h-source/Application/Views/Bluetooth/form.php b/h-source/Application/Views/Bluetooth/form.php index f6ba115..15c818c 100644 --- a/h-source/Application/Views/Bluetooth/form.php +++ b/h-source/Application/Views/Bluetooth/form.php @@ -40,9 +40,14 @@
- +
+ +
+ + +
diff --git a/h-source/Application/Views/Bluetooth/page.php b/h-source/Application/Views/Bluetooth/page.php index 87a0bf0..987a167 100644 --- a/h-source/Application/Views/Bluetooth/page.php +++ b/h-source/Application/Views/Bluetooth/page.php @@ -43,6 +43,13 @@
+ +
+
:
+
+
+ +
:
diff --git a/h-source/Application/Views/Fingerprintreaders/catalogue.php b/h-source/Application/Views/Fingerprintreaders/catalogue.php index 3423f60..537caf6 100644 --- a/h-source/Application/Views/Fingerprintreaders/catalogue.php +++ b/h-source/Application/Views/Fingerprintreaders/catalogue.php @@ -48,6 +48,13 @@ :
+ +
+
:
+
+
+ +
:
diff --git a/h-source/Application/Views/Fingerprintreaders/form.php b/h-source/Application/Views/Fingerprintreaders/form.php index a3b6221..3de6e82 100644 --- a/h-source/Application/Views/Fingerprintreaders/form.php +++ b/h-source/Application/Views/Fingerprintreaders/form.php @@ -40,9 +40,14 @@
- +
+ +
+ + +
diff --git a/h-source/Application/Views/Fingerprintreaders/page.php b/h-source/Application/Views/Fingerprintreaders/page.php index 1e5f6f0..ac8e800 100644 --- a/h-source/Application/Views/Fingerprintreaders/page.php +++ b/h-source/Application/Views/Fingerprintreaders/page.php @@ -43,6 +43,13 @@
+ +
+
:
+
+
+ +
:
diff --git a/h-source/Application/Views/Printers/catalogue.php b/h-source/Application/Views/Printers/catalogue.php index 7e42862..06764cb 100644 --- a/h-source/Application/Views/Printers/catalogue.php +++ b/h-source/Application/Views/Printers/catalogue.php @@ -48,6 +48,13 @@ :
+ +
+
:
+
+
+ +
:
diff --git a/h-source/Application/Views/Printers/form.php b/h-source/Application/Views/Printers/form.php index dd7be91..3ea3e3c 100644 --- a/h-source/Application/Views/Printers/form.php +++ b/h-source/Application/Views/Printers/form.php @@ -40,9 +40,14 @@
- +
+ +
+ + +
diff --git a/h-source/Application/Views/Printers/page.php b/h-source/Application/Views/Printers/page.php index c33b1d3..5f3c6fd 100644 --- a/h-source/Application/Views/Printers/page.php +++ b/h-source/Application/Views/Printers/page.php @@ -43,6 +43,13 @@
+ +
+
:
+
+
+ +
:
diff --git a/h-source/Application/Views/Scanners/catalogue.php b/h-source/Application/Views/Scanners/catalogue.php index aadc463..549c5c9 100644 --- a/h-source/Application/Views/Scanners/catalogue.php +++ b/h-source/Application/Views/Scanners/catalogue.php @@ -48,6 +48,13 @@ :
+ +
+
:
+
+
+ +
:
diff --git a/h-source/Application/Views/Scanners/form.php b/h-source/Application/Views/Scanners/form.php index d666514..bfb5f35 100644 --- a/h-source/Application/Views/Scanners/form.php +++ b/h-source/Application/Views/Scanners/form.php @@ -40,9 +40,14 @@
- +
+ +
+ + +
diff --git a/h-source/Application/Views/Scanners/page.php b/h-source/Application/Views/Scanners/page.php index 8be06c1..9c86831 100644 --- a/h-source/Application/Views/Scanners/page.php +++ b/h-source/Application/Views/Scanners/page.php @@ -43,6 +43,13 @@
+ +
+
:
+
+
+ +
:
diff --git a/h-source/Application/Views/Soundcards/catalogue.php b/h-source/Application/Views/Soundcards/catalogue.php index fd3daab..e4b265b 100644 --- a/h-source/Application/Views/Soundcards/catalogue.php +++ b/h-source/Application/Views/Soundcards/catalogue.php @@ -48,6 +48,13 @@ :
+ +
+
:
+
+
+ +
:
diff --git a/h-source/Application/Views/Soundcards/form.php b/h-source/Application/Views/Soundcards/form.php index 965ecfc..e0d4680 100644 --- a/h-source/Application/Views/Soundcards/form.php +++ b/h-source/Application/Views/Soundcards/form.php @@ -40,9 +40,14 @@
- +
+ +
+ + +
diff --git a/h-source/Application/Views/Soundcards/page.php b/h-source/Application/Views/Soundcards/page.php index 75ea7e6..7286bf5 100644 --- a/h-source/Application/Views/Soundcards/page.php +++ b/h-source/Application/Views/Soundcards/page.php @@ -43,6 +43,13 @@
+ +
+
:
+
+
+ +
:
diff --git a/h-source/Application/Views/Threegcards/catalogue.php b/h-source/Application/Views/Threegcards/catalogue.php index dc22f8c..a0962e4 100644 --- a/h-source/Application/Views/Threegcards/catalogue.php +++ b/h-source/Application/Views/Threegcards/catalogue.php @@ -48,6 +48,13 @@ :
+ +
+
:
+
+
+ +
:
diff --git a/h-source/Application/Views/Threegcards/form.php b/h-source/Application/Views/Threegcards/form.php index fd80f5a..5928cea 100644 --- a/h-source/Application/Views/Threegcards/form.php +++ b/h-source/Application/Views/Threegcards/form.php @@ -40,9 +40,14 @@
- +
+ +
+ + +
diff --git a/h-source/Application/Views/Threegcards/page.php b/h-source/Application/Views/Threegcards/page.php index ef79898..f9328fb 100644 --- a/h-source/Application/Views/Threegcards/page.php +++ b/h-source/Application/Views/Threegcards/page.php @@ -43,6 +43,13 @@
+ +
+
:
+
+
+ +
:
diff --git a/h-source/Application/Views/Videocards/catalogue.php b/h-source/Application/Views/Videocards/catalogue.php index bf69cd2..155c30b 100644 --- a/h-source/Application/Views/Videocards/catalogue.php +++ b/h-source/Application/Views/Videocards/catalogue.php @@ -48,6 +48,13 @@ :
+ +
+
:
+
+
+ +
:
diff --git a/h-source/Application/Views/Videocards/form.php b/h-source/Application/Views/Videocards/form.php index 5913882..bf0b1a4 100644 --- a/h-source/Application/Views/Videocards/form.php +++ b/h-source/Application/Views/Videocards/form.php @@ -40,9 +40,14 @@
- +
+ +
+ + +
diff --git a/h-source/Application/Views/Videocards/page.php b/h-source/Application/Views/Videocards/page.php index 5dd3db4..c0d5914 100644 --- a/h-source/Application/Views/Videocards/page.php +++ b/h-source/Application/Views/Videocards/page.php @@ -43,6 +43,13 @@
+ +
+
:
+
+
+ +
:
diff --git a/h-source/Application/Views/Webcams/catalogue.php b/h-source/Application/Views/Webcams/catalogue.php index 52a33db..5294f46 100644 --- a/h-source/Application/Views/Webcams/catalogue.php +++ b/h-source/Application/Views/Webcams/catalogue.php @@ -48,6 +48,13 @@ :
+ +
+
:
+
+
+ +
:
diff --git a/h-source/Application/Views/Webcams/form.php b/h-source/Application/Views/Webcams/form.php index e1b819c..adf92fe 100644 --- a/h-source/Application/Views/Webcams/form.php +++ b/h-source/Application/Views/Webcams/form.php @@ -40,9 +40,14 @@
- +
+ +
+ + +
diff --git a/h-source/Application/Views/Webcams/page.php b/h-source/Application/Views/Webcams/page.php index a13c1db..9cde78f 100644 --- a/h-source/Application/Views/Webcams/page.php +++ b/h-source/Application/Views/Webcams/page.php @@ -43,6 +43,13 @@
+ +
+
:
+
+
+ +
:
diff --git a/h-source/Application/Views/Wifi/catalogue.php b/h-source/Application/Views/Wifi/catalogue.php index 5e36380..a1bf725 100644 --- a/h-source/Application/Views/Wifi/catalogue.php +++ b/h-source/Application/Views/Wifi/catalogue.php @@ -48,6 +48,13 @@ :
+ +
+
:
+
+
+ +
:
diff --git a/h-source/Application/Views/Wifi/form.php b/h-source/Application/Views/Wifi/form.php index 1f31e88..c2adc23 100644 --- a/h-source/Application/Views/Wifi/form.php +++ b/h-source/Application/Views/Wifi/form.php @@ -40,9 +40,14 @@
- +
+ +
+ + +
diff --git a/h-source/Application/Views/Wifi/page.php b/h-source/Application/Views/Wifi/page.php index 2e040a6..a172a0c 100644 --- a/h-source/Application/Views/Wifi/page.php +++ b/h-source/Application/Views/Wifi/page.php @@ -43,6 +43,13 @@
+ +
+
:
+
+
+ +
:
diff --git a/h-source/Public/Css/main.css b/h-source/Public/Css/main.css index f37daf9..20c2f20 100644 --- a/h-source/Public/Css/main.css +++ b/h-source/Public/Css/main.css @@ -226,13 +226,18 @@ div#right padding:2px; border:1px solid #6495ED; } -.textarea_entry, .talk_textarea_entry +.textarea_entry, .talk_textarea_entry, .device_textarea_entry { width:630px; height:300px; padding:2px; border:1px solid #6495ED; } +.device_textarea_entry +{ + width:400px; + height:50px; +} /*.talk_input_entry { border:1px solid #CECECE; @@ -1715,4 +1720,9 @@ td.text_item_date float:right; font:normal 12px/1 sans-serif; color:#000; +} +span.entry_label_small +{ + font-weight:normal; + font-size:12px; } \ No newline at end of file diff --git a/h-source/tables.sql b/h-source/tables.sql index c3e69fe..08bdfa6 100644 --- a/h-source/tables.sql +++ b/h-source/tables.sql @@ -98,7 +98,8 @@ create table hardware ( sound_card_works varchar(30) CHARACTER SET utf8 not null default 'not-specified', bluetooth_works varchar(30) CHARACTER SET utf8 not null default 'not-specified', fingerprint_works varchar(30) CHARACTER SET utf8 not null default 'not-specified', - architecture char(15) not null default 'not-specified' + architecture char(15) not null default 'not-specified', + other_names text CHARACTER SET utf8 not null )engine=innodb; create table revisions ( @@ -130,6 +131,7 @@ create table revisions ( bluetooth_works varchar(30) CHARACTER SET utf8 not null default 'not-specified', fingerprint_works varchar(30) CHARACTER SET utf8 not null default 'not-specified', architecture char(15) not null default 'not-specified', + other_names text CHARACTER SET utf8 not null, id_hard INT UNSIGNED NOT NULL )engine=innodb; -- cgit v1.2.3