Comment added

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index b8b9705bfe467c8eb0bbc23d48976bf4bedc1347..ade12602091f1f9626d83c713a77fa6c401da7e8 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -55,90 +55,55 @@ require('inc/config-global.php');
 // Fix missing module to 'index'
 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",
-               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;
-
-               // Additionally admin?
-               if (IS_ADMIN()) {
-                       // Add it
-                       $username .= ' ({--_ADMIN_SHORT--})';
-               } // END - if
-       } else {
-               // Hmmm, logged in and no valid userid?
-               $username = '<em>{--_UNKNOWN--}</em>';
-
-               // Destroy session
-               destroyUserSession();
-
-               // Kill userid
-               setUserId(0);
-       }
-
-       // Free memory
-       SQL_FREERESULT($result);
-} elseif (IS_ADMIN()) {
-       // Admin is there
-       $username = getMessage('_ADMIN');
-} else {
-       // He's a guest, hello there... ;-)
-       $username = getMessage('_GUEST');
-}
-
 // The header file
 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';
+
+// Is the maintenance mode active or goes all well?
+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)
-       {
+       $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(constant('__MODULE'))) && (getTotalFatalErrors() == 0)) {
+                       if ((isFileReadable($GLOBALS['module_inc'])) && (getTotalFatalErrors() == 0)) {
                                // Module is valid, active and located on the local disc...
-                               $MOD_VALID = true;
+                               $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'), $GLOBALS['module']));
+                               addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), getModule()));
                        }
                        break;
 
                case '404':
-                       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
+                       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), getModule()));
                        break;
 
                case 'locked':
-                       if (!isFileReadable(constant('__MODULE'))) {
+                       if (!isFileReadable($GLOBALS['module_inc'])) {
                                // Module does addionally not exists
-                               addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
+                               addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), getModule()));
                        } // END - if
 
                        // Add fatal message
-                       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_LOCKED'), $GLOBALS['module']));
+                       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, $GLOBALS['module']));
+                       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;
        }
@@ -147,13 +112,13 @@ if ((getConfig('maintenance') == 'Y') && (!IS_ADMIN()) && ($GLOBALS['module'] !=
        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