Notice added to always include debug.log in your full bug report

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index 47fa7a3c0ad58eec9388f935812e2bbb68f33985..71a861f0cd1b0be15ef48d4a2cfc81bd0f39ef7d 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -39,7 +39,7 @@
 // XDEBUG call
 //xdebug_start_trace();
 
-// Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
+// Load security stuff here
 require('inc/libs/security_functions.php');
 
 // Init "action" and "what"
@@ -50,7 +50,7 @@ $GLOBALS['action'] = '';
 $GLOBALS['module'] = '';
 
 // Needed include files
-require('inc/config.php');
+require('inc/config-global.php');
 
 // Fix missing module to 'index'
 if (!REQUEST_ISSET_GET('module')) REQUEST_SET_GET('module', 'index');
@@ -59,11 +59,11 @@ if (!REQUEST_ISSET_GET('module')) REQUEST_SET_GET('module', 'index');
 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",
-               array(getUserId()), __FILE__, __LINE__);
+       array(getUserId()), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Load surname and family's name and build the username
                list($s, $f) = SQL_FETCHROW($result);
-               $username = $s.' '.$f;
+               $username = $s . ' ' . $f;
 
                // Additionally admin?
                if (IS_ADMIN()) {
@@ -107,39 +107,39 @@ if ((getConfig('maintenance') == 'Y') && (!IS_ADMIN()) && ($GLOBALS['module'] !=
        $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) {
+               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 '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;
+                       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;
        }
 } elseif (getTotalFatalErrors() == 0) {
        // MySQL problems!