diff options
| author | Antonio Gallo <tonicucoz@gmail.com> | 2011-05-08 15:52:39 +0000 |
|---|---|---|
| committer | Antonio Gallo <tonicucoz@gmail.com> | 2011-05-08 15:52:39 +0000 |
| commit | a60b8d9cc5078a894e007e5252313185e9810c2e (patch) | |
| tree | 2c75fac7220078d65c10c2c489aaae66d44d4b05 /h-source/Application/Controllers | |
| parent | 929e290e5241c4c759be287495214e60352eb43c (diff) | |
h-source:added architecture entry for notebooks
Diffstat (limited to 'h-source/Application/Controllers')
| -rw-r--r-- | h-source/Application/Controllers/DownloadController.php | 3 | ||||
| -rw-r--r-- | h-source/Application/Controllers/NotebooksController.php | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/h-source/Application/Controllers/DownloadController.php b/h-source/Application/Controllers/DownloadController.php index d55f5ad..64eec34 100644 --- a/h-source/Application/Controllers/DownloadController.php +++ b/h-source/Application/Controllers/DownloadController.php @@ -69,6 +69,7 @@ class DownloadController extends BaseController } if ($type === 'notebook') { + $xml .= "\t\t<architecture>".$row['hardware']['architecture']."</architecture>\n"; $xml .= "\t\t<free_bios>".$row['hardware']['bios']."</free_bios>\n"; } @@ -138,7 +139,7 @@ class DownloadController extends BaseController $xml .= "\t\t<it_works>".$row['hardware']['fingerprint_works']."</it_works>\n"; } - $devicesWithDriverEntry = array('printer','scanner','soundcard','webcam','bluetooth','wifi','videocard','acquisition-card','fingerprint-reader'); + $devicesWithDriverEntry = array('printer','scanner','soundcard','webcam','bluetooth','wifi','videocard','acquisition-card','fingerprint-reader','3G-card'); if (in_array($type,$devicesWithDriverEntry)) { $xml .= "\t\t<driver>".$row['hardware']['driver']."</driver>\n"; diff --git a/h-source/Application/Controllers/NotebooksController.php b/h-source/Application/Controllers/NotebooksController.php index 03fe4f4..b533a4e 100644 --- a/h-source/Application/Controllers/NotebooksController.php +++ b/h-source/Application/Controllers/NotebooksController.php @@ -55,6 +55,7 @@ class NotebooksController extends GenericController "+++++checkIsStrings|".Notebooks::videoList() => "video_card_works", "++++++checkIsStrings|".Notebooks::$biosSelect => "bios", "+++++++checkIsStrings|".Notebooks::webcamList() => "webcam_works", + "++++++++checkIsStrings|".Notebooks::$architectureSelect => "architecture", ); $this->m['HardwareModel']->strongConditions['insert'] = array( @@ -70,6 +71,7 @@ class NotebooksController extends GenericController "+++++checkIsStrings|".Notebooks::videoList() => "video_card_works", "++++++checkIsStrings|".Notebooks::$biosSelect => "bios", "+++++++checkIsStrings|".Notebooks::webcamList() => "webcam_works", + "++++++++checkIsStrings|".Notebooks::$architectureSelect => "architecture", ); $this->m['HardwareModel']->softConditions['update'] = array( @@ -92,7 +94,7 @@ class NotebooksController extends GenericController "+++checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\/\,\:\;\(\)\[\]]+$/" => "webcam_type|only the following characters are allowed for the <i>webcam</i> entry: a-z A-Z 0-9 - _ . + / , : ; ( ) [ ]", ); - $this->m['HardwareModel']->setFields('vendor,model,compatibility,kernel,description,distribution,video_card_type,video_card_works,wifi_type,wifi_works,comm_year,subtype,bios,webcam_type,webcam_works','sanitizeAll'); + $this->m['HardwareModel']->setFields('vendor,model,compatibility,kernel,description,distribution,video_card_type,video_card_works,wifi_type,wifi_works,comm_year,subtype,bios,webcam_type,webcam_works,architecture','sanitizeAll'); $argKeys = array( 'page:forceNat' => 1, |