X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsignout.php;h=37e5a2d6fb33863e84e045cb56668f2a81d8d8ce;hb=fb8c42963be48f85ebffd627e98c833cfcbd6dc7;hp=1b095056580fd703c43998d527f64de28f18595e;hpb=fb745cc7d13d3cf5142d9c36dbd7539041599508;p=squirrelmail.git diff --git a/src/signout.php b/src/signout.php index 1b095056..37e5a2d6 100644 --- a/src/signout.php +++ b/src/signout.php @@ -3,28 +3,25 @@ /** * signout.php -- cleans up session and logs the user out * - * Copyright (c) 1999-2002 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$ + * @copyright © 1999-2007 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ + * @package squirrelmail */ -require_once('../src/validate.php'); -require_once('../functions/prefs.php'); -require_once('../functions/plugin.php'); -require_once('../functions/strings.php'); +/** + * Include the SquirrelMail initialization file. + */ +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(); } } @@ -34,60 +31,52 @@ 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 (!isset($base_uri)) { - if (!function_exists('sqm_baseuri')){ - require_once('../functions/display_messages.php'); - } +if (! sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) { $base_uri = sqm_baseuri(); } -do_hook('logout'); -setcookie('username', '', 0, $base_uri); -setcookie('key', '', 0, $base_uri); -session_destroy(); +$login_uri = 'login.php'; + +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. */ } -?> - -
- - -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)); } -?> -- - | -
-
- - - - - |
-
- - |
-