Skyscraper now in member menu supported (you need to update/patch member_header.tpl...

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index 9c13ae64377b7b7fd5e08586e399543d35f93a10..78bf8c7c3902a1cd5f24cae5cbea874d11ca9c7a 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -67,17 +67,26 @@ if (IS_MEMBER()) {
                list($s, $f) = SQL_FETCHROW($result);
                $username = $s." ".$f;
 
                list($s, $f) = SQL_FETCHROW($result);
                $username = $s." ".$f;
 

-               // Update only cookies and no login data!
-               UPDATE_LOGIN_DATA(false);
+               // Additionally admin?
+               if (IS_ADMIN()) {
+                       // Add it
+                       $username .= " ("._ADMIN_SHORT.")";
+               } // END - if

        } else {
        } else {

-
-               // Hmmm, logged in and no valid cookies???
+               // Hmmm, logged in and no valid userid?

                $username = "<I>"._UNKNOWN."</I>";
                $username = "<I>"._UNKNOWN."</I>";

+
+               // Destroy session
+               destroy_user_session();
+
+               // Kill userid
+               $GLOBALS['userid'] = 0;

        }
 
        // Free memory
        SQL_FREERESULT($result);
 } elseif (IS_ADMIN()) {
        }
 
        // Free memory
        SQL_FREERESULT($result);
 } elseif (IS_ADMIN()) {

+       // Admin is there

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


@@ -101,7 +110,7 @@ if ((!empty($_CONFIG['maintenance'])) && ($_CONFIG['maintenance'] == "Y") && (!I
        case "mem_only":
        case "done":
                // Construct module name
        case "mem_only":
        case "done":
                // Construct module name

-               define('__MODULE', sprintf("%sinc/modules/%s.php", PATH, $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)) {
 
                // Does the module exists on local file system?
                if ((FILE_READABLE(__MODULE)) && (sizeof($FATAL) == 0)) {


@@ -120,21 +129,21 @@ if ((!empty($_CONFIG['maintenance'])) && ($_CONFIG['maintenance'] == "Y") && (!I
                break;
 
        case "locked":
                break;
 
        case "locked":

-               if (!FILE_READABLE(PATH."inc/modules/".$GLOBALS['module'].".php"))
-               {
+               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);
                        // Module does addionally not exists
                        ADD_FATAL(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);
                break;
 
        default:
                ADD_FATAL(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);
                break;
        }
                ADD_FATAL(LANG_MOD_UNKNOWN_1.$check.LANG_MOD_UNKNOWN_2);
                break;
        }

-}
- elseif (sizeof($FATAL) == 0)
-{
+} elseif (sizeof($FATAL) == 0) {

        // MySQL problems!
        ADD_FATAL(MYSQL_ERRORS);
 }
        // MySQL problems!
        ADD_FATAL(MYSQL_ERRORS);
 }


@@ -146,7 +155,7 @@ if ($MOD_VALID) {
        //
        // Everything is okay so we can load the module
        include (__MODULE);
        //
        // Everything is okay so we can load the module
        include (__MODULE);

-}
+} // END - if

 
 // Next-to-end add the footer
 include (PATH."inc/footer.php");
 
 // Next-to-end add the footer
 include (PATH."inc/footer.php");