X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsignout.php;h=655b2660610928c2b5d6e5808cd665e8d21bd7e6;hb=a571cff36ff1c340cbd2130ce9c0e2ab7ef96977;hp=181434fd0529e34267c2bc81d7de05fcb77e05e3;hpb=29d387e7f0d5f060aca5dcb549fdca7037f98ff2;p=squirrelmail.git
diff --git a/src/signout.php b/src/signout.php
index 181434fd..655b2660 100644
--- a/src/signout.php
+++ b/src/signout.php
@@ -35,7 +35,9 @@ 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();
@@ -46,59 +48,33 @@ if ($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"); ?>
-
-
-
-' .
- _("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
+ $always_include = array('sTemplateID', 'icon_theme_path', 'javascript_on');
+ 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');
-?>