X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsignout.php;h=7088c7c9110493dbca420f8fed19d923a47fd430;hb=c75490c1b4ee2e2f88b44d0143e70898ba1607e3;hp=7f7d71f73d3bb85849f36f873329f370b8228176;hpb=8f6f9ba5df6491d396aa690dcf3e5b9070a565ca;p=squirrelmail.git
diff --git a/src/signout.php b/src/signout.php
index 7f7d71f7..7088c7c9 100644
--- a/src/signout.php
+++ b/src/signout.php
@@ -3,33 +3,55 @@
/**
* signout.php -- cleans up session and logs the user out
*
- * Copyright (c) 1999-2003 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. */
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/prefs.php');
+/* check if we're already logged out (e.g. when this page is reloaded),
+ * so we can skip to the output and not give error messages */
+if( ! isset($_SESSION) || empty($_SESSION['user_is_logged_in']) ) {
+ $loggedin = false;
+} else {
+ $loggedin = true;
+}
+
+if($loggedin) {
+ require_once(SM_PATH . 'include/validate.php');
+ require_once(SM_PATH . 'functions/prefs.php');
+} else {
+ // this comes in through validate.php usually
+ require_once(SM_PATH . 'config/config.php');
+ require_once(SM_PATH . 'functions/i18n.php');
+ require_once(SM_PATH . 'functions/page_header.php');
+ if (@file_exists($theme[$theme_default]['PATH'])) {
+ @include ($theme[$theme_default]['PATH']);
+ }
+}
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)
- && 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($loggedin) {
+ /* Erase any lingering attachments */
+ 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);
+ }
}
}
}
@@ -61,16 +83,16 @@ if ($signout_page) {
-
+
- <?php echo $org_title ?> - Signout
+ <?php echo $org_title . ' - ' . _("Signout"); ?>
-
-
+
+
' .
- _("Click here to log back in.") . '
' ,
+ '
' .
+ _("Click here to log back in.") . '
' ,
'center' ) ,
'', $color[4], 'width="100%"' ) .
html_tag( 'tr',
- html_tag( 'td', '
', 'center' ) ,
+ html_tag( 'td', '
', 'center' ) ,
'', $color[0], 'width="100%"' ) ,
'center', $color[4], 'width="50%" cols="1" cellpadding="2" cellspacing="0" border="0"' )
?>