and rewritten to functions

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index 58c36a4e32fd33f2f97bd7c8c55f9b96c79f372b..0b111174af4508e3aaa7040b9fd4e310e3154a5e 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -40,7 +40,7 @@ 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;
 
@@ -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'])));
 
@@ -120,27 +120,27 @@ if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] !=
                        // 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(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_REG_LOCKED_1.$GLOBALS['module'].LANG_MOD_REG_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_REG_UNKNOWN_1.$check.LANG_MOD_REG_UNKNOWN_2);
+               addFatalMessage(sprintf(getMessage('LANG_MOD_REG_UNKNOWN'), $check));
                break;
        }
 } elseif (getTotalFatalErrors() == 0) {