X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fsignout.php;h=7b54784bd3d5e8e0a6d5d038201a8534acd27f16;hp=3dece37c85aca44c6279ffde478ee9e5fa40f8bf;hb=af48f48ce59443ea15f33022bfc55ad071e43acc;hpb=3c621ba1116356a3a8e2616ef6d267f5edb3ea06
diff --git a/src/signout.php b/src/signout.php
index 3dece37c..7b54784b 100644
--- a/src/signout.php
+++ b/src/signout.php
@@ -3,37 +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','../');
-
-/* SquirrelMail required files. */
-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();
}
}
@@ -44,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();
}
@@ -57,8 +44,12 @@ if ($signout_page) {
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"); ?>
-
@@ -80,18 +72,32 @@ echo
html_tag( 'table',
html_tag( 'tr',
html_tag( 'th', _("Sign Out"), 'center' ) ,
- '', $color[0], 'width="100%"' ) .
+ '', $color[0] ) .
$plugin_message .
html_tag( 'tr',
html_tag( 'td', _("You have been successfully signed out.") .
'
' .
_("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"' )
+ '', $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');
+
?>
-
-