Module: nagvis Branch: master Commit: c254b070ac6817042359445f72fbd39e3770f358 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=c254b070ac6817042359445f72fbd39e3770f358
Author: Lars Michelsen <[email protected]> Date: Sun May 9 19:24:04 2010 +0200 Fixed wrong regex definitions --- share/server/core/classes/CoreRequestHandler.php | 3 ++- share/server/core/defines/matches.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/share/server/core/classes/CoreRequestHandler.php b/share/server/core/classes/CoreRequestHandler.php index 986e529..d4bb32a 100644 --- a/share/server/core/classes/CoreRequestHandler.php +++ b/share/server/core/classes/CoreRequestHandler.php @@ -52,8 +52,9 @@ class CoreRequestHandler { if(!preg_match($regex, $val)) return false; return true; - } else + } else { return preg_match($regex, $this->aOpts[$sKey]); + } } public function isSetAndNotEmpty($sKey) { diff --git a/share/server/core/defines/matches.php b/share/server/core/defines/matches.php index 7a88799..a4d4e54 100644 --- a/share/server/core/defines/matches.php +++ b/share/server/core/defines/matches.php @@ -64,8 +64,8 @@ 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_USER_NAME', '/^[0-9a-za-z_-...@\s]+$/'); -define('MATCH_ROLE_NAME', '/^[0-9a-za-z_-...@\s]+$/'); +define('MATCH_USER_NAME', '/^[0-9a-za-z_-\...@]+$/'); +define('MATCH_ROLE_NAME', '/^[0-9a-za-z_-\...@]+$/'); define('MATCH_URI_PART', '/^[a-zA-Z0-9-_]*$/'); ------------------------------------------------------------------------------ _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
