aboutsummaryrefslogtreecommitdiff
path: root/h-source/Application/Controllers
diff options
context:
space:
mode:
Diffstat (limited to 'h-source/Application/Controllers')
-rw-r--r--h-source/Application/Controllers/DownloadController.php1
-rw-r--r--h-source/Application/Controllers/NotebooksController.php29
2 files changed, 5 insertions, 25 deletions
diff --git a/h-source/Application/Controllers/DownloadController.php b/h-source/Application/Controllers/DownloadController.php
index d58ba6c..1e4f94e 100644
--- a/h-source/Application/Controllers/DownloadController.php
+++ b/h-source/Application/Controllers/DownloadController.php
@@ -71,6 +71,7 @@ class DownloadController extends BaseController
{
$xml .= "\t\t<architecture>".translate($row['hardware']['architecture'])."</architecture>\n";
$xml .= "\t\t<free_bios>".$row['hardware']['bios']."</free_bios>\n";
+ $xml .= "\t\t<can_free_systems_be_installed>".$row['hardware']['can_free_systems_be_installed']."</can_free_systems_be_installed>\n";
}
$xml .= "\t\t<model_name>".$row['hardware']['model']."</model_name>\n";
diff --git a/h-source/Application/Controllers/NotebooksController.php b/h-source/Application/Controllers/NotebooksController.php
index 103ac05..febf5f9 100644
--- a/h-source/Application/Controllers/NotebooksController.php
+++ b/h-source/Application/Controllers/NotebooksController.php
@@ -56,23 +56,10 @@ class NotebooksController extends GenericController
"++++++checkIsStrings|".Notebooks::$biosSelect => "bios",
"+++++++checkIsStrings|".Notebooks::webcamList() => "webcam_works",
"++++++++checkIsStrings|".Notebooks::architectureList() => "architecture",
+ "+++++++++checkIsStrings|".Notebooks::$installableSelect => "can_free_systems_be_installed",
);
- $this->m['HardwareModel']->strongConditions['insert'] = array(
- "checkIsStrings|".Notebooks::vendorsList() => "vendor",
- "checkNotEmpty" => "model|you have to fill the <i>model name</i> entry",
- "checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\(\)\[\]\/]+$/" => "model|characters not allowed in the <i>model name</i> entry",
- "+checkIsStrings|".Notebooks::compatibilityList() => "compatibility",
- "checkLength|99" => "model",
- "+checkLength|299" => "distribution",
- "++checkIsStrings|".Notebooks::$commYear => "comm_year",
- "+++checkIsStrings|".Notebooks::$subtypeSelect => "subtype",
- "++++checkIsStrings|".Notebooks::wifiList() => "wifi_works",
- "+++++checkIsStrings|".Notebooks::videoList() => "video_card_works",
- "++++++checkIsStrings|".Notebooks::$biosSelect => "bios",
- "+++++++checkIsStrings|".Notebooks::webcamList() => "webcam_works",
- "++++++++checkIsStrings|".Notebooks::architectureList() => "architecture",
- );
+ $this->m['HardwareModel']->strongConditions['insert'] = $this->m['HardwareModel']->strongConditions['update'];
$this->m['HardwareModel']->softConditions['update'] = array(
"checkMatch|/^[a-zA-Z0-9\-\_\.\+\s]+$/" => "kernel|characters not allowed in the <i>kernel</i> entry",
@@ -84,17 +71,9 @@ 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']->softConditions['insert'] = array(
- "checkMatch|/^[a-zA-Z0-9\-\_\.\+\s]+$/" => "kernel|characters not allowed in the <i>kernel</i> entry",
- "checkLength|20000" => "description",
- "++checkLength|99" => "video_card_type,wifi_type",
- "+++checkLength|49" => "kernel",
- "+checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\/\,\:\;\(\)\[\]]+$/" => "video_card_type|only the following characters are allowed for the <i>videocard</i> entry: a-z A-Z 0-9 - _ . + / , : ; ( ) [ ]",
- "++checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\/\,\:\;\(\)\[\]]+$/" => "wifi_type|only the following characters are allowed for the <i>wifi</i> entry: a-z A-Z 0-9 - _ . + / , : ; ( ) [ ]",
- "+++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']->softConditions['insert'] = $this->m['HardwareModel']->softConditions['update'];
- $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');
+ $this->m['HardwareModel']->setFields('vendor,model,compatibility,kernel,description,distribution,video_card_type,video_card_works,wifi_type,wifi_works,comm_year,subtype,bios,can_free_systems_be_installed,webcam_type,webcam_works,architecture','sanitizeAll');
$argKeys = array(
'page:forceNat' => 1,