More getModule() used, some SQL rewrites, constant __MODULE rewritten

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index 8b2c771373866a359b42bbbd39fd0fc8ac626fda..dcc22657d4362df9c61d6d8832b4d415d8027e6e 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -42,11 +42,11 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
+// Init start time
 $GLOBALS['startTime'] = microtime(true);
+
+// Init output mode and module
 $GLOBALS['output_mode'] = 0;
-$GLOBALS['what']   = '';
-$GLOBALS['action'] = '';
 $GLOBALS['module'] = '';
 
 // Needed include files
@@ -58,7 +58,7 @@ if (!REQUEST_ISSET_GET('module')) REQUEST_SET_GET('module', 'index');
 // Check if logged in
 if (IS_MEMBER()) {
        // Is still logged in so we welcome him with his name
-       $result = SQL_QUERY_ESC("SELECT surname, family FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT `surname`, `family` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
                array(getUserId()), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Load surname and family's name and build the username
@@ -95,64 +95,64 @@ if (IS_MEMBER()) {
 loadIncludeOnce('inc/header.php');
 
 // Modules are by default not valid!
-$MOD_VALID = false; $check = 'failed';
-if ((getConfig('maintenance') == 'Y') && (!IS_ADMIN()) && ($GLOBALS['module'] != 'admin')) {
+$isModuleValid = false; $check = 'failed';
+if ((getConfig('maintenance') == 'Y') && (!IS_ADMIN()) && (getModule() != 'admin')) {
        // Maintain mode is active and you are no admin
        addFatalMessage(__FILE__, __LINE__, getMessage('LANG_DOWN_MAINTAINCE'));
 } elseif ((SQL_IS_LINK_UP()) && (getTotalFatalErrors() == 0)) {
        // Construct module name
-       define('__MODULE', sprintf("inc/modules/%s.php", SQL_ESCAPE($GLOBALS['module'])));
+       $GLOBALS['module_inc'] =  sprintf("inc/modules/%s.php", SQL_ESCAPE(getModule()));
 
        // Did we found the module listed in allowed modules and are we successfully connected?
-       $check = checkModulePermissions($GLOBALS['module']);
-       switch ($check)
-       {
-       case 'admin_only':
-       case 'mem_only':
-       case 'done':
-               // Does the module exists on local file system?
-               if ((isFileReadable(constant('__MODULE'))) && (getTotalFatalErrors() == 0)) {
-                       // Module is valid, active and located on the local disc...
-                       $MOD_VALID = true;
-               } elseif (!empty($URL)) {
-                       // An URL was specified so we load the de-referrer module
-                       redirectToUrl(DEREFERER($URL));
-               } elseif (getTotalFatalErrors() == 0) {
-                       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
-               }
-               break;
-
-       case '404':
-               addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
-               break;
-
-       case 'locked':
-               if (!isFileReadable(constant('__MODULE'))) {
-                       // Module does addionally not exists
-                       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
-               } // END - if
-
-               // Add fatal message
-               addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_LOCKED'), $GLOBALS['module']));
-               break;
-
-       default:
-               DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $check, $GLOBALS['module']));
-               addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_UNKNOWN'), $check));
-               break;
+       $check = checkModulePermissions(getModule());
+       switch ($check) {
+               case 'cache_miss': // The cache is gone
+               case 'admin_only': // Admin-only access
+               case 'mem_only': // Member-only access
+               case 'done': // All fine!
+                       // Does the module exists on local file system?
+                       if ((isFileReadable($GLOBALS['module_inc'])) && (getTotalFatalErrors() == 0)) {
+                               // Module is valid, active and located on the local disc...
+                               $isModuleValid = true;
+                       } elseif (!empty($URL)) {
+                               // An URL was specified so we load the de-referrer module
+                               redirectToUrl(DEREFERER($URL));
+                       } elseif (getTotalFatalErrors() == 0) {
+                               addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), getModule()));
+                       }
+                       break;
+
+               case '404':
+                       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), getModule()));
+                       break;
+
+               case 'locked':
+                       if (!isFileReadable($GLOBALS['module_inc'])) {
+                               // Module does addionally not exists
+                               addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), getModule()));
+                       } // END - if
+
+                       // Add fatal message
+                       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_LOCKED'), getModule()));
+                       break;
+
+               default:
+                       DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $check, getModule()));
+                       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_UNKNOWN'), $check));
+                       break;
        }
 } elseif (getTotalFatalErrors() == 0) {
        // MySQL problems!
        addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_ERRORS'));
 }
 
-if (($MOD_VALID) && (defined('__MODULE'))) {
+if (($isModuleValid === true) && (isset($GLOBALS['module_inc']))) {
        /////////////////////////////////////////////
        // Main including line DO NOT REMOVE/EDIT! //
        /////////////////////////////////////////////
        //
        // Everything is okay so we can load the module
-       loadIncludeOnce(constant('__MODULE'));
+       loadIncludeOnce($GLOBALS['module_inc']);
 } // END - if
 
 // Next-to-end add the footer