X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fsignout.php;h=6e5fc5183802da03d8a78a2ca074770cc3058ce2;hp=748eaf8bb90f2a67b604d48f0cc3ef2069bdbedd;hb=bfb5513495378807720cf253c2f10b362abe14b5;hpb=118eb9a49c23de202d2a56db287242cd12df08a3
diff --git a/src/signout.php b/src/signout.php
index 748eaf8b..6e5fc518 100644
--- a/src/signout.php
+++ b/src/signout.php
@@ -3,56 +3,25 @@
/**
* 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.
*
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
*/
/**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
*/
-define('SM_PATH','../');
-
-/* 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;
-}
+require('../include/init.php');
-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 */
+sqgetGlobalVar('compose_messages', $compose_messages, SQ_SESSION);
-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 (!empty($compose_message) && is_array($compose_messages)) {
+ foreach($compose_messages as $composeMessage) {
+ $composeMessage->purgeAttachments();
}
}
@@ -63,7 +32,6 @@ 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 (! sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) {
- require_once(SM_PATH . 'functions/display_messages.php');
$base_uri = sqm_baseuri();
}
@@ -80,7 +48,8 @@ if ($signout_page) {
/* internal gettext functions will fail, if language is not set */
set_up_language($squirrelmail_language, true, true);
?>
-
+
+
<?php echo $org_title . ' - ' . _("Signout"); ?>