Some more glitches fixed away...

diff --git a/inc/databases.php b/inc/databases.php
index e812ac9b8f247383d8dbfda6d0271521d5d1d206..16f28821c8996a82a293bed060cc8aef98b61b9f 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -113,7 +113,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level

-define('CURR_SVN_REVISION', "416");
+define('CURR_SVN_REVISION', "417");

 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);

diff --git a/inc/modules/member/what-logout.php b/inc/modules/member/what-logout.php
index c048b0642357eda5f6838662e3d72017acda4b92..00e83449b030e30e120f2be25314c790ea9e0956 100644 (file)
--- a/inc/modules/member/what-logout.php
+++ b/inc/modules/member/what-logout.php
@@ -10,7 +10,7 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Aus dem Mitgliesbereich ausloggen                *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Aus dem Mitgliesbereich ausloggen                *
  * -------------------------------------------------------------------- *

- *         Logout_mod: new from 15.01.04 / Fixed Reset of Cooks         *
+ *                                                                      *

  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *


@@ -42,11 +42,6 @@ if (!defined('__SECURITY')) {
 // Base URL for redirection (both cases)
 $URL = URL."/modules.php?module=index";
 
 // Base URL for redirection (both cases)
 $URL = URL."/modules.php?module=index";
 

-// Patched by Robert Niedziela: cookies won't (?) be deleted on some newer IE versions
-
-// NEW: Fixed the Set of Cookies, you mus add right TimeSet, if you changed it in What_login.php! (eg. time()- cookieTime
-
-

 if (destroy_user_session()) {
        // Remove theme cookie as well
        set_session("mxchange_theme", "");
 if (destroy_user_session()) {
        // Remove theme cookie as well
        set_session("mxchange_theme", "");

diff --git a/inc/session.php b/inc/session.php
index 4c93c2267c51fb210b80a6e9a8b34b8a4596b7f9..7d609e44eeedfd985d77fc5440ee477cf55b11c8 100644 (file)
--- a/inc/session.php
+++ b/inc/session.php
@@ -95,8 +95,11 @@ if (isset($_SESSION['userid'])) {
        if (!IS_MEMBER()) {
                // Then destroy the user id
                destroy_user_session();
        if (!IS_MEMBER()) {
                // Then destroy the user id
                destroy_user_session();

+
+               // Kill userid
+               $GLOBALS['userid'] = 0;

        } // END - if
        } // END - if

-}
+} // END - if

 
 // Test session if index.php or modules.php is loaded
 if ((basename($_SERVER['PHP_SELF']) == "index.php") || (basename($_SERVER['PHP_SELF']) == "modules.php") || (isBooleanConstantAndTrue('mxchange_installing'))) {
 
 // Test session if index.php or modules.php is loaded
 if ((basename($_SERVER['PHP_SELF']) == "index.php") || (basename($_SERVER['PHP_SELF']) == "modules.php") || (isBooleanConstantAndTrue('mxchange_installing'))) {


@@ -107,7 +110,8 @@ if ((basename($_SERVER['PHP_SELF']) == "index.php") || (basename($_SERVER['PHP_S
                // Cookies rejected!
                define('__COOKIES', false);
        }
                // Cookies rejected!
                define('__COOKIES', false);
        }

-}
+} // END - if
+

 //* DEBUG: */ print("<pre>".print_r($_SESSION, true)."</pre>");
 
 //
 //* DEBUG: */ print("<pre>".print_r($_SESSION, true)."</pre>");
 
 //

diff --git a/modules.php b/modules.php
index 72cd6943e0f2197d24ebd203a41ac0a52eebf8f9..9dcd410fea12a196fa88de4278d27a7f072f9174 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -73,13 +73,20 @@ if (IS_MEMBER()) {
                        $username .= " ("._ADMIN_SHORT.")";
                } // END - if
        } else {
                        $username .= " ("._ADMIN_SHORT.")";
                } // END - if
        } 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... ;-)

diff --git a/templates/de/emails/admin/admin_refback.tpl b/templates/de/emails/admin/admin_refback.tpl
index 1d4bea773e43ab04c89e6bef0de0cc56c5e7240b..5ded5824b5316a19b26c93d48fa3a7b36aac497d 100644 (file)
--- a/templates/de/emails/admin/admin_refback.tpl
+++ b/templates/de/emails/admin/admin_refback.tpl
@@ -1,4 +1,4 @@
-Hallo Administrator,
+{--HELLO_ADMIN--},

 
 Das Mitglied $UID hat soeben Ref-Back für ein anderes Mitglied eingestellt.
 
 
 Das Mitglied $UID hat soeben Ref-Back für ein anderes Mitglied eingestellt.