Old config.php is now automatically updated to new config-local.php format, several...

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index 8b2c771373866a359b42bbbd39fd0fc8ac626fda..71a861f0cd1b0be15ef48d4a2cfc81bd0f39ef7d 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -59,7 +59,7 @@ 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);
@@ -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!