X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsignout.php;h=2ead7d7a7b8ff5864d97ae3e7266782a9ed0d284;hb=879694a5dec8ecc4fa9156d7fd30eee9788067ac;hp=fae6ce9c7dce8de3c5deacf6edb7785c460b13f0;hpb=32f4e3189ac2f04956d07af63d9cea44c3393fc5;p=squirrelmail.git
diff --git a/src/signout.php b/src/signout.php
index fae6ce9c..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,38 +11,46 @@
* $Id$
*/
-require_once('../src/validate.php');
-require_once('../functions/prefs.php');
-require_once('../functions/plugin.php');
-require_once('../functions/strings.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)) {
- $attachments = array();
-}
-$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
-foreach ($attachments as $info) {
- $attached_file = "$hashed_attachment_dir/$info[localfilename]";
- if (file_exists($attached_file)) {
- unlink($attached_file);
+if (isset($attachments) && is_array($attachments)
+ && sizeof($attachments)){
+ $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+ foreach ($attachments as $info) {
+ $attached_file = "$hashed_attachment_dir/$info[localfilename]";
+ if (file_exists($attached_file)) {
+ unlink($attached_file);
+ }
}
}
if (!isset($frame_top)) {
- $frame_top = '_top';
+ $frame_top = '_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)) {
- ereg ('(^.*/)[^/]+/[^/]+$', $PHP_SELF, $regs);
- $base_uri = $regs[1];
+if (!isset($_SESSION['base_uri'])) {
+ if (!function_exists('sqm_baseuri')){
+ 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');
@@ -50,42 +58,39 @@ if ($signout_page) {
exit; /* we send no content if we're redirecting. */
}
?>
-
-
+
+
+
-
+
-<?php echo $org_title ?> - Signout
-
-
-
-
-
- |
-
- |
-
-
-
-
-
-
-
-
- |
-
-
-
-
- |
-
-
-
-
\ No newline at end of file
+ <?php echo $org_title ?> - Signout
+
+
+
+' .
+ _("Click here to log back in.") . '
' ,
+ 'center' ) ,
+ '', $color[4], 'width="100%"' ) .
+ html_tag( 'tr',
+ html_tag( 'td', '
', 'center' ) ,
+ '', $color[0], 'width="100%"' ) ,
+'center', $color[4], 'width="50%" cols="1" cellpadding="2" cellspacing="0" border="0"' )
+?>
+
+