Module: nagvis Branch: master Commit: 3c40f9d8e0e4a24ea7203e202b989c2b9aa3fd00 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=3c40f9d8e0e4a24ea7203e202b989c2b9aa3fd00
Author: Lars Michelsen <[email protected]> Date: Sun Jul 25 14:35:09 2010 +0200 Fixed wrong validations of line_type attribute --- share/server/core/classes/GlobalMapCfg.php | 2 +- share/server/core/defines/matches.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/server/core/classes/GlobalMapCfg.php b/share/server/core/classes/GlobalMapCfg.php index 0ff0e84..7dd37b3 100644 --- a/share/server/core/classes/GlobalMapCfg.php +++ b/share/server/core/classes/GlobalMapCfg.php @@ -1161,7 +1161,7 @@ class GlobalMapCfg { 'default' => 10, 'match' => MATCH_INTEGER), 'line_type' => Array('must' => 1, - 'match' => MATCH_INTEGER, + 'match' => MATCH_LINE_TYPE, 'field_type' => 'dropdown'), 'line_width' => Array('must' => 0, 'default' => '3', diff --git a/share/server/core/defines/matches.php b/share/server/core/defines/matches.php index d663c7e..cbda081 100644 --- a/share/server/core/defines/matches.php +++ b/share/server/core/defines/matches.php @@ -65,7 +65,7 @@ define('MATCH_VIEW_TYPE_SERVICE_EMPTY', '/^(?:icon|line|gadget)*$/i'); define('MATCH_GET_OBJECT_TYPE', '/^(state|complete)$/'); define('MATCH_OBJECT_TYPES', '/^(host|service|hostgroup|servicegroup|map|automap)$/'); define('MATCH_AUTOMAP_RENDER_MODE', '/^(directed|undirected|radial|circular|undirected2)?$/'); -define('MATCH_LINE_TYPE', '/^(10|11|12)?$/'); +define('MATCH_LINE_TYPE', '/^(10|11|12|13|14)?$/'); define('MATCH_LINE_ARROW', '/^(none|forward|back|both)?$/'); define('MATCH_USER_NAME', '/^[0-9a-za-z_\-...@\s]+$/'); define('MATCH_ROLE_NAME', '/^[0-9a-za-z_\-...@\s]+$/'); ------------------------------------------------------------------------------ This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
