*
* 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
$base_uri = sqm_baseuri();
}
-do_hook('logout');
+$login_uri = 'login.php';
+
+do_hook('logout', $login_uri);
sqsession_destroy();
/* After a reload of signout.php, $oTemplate might not exist anymore.
* Recover, so that we don't get all kinds of errors in that situation. */
if ( !isset($oTemplate) || !is_object($oTemplate) ) {
- require_once(SM_PATH . 'class/template/template.class.php');
- $aTemplateSet = ( !isset($aTemplateSet) ? array() : $aTemplateSet );
- $templateset_default = ( !isset($templateset_default) ? 0 : $templateset_default );
-
- $sTplDir = !isset($aTemplateSet[$templateset_default]['PATH']) ? SM_PATH . 'templates/default/' : $aTemplateSet[$templateset_default]['PATH'];
- $icon_theme_path = !$use_icons ? NULL : $sTplDir . 'images/';
- $oTemplate = new Template($sTplDir);
+ require_once(SM_PATH . 'class/template/Template.class.php');
+ $sTemplateID = Template::get_default_template_set();
+ $icon_theme_path = !$use_icons ? NULL : Template::calculate_template_images_directory($sTemplateID);
+ $oTemplate = Template::construct_template($sTemplateID);
// We want some variables to always be available to the template
- $always_include = array('sTplDir', 'icon_theme_path');
+ $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(SM_PATH . 'class/error.class.php');
$oErrorHandler = new ErrorHandler($oTemplate,'error_message.tpl');
/* internal gettext functions will fail, if language is not set */
displayHtmlHeader($org_title . ' - ' . _("Signout"));
$oTemplate->assign('frame_top', $frame_top);
+$oTemplate->assign('login_uri', $login_uri);
$oTemplate->display('signout.tpl');