Module: nagvis Branch: nagvis-1.4 Commit: d744785e80bea8227f500010557b3c29a04d835f URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=d744785e80bea8227f500010557b3c29a04d835f
Author: LaMi <[email protected]> Date: Thu Feb 4 19:35:10 2010 +0100 #185 Added space and percent sign to allowed chars in gadget_opts --- nagvis/nagvis/includes/classes/GlobalMapCfg.php | 2 +- nagvis/nagvis/includes/defines/matches.php | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/nagvis/nagvis/includes/classes/GlobalMapCfg.php b/nagvis/nagvis/includes/classes/GlobalMapCfg.php index 15f4e54..4553fc9 100644 --- a/nagvis/nagvis/includes/classes/GlobalMapCfg.php +++ b/nagvis/nagvis/includes/classes/GlobalMapCfg.php @@ -618,7 +618,7 @@ class GlobalMapCfg { 'depends_value' => 'gadget'), 'gadget_opts' => Array('must' => 0, 'default' => '', - 'match' => MATCH_STRING_NO_SPACE, + 'match' => MATCH_GADGET_OPT, 'depends_on' => 'view_type', 'depends_value' => 'gadget'), diff --git a/nagvis/nagvis/includes/defines/matches.php b/nagvis/nagvis/includes/defines/matches.php index ebf77e7..bf4a714 100644 --- a/nagvis/nagvis/includes/defines/matches.php +++ b/nagvis/nagvis/includes/defines/matches.php @@ -34,6 +34,7 @@ define('MATCH_STRING_NO_SPACE_EMPTY', '/^[0-9a-z\:\+\[\]\(\)\_\.\,\-\&\?\!...@\= 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_INTEGER', '/^[0-9]+$/'); define('MATCH_FLOAT', '/^[0-9]+[\.\,]*[0-9]*$/'); ------------------------------------------------------------------------------ The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
