X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsignout.php;h=2ead7d7a7b8ff5864d97ae3e7266782a9ed0d284;hb=7fb6790274b00b152d2eab22ba94c6b6a387e093;hp=706088f9207a1a94a090fc25c0b0e8c30a5e8f4b;hpb=4a6bbb4927f6601684a6cea23edd50117911eeec;p=squirrelmail.git
diff --git a/src/signout.php b/src/signout.php
index 706088f9..2ead7d7a 100644
--- a/src/signout.php
+++ b/src/signout.php
@@ -3,7 +3,7 @@
/**
* signout.php -- cleans up session and logs the user out
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Cleans up after the user. Resets cookies and terminates session.
@@ -11,11 +11,15 @@
* $Id$
*/
-require_once('../src/validate.php');
-require_once('../functions/prefs.php');
-require_once('../functions/plugin.php');
-require_once('../functions/strings.php');
-require_once('../functions/html.php');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/prefs.php');
+require_once(SM_PATH . 'functions/plugin.php');
+require_once(SM_PATH . 'functions/strings.php');
+require_once(SM_PATH . 'functions/html.php');
/* Erase any lingering attachments */
if (isset($attachments) && is_array($attachments)
@@ -35,17 +39,18 @@ if (!isset($frame_top)) {
/* If a user hits reload on the last page, $base_uri isn't set
* because it was deleted with the session. */
-if (!isset($base_uri)) {
+if (!isset($_SESSION['base_uri'])) {
if (!function_exists('sqm_baseuri')){
- require_once('../functions/display_messages.php');
+ require_once(SM_PATH . 'functions/display_messages.php');
}
$base_uri = sqm_baseuri();
+} else {
+ $base_uri = $_SESSION['base_uri'];
}
do_hook('logout');
-setcookie('username', '', 0, $base_uri);
-setcookie('key', '', 0, $base_uri);
-session_destroy();
+
+sqsession_destroy();
if ($signout_page) {
header('Status: 303 See Other');
@@ -53,22 +58,23 @@ if ($signout_page) {
exit; /* we send no content if we're redirecting. */
}
?>
+
-
+
-
+
-<?php echo $org_title ?> - Signout
+ <?php echo $org_title ?> - Signout
-
-
\ No newline at end of file
+