Surfbar fixed, more fixes in core, templates fixed

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index 53a8e0ff41e62c6d3b18344e89625acac042623f..5850e441720b2acc798e9fc2345df95222e01025 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -86,13 +86,10 @@ include (PATH."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 ((!empty($_CONFIG['maintenance'])) && ($_CONFIG['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))
-{
+} elseif (($link) && ($db) && (sizeof($FATAL) == 0)) {
        // Did we found the module listed in allowed modules and are we successfully connected?
        $check = CHECK_MODULE($GLOBALS['module']);
        switch ($check)
@@ -104,18 +101,13 @@ if ((!empty($_CONFIG['maintenance'])) && ($_CONFIG['maintenance'] == "Y") && (!I
                define('__MODULE', sprintf("%sinc/modules/%s.php", PATH, $GLOBALS['module']));
 
                // Does the module exists on local file system?
-               if (((file_exists(__MODULE)) || (!empty($URL))) && (sizeof($FATAL) == 0))
-               {
+               if (((file_exists(__MODULE)) && (is_readable(__MODULE))) && (sizeof($FATAL) == 0)) {
                        // Module is valid, active and located on the local disc...
                        $MOD_VALID = true;
-               }
-                elseif (!empty($URL))
-               {
+               } elseif (!empty($URL)) {
                        // An URL was specified so we load the de-referrer module
-                       include (PATH."inc/loader.php");
-               }
-                elseif (sizeof($FATAL) == 0)
-               {
+                       LOAD_URL(DEREFERER($URL));
+               } elseif (sizeof($FATAL) == 0) {
                        ADD_FATAL(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
                }
                break;
@@ -144,8 +136,7 @@ if ((!empty($_CONFIG['maintenance'])) && ($_CONFIG['maintenance'] == "Y") && (!I
        ADD_FATAL(MYSQL_ERRORS);
 }
 
-if ($MOD_VALID)
-{
+if ($MOD_VALID) {
        /////////////////////////////////////////////
        // Main including line DO NOT REMOVE/EDIT! //
        /////////////////////////////////////////////