X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsignout.php;h=9d2d5735a5a10d2583a768616602a87d111d6b2f;hb=23279352b07104549202a97e8d9f69c96dfbfc96;hp=151a5d7f0aeab5781defb59fa331abfe159abc5e;hpb=8672576304f4da444b9b1e0e4ca81505af0267ec;p=squirrelmail.git
diff --git a/src/signout.php b/src/signout.php
index 151a5d7f..9d2d5735 100644
--- a/src/signout.php
+++ b/src/signout.php
@@ -3,19 +3,23 @@
/**
* signout.php -- cleans up session and logs the user out
*
- * Copyright (c) 1999-2002 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. */
-require_once(SM_PATH . 'src/validate.php');
+require_once(SM_PATH . 'include/validate.php');
require_once(SM_PATH . 'functions/prefs.php');
require_once(SM_PATH . 'functions/plugin.php');
require_once(SM_PATH . 'functions/strings.php');
@@ -39,17 +43,14 @@ 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($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();
}
do_hook('logout');
-setcookie('username', '', 0, $base_uri);
-setcookie('key', '', 0, $base_uri);
-session_destroy();
+
+sqsession_destroy();
if ($signout_page) {
header('Status: 303 See Other');
@@ -57,28 +58,30 @@ if ($signout_page) {
exit; /* we send no content if we're redirecting. */
}
?>
+
-
+
-
+
-<?php echo $org_title ?> - Signout
+ <?php echo $org_title . ' - ' . _("Signout"); ?>
-' .