Just fiddling. Give credit where credit is due. Template class header() function...

[squirrelmail.git] / src / signout.php

diff --git a/src/signout.php b/src/signout.php
index 538046e6c5733ae42eeeefb2c3768f53f79f9e2c..2c5dac51e1995444469c2f51975fe6ac4f12ecbe 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-2007 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.
  */
@@ -37,8 +40,7 @@ if (! sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) {
 
 $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 +60,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));
     }