projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add clickjacking protection (thanks to Asbjorn Thorsen and Geir Hansen for bringing...
[squirrelmail.git]
/
src
/
signout.php
diff --git
a/src/signout.php
b/src/signout.php
index 538046e6c5733ae42eeeefb2c3768f53f79f9e2c..99e4dfcb715a19965494d01ac78841c1de3542de 100644
(file)
--- a/
src/signout.php
+++ b/
src/signout.php
@@
-5,12
+5,15
@@
*
* Cleans up after the user. Resets cookies and terminates session.
*
*
* 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
*/
* @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.
*/
/**
* Include the SquirrelMail initialization file.
*/
@@
-29,16
+32,9
@@
if (!isset($frame_top)) {
$frame_top = '_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';
$login_uri = 'login.php';
-$hook_results = do_hook('logout', $login_uri);
-$login_uri = $hook_results[1];
+do_hook('logout', $login_uri);
sqsession_destroy();
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
$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));
}
foreach ($always_include as $var) {
$oTemplate->assign($var, (isset($$var) ? $$var : NULL));
}