X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fsignout.php;h=ed52ffe1ab0de89b8cb439c0b5071f943c138802;hp=1fb84845af327a9b1753805eba98724450c5f7c6;hb=91e0dccca7b2452d8b450791cae3aa4125e8889e;hpb=ed89e55b372449d697a8fe81c75d22205621b799
diff --git a/src/signout.php b/src/signout.php
index 1fb84845..ed52ffe1 100644
--- a/src/signout.php
+++ b/src/signout.php
@@ -3,15 +3,19 @@
/**
* signout.php -- cleans up session and logs the user out
*
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Cleans up after the user. Resets cookies and terminates session.
*
- * $Id$
+ * @version $Id$
+ * @package squirrelmail
*/
-/* Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
define('SM_PATH','../');
/* SquirrelMail required files. */
@@ -22,7 +26,7 @@ require_once(SM_PATH . 'functions/strings.php');
require_once(SM_PATH . 'functions/html.php');
/* Erase any lingering attachments */
-if (isset($attachments) && is_array($attachments)
+if (isset($attachments) && is_array($attachments)
&& sizeof($attachments)){
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
foreach ($attachments as $info) {
@@ -39,13 +43,9 @@ if (!isset($frame_top)) {
/* If a user hits reload on the last page, $base_uri isn't set
* because it was deleted with the session. */
-if (!isset($_SESSION['base_uri'])) {
- if (!function_exists('sqm_baseuri')){
- require_once(SM_PATH . 'functions/display_messages.php');
- }
+if (! sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) {
+ require_once(SM_PATH . 'functions/display_messages.php');
$base_uri = sqm_baseuri();
-} else {
- $base_uri = $_SESSION['base_uri'];
}
do_hook('logout');
@@ -64,16 +64,16 @@ if ($signout_page) {
-
+
- <?php echo $org_title ?> - Signout
+ <?php echo $org_title . ' - ' . _("Signout"); ?>
-
-
+
+
' .
- _("Click here to log back in.") . '
' ,
+ '
' .
+ _("Click here to log back in.") . '
' ,
'center' ) ,
'', $color[4], 'width="100%"' ) .
html_tag( 'tr',
- html_tag( 'td', '
', 'center' ) ,
+ html_tag( 'td', '
', 'center' ) ,
'', $color[0], 'width="100%"' ) ,
'center', $color[4], 'width="50%" cols="1" cellpadding="2" cellspacing="0" border="0"' )
?>
-
+