X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fsignout.php;h=b3b5618242727d6ed2a485f3ed5a84b74dc897a8;hp=09d4e67ecc5119b2aabc4e38692840ab8a392a3c;hb=6872a6750379b6c17cf6a6dfec6150ade78f52a0;hpb=46b0c6f4b8efc9715c04bda99c108350885b67fe
diff --git a/src/signout.php b/src/signout.php
index 09d4e67e..b3b56182 100644
--- a/src/signout.php
+++ b/src/signout.php
@@ -3,36 +3,28 @@
/**
* signout.php -- cleans up session and logs the user out
*
- * Copyright (c) 1999-2005 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-2018 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
*/
+/** This is the signout page */
+define('PAGE_NAME', 'signout');
+
/**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
*/
-define('SM_PATH','../');
-
-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');
+require('../include/init.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);
- }
+sqgetGlobalVar('compose_messages', $compose_messages, SQ_SESSION);
+
+if (!empty($compose_message) && is_array($compose_messages)) {
+ foreach($compose_messages as $composeMessage) {
+ $composeMessage->purgeAttachments();
}
}
@@ -40,60 +32,48 @@ 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();
-}
+$login_uri = 'login.php';
-do_hook('logout');
+do_hook('logout', $login_uri);
sqsession_destroy();
if ($signout_page) {
- header('Status: 303 See Other');
+ // Status 303 header is disabled. PHP fastcgi bug. See 1.91 changelog.
+ //header('Status: 303 See Other');
header("Location: $signout_page");
exit; /* we send no content if we're redirecting. */
}
+/* After a reload of signout.php, $oTemplate might not exist anymore.
+ * Recover, so that we don't get all kinds of errors in that situation. */
+if ( !isset($oTemplate) || !is_object($oTemplate) ) {
+ require_once(SM_PATH . 'class/template/Template.class.php');
+ $sTemplateID = Template::get_default_template_set();
+ $icon_theme_path = !$use_icons ? NULL : Template::calculate_template_images_directory($sTemplateID);
+ $oTemplate = Template::construct_template($sTemplateID);
+
+ // We want some variables to always be available to the template
+ $oTemplate->assign('javascript_on', checkForJavascript());
+ $oTemplate->assign('base_uri', sqm_baseuri());
+ $always_include = array('sTemplateID', 'icon_theme_path');
+ foreach ($always_include as $var) {
+ $oTemplate->assign($var, (isset($$var) ? $$var : NULL));
+ }
+}
+
+// The error handler object is probably also not initialized on a refresh
+$oErrorHandler = new ErrorHandler($oTemplate,'error_message.tpl');
+
/* internal gettext functions will fail, if language is not set */
set_up_language($squirrelmail_language, true, true);
-?>
-
-
-
-
-
-
- <?php echo $org_title . ' - ' . _("Signout"); ?>
-
-
-