diff options
| author | Antonio Gallo <tonicucoz@gmail.com> | 2014-05-14 23:40:22 +0000 |
|---|---|---|
| committer | Antonio Gallo <tonicucoz@gmail.com> | 2014-05-14 23:40:22 +0000 |
| commit | 5abe267448ca813f35a6bf9f9e5a08ded732efe3 (patch) | |
| tree | 762fd64b152d95ee59055574444fdc7e032011d6 /h-source/Application | |
| parent | 85eb15843108c27ae9e081a894ad9f864ce4a467 (diff) | |
kernel entry can keep 99 characters -- issue 234 submitted by goritskov at h-node.org
Diffstat (limited to 'h-source/Application')
| -rw-r--r-- | h-source/Application/Controllers/NotebooksController.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Controllers/PrintersController.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Models/HardwareModel.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/h-source/Application/Controllers/NotebooksController.php b/h-source/Application/Controllers/NotebooksController.php index 4128a00..02ffbea 100644 --- a/h-source/Application/Controllers/NotebooksController.php +++ b/h-source/Application/Controllers/NotebooksController.php @@ -64,7 +64,7 @@ class NotebooksController extends GenericController "checkMatch|".Hardware::$regExpressions['kernel'] => "kernel|characters not allowed in the <i>kernel</i> entry", "checkLength|40000" => "description", "++checkLength|99" => "video_card_type,wifi_type", - "+++checkLength|49" => "kernel", + "+++checkLength|99" => "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 - _ . + / , : ; ( ) [ ]", diff --git a/h-source/Application/Controllers/PrintersController.php b/h-source/Application/Controllers/PrintersController.php index 438bbba..fb78761 100644 --- a/h-source/Application/Controllers/PrintersController.php +++ b/h-source/Application/Controllers/PrintersController.php @@ -59,7 +59,7 @@ class PrintersController extends GenericController "checkMatch|".Hardware::$regExpressions['kernel'] => "kernel|characters not allowed in the <i>kernel</i> entry", "checkLength|40000" => "description", "+checkLength|49" => "driver", - "++checkLength|49" => "kernel", + "++checkLength|99" => "kernel", "++checkMatch|".Hardware::$regExpressions['driver'] => "driver|only the following characters are allowed for the <i>driver</i> entry: a-z A-Z 0-9 - _ . + s / , : ; ( ) [ ]", "+++checkLength|1000" => "other_names|the <i>other names</i> entry exceeds the value of 1000 characters", ); diff --git a/h-source/Application/Models/HardwareModel.php b/h-source/Application/Models/HardwareModel.php index 65bf868..9c8a5db 100644 --- a/h-source/Application/Models/HardwareModel.php +++ b/h-source/Application/Models/HardwareModel.php @@ -91,7 +91,7 @@ class HardwareModel extends Model_Map { $this->softConditions['update'] = array( "checkMatch|".Hardware::$regExpressions['kernel'] => "kernel|characters not allowed in the <i>kernel</i> entry", "checkLength|40000" => "description", - "+checkLength|49" => "kernel", + "+checkLength|99" => "kernel", "++checkLength|49" => "driver", "++checkMatch|".Hardware::$regExpressions['driver'] => "driver|only the following characters are allowed for the <i>driver</i> entry: a-z A-Z 0-9 - _ . + s / , : ; ( ) [ ]", "+++checkLength|1000" => "other_names|the <i>other names</i> entry exceeds the value of 1000 characters", |