X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsignout.php;h=99e4dfcb715a19965494d01ac78841c1de3542de;hb=ba6d2a963accba3b98fff1d9acb5f1626705d832;hp=538046e6c5733ae42eeeefb2c3768f53f79f9e2c;hpb=779d60951c348bccb3e4e079844e5acc3e82379a;p=squirrelmail.git

diff --git a/src/signout.php b/src/signout.php
index 538046e6..99e4dfcb 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-2011 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,16 +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';
 
-$hook_results = do_hook('logout', $login_uri);
-$login_uri = $hook_results[1];
+do_hook('logout', $login_uri);
 
 sqsession_destroy();
 
@@ -58,7 +54,9 @@ 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));
     }