and rewritten to functions

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index f1b619b29e731126af0f8c9e5b2162841501933f..0b111174af4508e3aaa7040b9fd4e310e3154a5e 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -35,12 +35,12 @@
 //xdebug_start_trace();
 
 // Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
-require_once("inc/libs/security_functions.php");
+require("inc/libs/security_functions.php");
 
 // Init "action" and "what"
 global $what, $action, $startTime;
 $GLOBALS['startTime'] = microtime(true);
-$CSS = 0;
+$GLOBALS['output_mode'] = 0;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
 $GLOBALS['userid'] = 0;
 
@@ -49,13 +49,13 @@ if (empty($_GET['module'])) $_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 (!empty($_GET['what']))   $GLOBALS['what']   = secureString($_GET['what']);
 
 // Secure the module name (very important line!)
 $GLOBALS['module'] = secureString($_GET['module']);
 
 // Needed include files
-require_once("inc/config.php");
+require("inc/config.php");
 
 // Check if logged in
 if (IS_MEMBER()) {
@@ -70,11 +70,11 @@ if (IS_MEMBER()) {
                // Additionally admin?
                if (IS_ADMIN()) {
                        // Add it
-                       $username .= " ("._ADMIN_SHORT.")";
+                       $username .= " ({!_ADMIN_SHORT!})";
                } // END - if
        } else {
                // Hmmm, logged in and no valid userid?
-               $username = "<em>"._UNKNOWN."</em>";
+               $username = "<em>{!_UNKNOWN!}</em>";
 
                // Destroy session
                destroy_user_session();
@@ -87,10 +87,10 @@ if (IS_MEMBER()) {
        SQL_FREERESULT($result);
 } elseif (IS_ADMIN()) {
        // Admin is there
-       $username = _ADMIN;
+       $username = getMessage('_ADMIN');
 } else {
        // He's a guest, hello there... ;-)
-       $username = _GUEST;
+       $username = getMessage('_GUEST');
 }
 
 // The header file
@@ -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'])));
 
@@ -113,34 +113,34 @@ if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] !=
        case "mem_only":
        case "done":
                // Does the module exists on local file system?
-               if ((FILE_READABLE(__MODULE)) && (getTotalFatalErrors() == 0)) {
+               if ((FILE_READABLE(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
                        LOAD_URL(DEREFERER($URL));
                } elseif (getTotalFatalErrors() == 0) {
-                       addFatalMessage(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
+                       addFatalMessage(sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
                }
                break;
 
        case "404":
-               addFatalMessage(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
+               addFatalMessage(sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
                break;
 
        case "locked":
-               if (!FILE_READABLE(__MODULE)) {
+               if (!FILE_READABLE(constant('__MODULE'))) {
                        // Module does addionally not exists
-                       addFatalMessage(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
+                       addFatalMessage(sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
                } // END - if
 
                // Add fatal message
-               addFatalMessage(LANG_MOD_LOCKED_1.$GLOBALS['module'].LANG_MOD_LOCKED_2);
+               addFatalMessage(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(LANG_MOD_UNKNOWN_1.$check.LANG_MOD_UNKNOWN_2);
+               addFatalMessage(sprintf(getMessage('LANG_MOD_REG_UNKNOWN'), $check));
                break;
        }
 } elseif (getTotalFatalErrors() == 0) {
@@ -154,7 +154,7 @@ if (($MOD_VALID) && (defined('__MODULE'))) {
        /////////////////////////////////////////////
        //
        // Everything is okay so we can load the module
-       LOAD_INC_ONCE(__MODULE);
+       LOAD_INC_ONCE(constant('__MODULE'));
 } // END - if
 
 // Next-to-end add the footer