X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=modules.php;h=bee4beae2c00a70d0f97698017f0e3292245c17d;hb=84317e249885eb03a99f2946acf285ff27d506ac;hp=325eb83108671abe9bc5440e084ddb794ad2307b;hpb=61cd26135cd5e043032bcd50aff24fbf5429352b;p=mailer.git
diff --git a/modules.php b/modules.php
index 325eb83108..bee4beae2c 100644
--- a/modules.php
+++ b/modules.php
@@ -35,7 +35,7 @@
//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;
@@ -60,7 +60,7 @@ require("inc/config.php");
// 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",
+ $result = SQL_QUERY_ESC("SELECT surname, family FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
array($GLOBALS['userid']), __FILE__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Load surname and family's name and build the username
@@ -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 = ""._UNKNOWN."";
+ $username = "{!_UNKNOWN!}";
// Destroy session
destroy_user_session();
@@ -94,14 +94,17 @@ if (IS_MEMBER()) {
}
// The header file
-include (PATH."inc/header.php");
+LOAD_INC_ONCE("inc/header.php");
// Modules are by default not valid!
$MOD_VALID = false; $check = "failed";
-if ((!empty($_CONFIG['maintenance'])) && ($_CONFIG['maintenance'] == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] != "admin")) {
+if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] != "admin")) {
// Maintain mode is active and you are no admin
- ADD_FATAL(LANG_DOWN_MAINTAINCE);
-} elseif (($link) && ($db) && (sizeof($FATAL) == 0)) {
+ addFatalMessage(getMessage('LANG_DOWN_MAINTAINCE'));
+} elseif (($link) && ($db) && (getTotalFatalErrors() == 0)) {
+ // Construct module name
+ define('__MODULE', sprintf("inc/modules/%s.php", SQL_ESCAPE($GLOBALS['module'])));
+
// Did we found the module listed in allowed modules and are we successfully connected?
$check = CHECK_MODULE($GLOBALS['module']);
switch ($check)
@@ -109,43 +112,40 @@ if ((!empty($_CONFIG['maintenance'])) && ($_CONFIG['maintenance'] == "Y") && (!I
case "admin_only":
case "mem_only":
case "done":
- // Construct module name
- define('__MODULE', sprintf("%sinc/modules/%s.php", PATH, SQL_ESCAPE($GLOBALS['module'])));
-
// Does the module exists on local file system?
- if ((FILE_READABLE(__MODULE)) && (sizeof($FATAL) == 0)) {
+ if ((FILE_READABLE(__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 (sizeof($FATAL) == 0) {
- ADD_FATAL(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
+ } elseif (getTotalFatalErrors() == 0) {
+ addFatalMessage(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
}
break;
case "404":
- ADD_FATAL(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
+ addFatalMessage(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
break;
case "locked":
- if (!FILE_READABLE(PATH."inc/modules/".$GLOBALS['module'].".php")) {
+ if (!FILE_READABLE(__MODULE)) {
// Module does addionally not exists
- ADD_FATAL(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
+ addFatalMessage(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
} // END - if
// Add fatal message
- ADD_FATAL(LANG_MOD_LOCKED_1.$GLOBALS['module'].LANG_MOD_LOCKED_2);
+ addFatalMessage(LANG_MOD_LOCKED_1.$GLOBALS['module'].LANG_MOD_LOCKED_2);
break;
default:
DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $check, $GLOBALS['module']));
- ADD_FATAL(LANG_MOD_UNKNOWN_1.$check.LANG_MOD_UNKNOWN_2);
+ addFatalMessage(LANG_MOD_UNKNOWN_1.$check.LANG_MOD_UNKNOWN_2);
break;
}
-} elseif (sizeof($FATAL) == 0) {
+} elseif (getTotalFatalErrors() == 0) {
// MySQL problems!
- ADD_FATAL(MYSQL_ERRORS);
+ addFatalMessage(getMessage('MYSQL_ERRORS'));
}
if (($MOD_VALID) && (defined('__MODULE'))) {
@@ -154,11 +154,11 @@ if (($MOD_VALID) && (defined('__MODULE'))) {
/////////////////////////////////////////////
//
// Everything is okay so we can load the module
- include (__MODULE);
+ LOAD_INC_ONCE(__MODULE);
} // END - if
// Next-to-end add the footer
-include (PATH."inc/footer.php");
+LOAD_INC_ONCE("inc/footer.php");
//
?>