X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsignout.php;h=7088c7c9110493dbca420f8fed19d923a47fd430;hb=c75490c1b4ee2e2f88b44d0143e70898ba1607e3;hp=a30910d2fa06adb74eb6c0bfcf0c46a401b64572;hpb=f923b93d9dfa36c30ee37e77b6117940ef2c5977;p=squirrelmail.git

diff --git a/src/signout.php b/src/signout.php
index a30910d2..7088c7c9 100644
--- a/src/signout.php
+++ b/src/signout.php
@@ -1,89 +1,116 @@
 <?php
-   /**
-    **  signout.php -- cleans up session and logs the user out
-    **
-    **  Copyright (c) 1999-2000 The SquirrelMail development team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Cleans up after the user. Resets cookies and terminates
-    **  session.
-    **
-    **  $Id$
-    **/
 
-   include('../src/validate.php');
-   include('../functions/strings.php');
-   include ('../src/load_prefs.php');
-   include('../config/config.php');
-   include('../functions/i18n.php');
-   include ('../functions/prefs.php');
-   include ('../functions/plugin.php');
+/**
+ * signout.php -- cleans up session and logs the user out
+ *
+ * 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.
+ *
+ * @version $Id$
+ * @package squirrelmail
+ */
 
-   // Erase any lingering attachments
-   if (! isset($attachments)) {
-       $attachments = array();
-   }
-   foreach ($attachments as $info) {
-       if (file_exists($attachment_dir . $info['localfilename'])) {
-           unlink($attachment_dir . $info['localfilename']);
-       }
-   }
-   set_up_language(getPref($data_dir, $username, 'language'));
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
+define('SM_PATH','../');
 
-   // 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];
-   }
+/* 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;
+}
 
-   do_hook('logout');
-   setcookie('username', '', 0, $base_uri);
-   setcookie('key', '', 0, $base_uri);
-   setcookie('logged_in', '', 0, $base_uri);
-   session_destroy();
+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');
 
-   if ($signout_page) {
-       header("Status: 303 See Other");
-       header("Location: $signout_page");
-       exit; /* we send no content if we're redirecting. */
-   }
+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);
+            }
+        }
+    }
+}
+
+if (!isset($frame_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 (! sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) {
+    require_once(SM_PATH . 'functions/display_messages.php');
+    $base_uri = sqm_baseuri();
+}
+
+do_hook('logout');
+
+sqsession_destroy();
+
+if ($signout_page) {
+    header('Status: 303 See Other');
+    header("Location: $signout_page");
+    exit; /* we send no content if we're redirecting. */
+}
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<?php
+    if ($theme_css != '') {
 ?>
-<HTML>
-   <HEAD>
+   <link rel="stylesheet" type="text/css" href="<?php echo $theme_css; ?>" />
 <?php
-   if ($theme_css != '') {
+    }
 ?>
-<LINK REL="stylesheet" TYPE="text/css" HREF="<?php echo $theme_css ?>">
+   <title><?php echo $org_title . ' - ' . _("Signout"); ?></title>
+</head>
+<body text="<?php echo $color[8]; ?>" bgcolor="<?php echo $color[4]; ?>"
+link="<?php echo $color[7]; ?>" vlink="<?php echo $color[7]; ?>"
+alink="<?php echo $color[7]; ?>">
+<br /><br />
 <?php
-   }
+$plugin_message = concat_hook_function('logout_above_text');
+echo
+html_tag( 'table',
+    html_tag( 'tr',
+         html_tag( 'th', _("Sign Out"), 'center' ) ,
+    '', $color[0], 'width="100%"' ) .
+    $plugin_message .
+    html_tag( 'tr',
+         html_tag( 'td', _("You have been successfully signed out.") .
+             '<br /><a href="login.php" target="' . $frame_top . '">' .
+             _("Click here to log back in.") . '</a><br />' ,
+         'center' ) ,
+    '', $color[4], 'width="100%"' ) .
+    html_tag( 'tr',
+         html_tag( 'td', '<br />', 'center' ) ,
+    '', $color[0], 'width="100%"' ) ,
+'center', $color[4], 'width="50%" cols="1" cellpadding="2" cellspacing="0" border="0"' )
 ?>
-<TITLE><?php echo $org_title ?> - Signout</TITLE>
-</HEAD>
-<BODY TEXT="<?php echo $color[8] ?>" BGCOLOR="<?php echo $color[4] ?>" 
-LINK="<?php echo $color[7] ?>" VLINK="<?php echo $color[7] ?>" A
-LINK="<?php echo $color[7] ?>">
-<BR><BR>
-<TABLE BGCOLOR="FFFFFF" BORDER="0" COLS="1" WIDTH="50%" CELLSPACING="0" 
-CELLPADDING="2" ALIGN="CENTER">
-  <TR BGCOLOR="<?php echo $color[0] ?>" WIDTH=100%>
-    <TD ALIGN="CENTER">
-      <B><?php echo _("Sign Out") ?></B>
-    </TD>
-  </TR>
-  <TR BGCOLOR="<?php echo $color[4] ?>" WIDTH=100%>
-    <TD ALIGN="CENTER">
-      <?php echo _("You have been successfully signed out.") ?><BR>
-      <A HREF="login.php" TARGET="_top">
-      <?php echo _("Click here to log back in.") ?>
-      </A><BR><BR>
-    </TD>
-  </TR>
-  <TR BGCOLOR="<?php echo $color[0] ?>" WIDTH=100%>
-    <TD ALIGN="CENTER">
-      <BR>
-    </TD>
-  </TR>
-</TABLE>
-</BODY>
-</HTML>
+</body>
+</html>