X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsignout.php;h=7b54784bd3d5e8e0a6d5d038201a8534acd27f16;hb=af48f48ce59443ea15f33022bfc55ad071e43acc;hp=706088f9207a1a94a090fc25c0b0e8c30a5e8f4b;hpb=4a6bbb4927f6601684a6cea23edd50117911eeec;p=squirrelmail.git
diff --git a/src/signout.php b/src/signout.php
index 706088f9..7b54784b 100644
--- a/src/signout.php
+++ b/src/signout.php
@@ -3,29 +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-2006 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');
-require_once('../functions/html.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();
}
}
@@ -35,56 +31,73 @@ 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();
+
+sqsession_destroy();
if ($signout_page) {
header('Status: 303 See Other');
header("Location: $signout_page");
exit; /* we send no content if we're redirecting. */
}
+
+/* internal gettext functions will fail, if language is not set */
+set_up_language($squirrelmail_language, true, true);
?>
+
-
+
-
+
-<?php echo $org_title ?> - Signout
+
+ <?php echo $org_title . ' - ' . _("Signout"); ?>
-
-
-" bgcolor=""
+link="" vlink=""
+alink="">
+
+' .
- _("Click here to log back in.") . '
' ,
+ '
' .
+ _("Click here to log back in.") . '
' ,
'center' ) ,
- '', $color[4], 'width="100%"' ) .
+ '', $color[4] ) .
html_tag( 'tr',
- html_tag( 'td', '
', 'center' ) ,
- '', $color[0], 'width="100%"' ) ,
-'center', $color[4], 'width="50%" cols="1" cellpadding="2" cellspacing="0" border="0"' )
+ html_tag( 'td', '
', 'center' ) ,
+ '', $color[0] ) ,
+'center', $color[4], 'width="50%" cellpadding="2" cellspacing="0" border="0"' );
+
+/* 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');
+ $aTemplateSet = ( !isset($aTemplateSet) ? array() : $aTemplateSet );
+ $templateset_default = ( !isset($templateset_default) ? 0 : $templateset_default );
+
+ $sTplDir = ( !isset($aTemplateSet[$templateset_default]['PATH']) ?
+ SM_PATH . 'templates/default/' :
+ $aTemplateSet[$templateset_default]['PATH'] );
+ $oTemplate = new Template($sTplDir);
+}
+
+$oTemplate->display('footer.tpl');
+
?>
-
-
\ No newline at end of file