From ba62152bfdad584c231dc3e941cd1974dd5d881c Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Tue, 18 Oct 2011 17:38:01 +0000 Subject: more characters are now allowed for the kernel entry --- h-source/Application/Controllers/NotebooksController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'h-source/Application/Controllers/NotebooksController.php') diff --git a/h-source/Application/Controllers/NotebooksController.php b/h-source/Application/Controllers/NotebooksController.php index febf5f9..45f8b17 100644 --- a/h-source/Application/Controllers/NotebooksController.php +++ b/h-source/Application/Controllers/NotebooksController.php @@ -44,8 +44,8 @@ class NotebooksController extends GenericController //hardware conditions $this->m['HardwareModel']->strongConditions['update'] = array( "checkIsStrings|".Notebooks::vendorsList() => "vendor", - "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", + "checkNotEmpty" => "model|you have to fill the model name entry", + "checkMatch|".Hardware::$regExpressions['model'] => "model|characters not allowed in the model name entry", "+checkIsStrings|".Notebooks::compatibilityList() => "compatibility", "checkLength|99" => "model", "+checkLength|299" => "distribution", @@ -62,7 +62,7 @@ class NotebooksController extends GenericController $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 kernel entry", + "checkMatch|".Hardware::$regExpressions['kernel'] => "kernel|characters not allowed in the kernel entry", "checkLength|20000" => "description", "++checkLength|99" => "video_card_type,wifi_type", "+++checkLength|49" => "kernel", -- cgit v1.2.3