Module: nagvis Branch: master Commit: 0e8e8a43237aa38242bab0af09f45a3278bc75ed URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=0e8e8a43237aa38242bab0af09f45a3278bc75ed
Author: LaMi <[email protected]> Date: Tue Mar 16 21:45:41 2010 +0100 Corrected some validations --- share/server/core/classes/GlobalMapCfg.php | 12 ++++++------ share/server/core/defines/matches.php | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/share/server/core/classes/GlobalMapCfg.php b/share/server/core/classes/GlobalMapCfg.php index da6e6b9..ec81424 100644 --- a/share/server/core/classes/GlobalMapCfg.php +++ b/share/server/core/classes/GlobalMapCfg.php @@ -242,7 +242,7 @@ class GlobalMapCfg { 'depends_value' => '1'), 'label_width' => Array('must' => 0, 'default' => 'auto', - 'match' => MATCH_INTEGER, + 'match' => MATCH_TEXTBOX_WIDTH, 'depends_on' => 'label_show', 'depends_value' => '1'), 'label_background' => Array('must' => 0, @@ -406,7 +406,7 @@ class GlobalMapCfg { 'depends_value' => '1'), 'label_width' => Array('must' => 0, 'default' => '', - 'match' => MATCH_INTEGER, + 'match' => MATCH_TEXTBOX_WIDTH, 'depends_on' => 'label_show', 'depends_value' => '1'), 'label_background' => Array('must' => 0, @@ -564,7 +564,7 @@ class GlobalMapCfg { 'depends_value' => '1'), 'label_width' => Array('must' => 0, 'default' => '', - 'match' => MATCH_INTEGER, + 'match' => MATCH_TEXTBOX_WIDTH, 'depends_on' => 'label_show', 'depends_value' => '1'), 'label_background' => Array('must' => 0, @@ -739,7 +739,7 @@ class GlobalMapCfg { 'depends_value' => '1'), 'label_width' => Array('must' => 0, 'default' => '', - 'match' => MATCH_INTEGER, + 'match' => MATCH_TEXTBOX_WIDTH, 'depends_on' => 'label_show', 'depends_value' => '1'), 'label_background' => Array('must' => 0, @@ -892,7 +892,7 @@ class GlobalMapCfg { 'depends_value' => '1'), 'label_width' => Array('must' => 0, 'default' => '', - 'match' => MATCH_INTEGER, + 'match' => MATCH_TEXTBOX_WIDTH, 'depends_on' => 'label_show', 'depends_value' => '1'), 'label_background' => Array('must' => 0, @@ -1041,7 +1041,7 @@ class GlobalMapCfg { 'depends_value' => '1'), 'label_width' => Array('must' => 0, 'default' => '', - 'match' => MATCH_INTEGER, + 'match' => MATCH_TEXTBOX_WIDTH, 'depends_on' => 'label_show', 'depends_value' => '1'), 'label_background' => Array('must' => 0, diff --git a/share/server/core/defines/matches.php b/share/server/core/defines/matches.php index ce12c0c..11c6e7c 100644 --- a/share/server/core/defines/matches.php +++ b/share/server/core/defines/matches.php @@ -35,7 +35,7 @@ define('MATCH_STRING_PATH', '/^[0-9a-z\s\_\.\-\/\\\]+$/i'); define('MATCH_STRING_URL', '/^[0-9a-z\s\:\+\[\]\(\)\=\%\?\&\_\.\-...@\=\/\\\]+$/i'); define('MATCH_STRING_URL_EMPTY', '/^[0-9a-z\s\:\+\[\]\(\)\=\%\?\&\_\.\-...@\=\/\\\]*$/i'); define('MATCH_GADGET_OPT', '/^[0-9a-z\s\:\+\[\]\(\)\_\.\,\-\&\?\!...@\=\/\\\%]+$/i'); -define('MATCH_STRING_STYLE', '/^[0-9a-z\:\;\-\+\%]+$/i'); +define('MATCH_STRING_STYLE', '/^[0-9a-z\:\;\-\+\%]*$/i'); define('MATCH_INTEGER', '/^[0-9]+$/'); define('MATCH_INTEGER_EMPTY', '/^[0-9]*$/'); ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
