Complete rewrite of and , wrapper functions added, see bug #101

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index cdb5daf0b8b29fc4790734598132132cd87a3129..3a95d923ba0e1db9193fbacde8d79f92632cdb90 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -38,21 +38,21 @@
 require("inc/libs/security_functions.php");
 
 // Init "action" and "what"
-global $what, $action, $startTime;
 $GLOBALS['startTime'] = microtime(true);
 $GLOBALS['output_mode'] = 0;
-$GLOBALS['what'] = ""; $GLOBALS['action'] = "";
+$GLOBALS['what']   = "";
+$GLOBALS['action'] = "";
 $GLOBALS['userid'] = 0;
 
 // Fix missing module to "index"
-if (empty($_GET['module'])) $_GET['module'] = "index";
+if (!REQUEST_ISSET_GET(('module'))) REQUEST_SET_GET('module', "index");
 
 // Secure action/what if present
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what']))   $GLOBALS['what']   = secureString($_GET['what']);
+if (REQUEST_ISSET_GET(('action'))) $GLOBALS['action'] = secureString(REQUEST_GET('action'));
+if (REQUEST_ISSET_GET(('what')))   $GLOBALS['what']   = secureString(REQUEST_GET('what'));
 
 // Secure the module name (very important line!)
-$GLOBALS['module'] = secureString($_GET['module']);
+$GLOBALS['module'] = secureString(REQUEST_GET('module'));
 
 // Needed include files
 require("inc/config.php");
@@ -101,7 +101,7 @@ $MOD_VALID = false; $check = "failed";
 if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] != "admin")) {
        // Maintain mode is active and you are no admin
        addFatalMessage(getMessage('LANG_DOWN_MAINTAINCE'));
-} elseif (($link) && ($db) && (getTotalFatalErrors() == 0)) {
+} elseif ((SQL_IS_LINK_UP()) && (getTotalFatalErrors() == 0)) {
        // Construct module name
        define('__MODULE', sprintf("inc/modules/%s.php", SQL_ESCAPE($GLOBALS['module'])));