Module: nagvis Branch: master Commit: d1e94e31d50b6c0c97128e70f1f693ced0d9ad9d URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=d1e94e31d50b6c0c97128e70f1f693ced0d9ad9d
Author: LaMi <[email protected]> Date: Mon May 17 18:25:06 2010 +0200 #284 fixed map editing code; The new validation code was broken :-( --- share/server/core/classes/CoreModMap.php | 10 ++++------ share/server/core/classes/CoreRequestHandler.php | 5 ++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/share/server/core/classes/CoreModMap.php b/share/server/core/classes/CoreModMap.php index 03857fd..35d8f62 100644 --- a/share/server/core/classes/CoreModMap.php +++ b/share/server/core/classes/CoreModMap.php @@ -77,14 +77,12 @@ class CoreModMap extends CoreModule { case 'doTmplAdd': case 'doTmplModify': case 'doTmplDelete': - $FHANDLER = new CoreRequestHandler($_POST); + $FHANDLER = new CoreRequestHandler(array_merge($_GET, $_POST)); if($FHANDLER->match('map', MATCH_MAP_NAME)) $this->name = $FHANDLER->get('map'); - else { - // FIXME: Error handling - echo "Invalid Format"; - exit(1); - } + else + new GlobalMessage('ERROR', $this->CORE->getLang()->getText('Invalid query. The parameter [NAME] is missing or has an invalid format.', + Array('NAME' => 'map'))); break; } diff --git a/share/server/core/classes/CoreRequestHandler.php b/share/server/core/classes/CoreRequestHandler.php index d4bb32a..946a0f6 100644 --- a/share/server/core/classes/CoreRequestHandler.php +++ b/share/server/core/classes/CoreRequestHandler.php @@ -45,6 +45,9 @@ class CoreRequestHandler { } public function match($sKey, $regex) { + if(!isset($this->aOpts[$sKey])) + return false; + // If this is an array validate the single values. When one of the values // is invalid return false. if(is_array($this->aOpts[$sKey])) { @@ -58,7 +61,7 @@ class CoreRequestHandler { } public function isSetAndNotEmpty($sKey) { - return isset($this->aOpts[$sKey]) && $this->aOpts[$sKey] != ''; + return (isset($this->aOpts[$sKey]) && $this->aOpts[$sKey] != ''); } public static function getReferer($default) { ------------------------------------------------------------------------------ _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
