X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsignout.php;h=a72336485a593ee940f68b5fabc0eb654426b0db;hb=30967a1e09679c395b31929cbdb1a0e88b13f01e;hp=ce7eda8eba6051282285296a3dcd208a23126a7e;hpb=a32985a59fe460e2bf5c2e9ea2dd6004d0f66b54;p=squirrelmail.git
diff --git a/src/signout.php b/src/signout.php
index ce7eda8e..a7233648 100644
--- a/src/signout.php
+++ b/src/signout.php
@@ -3,15 +3,19 @@
/**
* signout.php -- cleans up session and logs the user out
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 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.
*
- * $Id$
+ * @version $Id$
+ * @package squirrelmail
*/
-/* Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
define('SM_PATH','../');
/* SquirrelMail required files. */
@@ -39,19 +43,14 @@ 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($_SESSION['base_uri'])) {
- if (!function_exists('sqm_baseuri')){
- require_once(SM_PATH . 'functions/display_messages.php');
- }
+if (! sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) {
+ 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');
@@ -59,28 +58,30 @@ if ($signout_page) {
exit; /* we send no content if we're redirecting. */
}
?>
+
-
+
-
+
-<?php echo $org_title ?> - Signout
+ <?php echo $org_title ?> - Signout
-' .