- Daily/weekly/monthly reset completely rewritten

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index 1019638b45a0e932a7e34e120ffb2c8e35ea7bd5..5850e441720b2acc798e9fc2345df95222e01025 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -55,22 +55,18 @@ $GLOBALS['module'] = htmlentities(strip_tags($_GET['module']), ENT_QUOTES);
 require ("inc/config.php");
 
 // Check if logged in
 require ("inc/config.php");
 
 // Check if logged in

-if (IS_LOGGED_IN())
-{
+if (IS_LOGGED_IN()) {

        // Is still logged in so we welcome him with his name
        // 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=%d LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT surname, family FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",

         array($GLOBALS['userid']), __FILE__, __LINE__);
         array($GLOBALS['userid']), __FILE__, __LINE__);

-       if (SQL_NUMROWS($result) == 1)
-       {
+       if (SQL_NUMROWS($result) == 1) {

                // Load surname and family's name and build the username
                list($s, $f) = SQL_FETCHROW($result);
                $username = $s." ".$f;
 
                // Update only cookies and no login data!
                UPDATE_LOGIN_DATA(false);
                // Load surname and family's name and build the username
                list($s, $f) = SQL_FETCHROW($result);
                $username = $s." ".$f;
 
                // Update only cookies and no login data!
                UPDATE_LOGIN_DATA(false);

-       }
-        else
-       {
+       } else {

 
                // Hmmm, logged in and no valid cookies???
                $username = "<I>"._UNKNOWN."</I>";
 
                // Hmmm, logged in and no valid cookies???
                $username = "<I>"._UNKNOWN."</I>";


@@ -78,13 +74,9 @@ if (IS_LOGGED_IN())
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Free memory
        SQL_FREERESULT($result);

-}
- elseif (IS_ADMIN())
-{
+} elseif (IS_ADMIN()) {

        $username = _ADMIN;
        $username = _ADMIN;

-}
- else
-{
+} else {

        // He's a guest, hello there... ;-)
        $username = _GUEST;
 }
        // He's a guest, hello there... ;-)
        $username = _GUEST;
 }


@@ -94,13 +86,10 @@ include (PATH."inc/header.php");
 
 // Modules are by default not valid!
 $MOD_VALID = false; $check = "failed";
 
 // 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);
        // 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)
        // Did we found the module listed in allowed modules and are we successfully connected?
        $check = CHECK_MODULE($GLOBALS['module']);
        switch ($check)


@@ -109,21 +98,16 @@ if ((!empty($CONFIG['maintenance'])) && ($CONFIG['maintenance'] == 'Y') && (!IS_
        case "mem_only":
        case "done":
                // Construct module name
        case "mem_only":
        case "done":
                // Construct module name

-               define('__MODULE', sprintf(PATH."inc/modules/%s.php", $GLOBALS['module']));
+               define('__MODULE', sprintf("%sinc/modules/%s.php", PATH, $GLOBALS['module']));

 
                // Does the module exists on local file system?
 
                // 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;
                        // 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
                        // 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;
                        ADD_FATAL(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
                }
                break;


@@ -152,8 +136,7 @@ if ((!empty($CONFIG['maintenance'])) && ($CONFIG['maintenance'] == 'Y') && (!IS_
        ADD_FATAL(MYSQL_ERRORS);
 }
 
        ADD_FATAL(MYSQL_ERRORS);
 }
 

-if ($MOD_VALID)
-{
+if ($MOD_VALID) {

        /////////////////////////////////////////////
        // Main including line DO NOT REMOVE/EDIT! //
        /////////////////////////////////////////////
        /////////////////////////////////////////////
        // Main including line DO NOT REMOVE/EDIT! //
        /////////////////////////////////////////////