X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=modules.php;h=e05a1b25ed378f9898512d038f903d969cdd6cd6;hp=f8c1a88e383c282ba09f5e0b85ddaccd413db36b;hb=3daede4c904e23905c3e48dd6749019deca0a0e0;hpb=c3b3af29e6e80926519ade146ac657c036782bd3 diff --git a/modules.php b/modules.php index f8c1a88e38..e05a1b25ed 100644 --- a/modules.php +++ b/modules.php @@ -100,8 +100,8 @@ include (PATH."inc/header.php"); $MOD_VALID = false; $check = "failed"; 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(LANG_DOWN_MAINTAINCE); +} elseif (($link) && ($db) && (getTotalFatalErrors() == 0)) { // Did we found the module listed in allowed modules and are we successfully connected? $check = CHECK_MODULE($GLOBALS['module']); switch ($check) @@ -113,39 +113,39 @@ if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] != 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")) { // 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(MYSQL_ERRORS); } if (($MOD_VALID) && (defined('__MODULE'))) {