Introduced new wrapper functions to make the code more readable, new extension ext...

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index 9868be46fb946ee8c8709ce61f2c4babb2843e1e..f2d1639a6c88f7e1554c53df40caec2c1f67dcbd 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -77,7 +77,7 @@ $check = 'failed';
 if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (!isAdmin()) && (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')) {
+} elseif ((SQL_IS_LINK_UP()) && (!ifFatalErrorsDetected())) {
        // Construct module name
        $GLOBALS['module_inc'] =  sprintf("inc/modules/%s.php", getModule());
 
@@ -89,10 +89,10 @@ if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (
                case 'mem_only': // Member-only access
                case 'done': // All fine!
                        // Does the module exists on local file system?
-                       if ((isIncludeReadable($GLOBALS['module_inc'])) && (getTotalFatalErrors() == '0')) {
+                       if ((isIncludeReadable($GLOBALS['module_inc'])) && (!ifFatalErrorsDetected())) {
                                // Module is valid, active and located on the local disc...
                                $isModuleValid = true;
-                       } elseif (getTotalFatalErrors() == '0') {
+                       } elseif (!ifFatalErrorsDetected()) {
                                // Module not found!
                                addFatalMessage(__FILE__, __LINE__, getMaskedMessage('LANG_MOD_REG_404', getModule()));
                        }
@@ -117,7 +117,7 @@ if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (
                        addFatalMessage(__FILE__, __LINE__, getMaskedMessage('LANG_MOD_REG_UNKNOWN', $check));
                        break;
        } // END - switch
-} elseif (getTotalFatalErrors() == '0') {
+} elseif (!ifFatalErrorsDetected()) {
        // MySQL problems!
        addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_ERRORS'));
 }