X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fsignout.php;h=1c6d35a4a67a09997baaa6e4bbcf5b46b8f1f40e;hp=15a7b644400362d9e4b550fb06cf09eb939ffdcb;hb=975f298f1182a9dcba556e644c76ce7b62659026;hpb=3e6ee6cac3f0661ac3d2ffc516bb5d3be5f8f14f

diff --git a/src/signout.php b/src/signout.php
index 15a7b644..1c6d35a4 100644
--- a/src/signout.php
+++ b/src/signout.php
@@ -5,12 +5,15 @@
  *
  *  Cleans up after the user. Resets cookies and terminates session.
  *
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright 1999-2017 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  */
 
+/** This is the signout page */
+define('PAGE_NAME', 'signout');
+
 /**
  * Include the SquirrelMail initialization file.
  */
@@ -29,13 +32,9 @@ if (!isset($frame_top)) {
     $frame_top = '_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) ) {
-    $base_uri = sqm_baseuri();
-}
+$login_uri = 'login.php';
 
-do_hook('logout');
+do_hook('logout', $login_uri);
 
 sqsession_destroy();
 
@@ -50,15 +49,13 @@ if ($signout_page) {
  * 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) || !is_array($aTemplateSet) 
-                     ? array() : $aTemplateSet);
-    $templateset_default = ( !isset($templateset_default) ? 0 : $templateset_default );
-
-    $sTemplateID = !isset($aTemplateSet[$templateset_default]['ID']) ? 'default' : $aTemplateSet[$templateset_default]['ID'];
+    $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));
@@ -66,7 +63,6 @@ if ( !isset($oTemplate) || !is_object($oTemplate) ) {
 }
 
 // The error handler object is probably also not initialized on a refresh
-require_once(SM_PATH . 'class/error.class.php');
 $oErrorHandler = new ErrorHandler($oTemplate,'error_message.tpl');
 
 /* internal gettext functions will fail, if language is not set */
@@ -75,6 +71,7 @@ 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');