Re-added, now the right ones

[mailer.git] / inc / modules / member / what-logout.php

diff --git a/inc/modules/member/what-logout.php b/inc/modules/member/what-logout.php
index 797f8e262dd4e7fcf06fc66ead931e53b9045502..38ccf2711168f8120443c611182f1563a498f04e 100644 (file)
--- a/inc/modules/member/what-logout.php
+++ b/inc/modules/member/what-logout.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Aus dem Mitgliesbereich ausloggen                *
  * -------------------------------------------------------------------- *
- *         Logout_mod: new from 15.01.04 / Fixed Reset of Cooks         *
+ * $Revision:: 856                                                    $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -32,42 +37,29 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-}
- elseif (!IS_LOGGED_IN())
-{
+} elseif (!IS_MEMBER()) {
        LOAD_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
-
+$URL = "modules.php?module=index&msg=";
 
-if (set_session("userid", "", time() - 3600, COOKIE_PATH) && set_session("u_hash", "", time() - 3600, COOKIE_PATH) && set_session("lifetime", "", time() - 3600, COOKIE_PATH))
-{
+if (destroy_user_session()) {
        // Remove theme cookie as well
-       set_session("mxchange_theme", "", time() - 3600, COOKIE_PATH);
+       set_session("mxchange_theme", "");
 
        // Logout completed
-       $URL .= "&msg=".CODE_LOGOUT_DONE;
-
-       // Destroy session here
-       @session_destroy();
-}
- else
-{
+       $URL .= getCode('LOGOUT_DONE');
+} else {
        // Cannot logout! :-(
-       $URL .= "&msg=".CODE_LOGOUT_FAILED;
+       $URL .= getCode('LOGOUT_FAILED');
 }
 
-//
+// Load the URL
 LOAD_URL($URL);
+
 //
 ?>