projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove PHP closing tag in example config file
[squirrelmail.git]
/
src
/
signout.php
diff --git
a/src/signout.php
b/src/signout.php
index 55576058e743f66205c455b43d6ec10081642a4d..37e5a2d6fb33863e84e045cb56668f2a81d8d8ce 100644
(file)
--- a/
src/signout.php
+++ b/
src/signout.php
@@
-5,7
+5,7
@@
*
* Cleans up after the user. Resets cookies and terminates session.
*
*
* Cleans up after the user. Resets cookies and terminates session.
*
- * @copyright © 1999-200
6
The SquirrelMail Project Team
+ * @copyright © 1999-200
7
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
@@
-35,7
+35,9
@@
if (! sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) {
$base_uri = sqm_baseuri();
}
$base_uri = sqm_baseuri();
}
-do_hook('logout');
+$login_uri = 'login.php';
+
+do_hook('logout', $login_uri);
sqsession_destroy();
sqsession_destroy();
@@
-55,7
+57,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));
}
@@
-70,6
+74,7
@@
set_up_language($squirrelmail_language, true, true);
displayHtmlHeader($org_title . ' - ' . _("Signout"));
$oTemplate->assign('frame_top', $frame_top);
displayHtmlHeader($org_title . ' - ' . _("Signout"));
$oTemplate->assign('frame_top', $frame_top);
+$oTemplate->assign('login_uri', $login_uri);
$oTemplate->display('signout.tpl');
$oTemplate->display('signout.tpl');