X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsignout.php;h=37e5a2d6fb33863e84e045cb56668f2a81d8d8ce;hb=3de977ea4b3a7ed3829bda8f117f9c81a7526498;hp=7b54784bd3d5e8e0a6d5d038201a8534acd27f16;hpb=af48f48ce59443ea15f33022bfc55ad071e43acc;p=squirrelmail.git
diff --git a/src/signout.php b/src/signout.php
index 7b54784b..37e5a2d6 100644
--- a/src/signout.php
+++ b/src/signout.php
@@ -5,7 +5,7 @@
*
* Cleans up after the user. Resets cookies and terminates session.
*
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright © 1999-2007 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
@@ -35,69 +35,48 @@ if (! sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) {
$base_uri = sqm_baseuri();
}
-do_hook('logout');
+$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. */
}
-/* internal gettext functions will fail, if language is not set */
-set_up_language($squirrelmail_language, true, true);
-?>
-
-
-
-
-
-
-
-
-
-" vlink=""
-alink="">
-
-' .
- _("Click here to log back in.") . '
' ,
- 'center' ) ,
- '', $color[4] ) .
- html_tag( 'tr',
- 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);
+ 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);
+
+displayHtmlHeader($org_title . ' - ' . _("Signout"));
+
+$oTemplate->assign('frame_top', $frame_top);
+$oTemplate->assign('login_uri', $login_uri);
+
+$oTemplate->display('signout.tpl');
+
$oTemplate->display('footer.tpl');
-?>