Always generate $base_uri for every page request as opposed to doing it only on some...

[squirrelmail.git] / src / signout.php

diff --git a/src/signout.php b/src/signout.php
index 7a19b4e9e5864d6577f242c432ad236dc1fc6a97..50d1172236a031020a96a8e3b6ac2fd3caa07a1b 100644 (file)
--- 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-2009 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();
 
@@ -55,14 +54,15 @@ if ( !isset($oTemplate) || !is_object($oTemplate) ) {
     $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');
+    $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
-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 */
@@ -71,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');