X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsignout.php;h=fae6ce9c7dce8de3c5deacf6edb7785c460b13f0;hb=4cb1746c0df09e049ec1a79dcf76b181eb82595c;hp=83cc1fca2c191d8b1db83fd1656011085bc1ef30;hpb=46d38f7894542146367a4b22c63f41564829abd2;p=squirrelmail.git
diff --git a/src/signout.php b/src/signout.php
index 83cc1fca..fae6ce9c 100644
--- a/src/signout.php
+++ b/src/signout.php
@@ -11,65 +11,53 @@
* $Id$
*/
-/*****************************************************************/
-/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!! ***/
-/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION. ***/
-/*** + Base level indent should begin at left margin, as ***/
-/*** the require_once below looks. ***/
-/*** + All identation should consist of four space blocks ***/
-/*** + Tab characters are evil. ***/
-/*** + all comments should use "slash-star ... star-slash" ***/
-/*** style -- no pound characters, no slash-slash style ***/
-/*** + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD ***/
-/*** ALWAYS USE { AND } CHARACTERS!!! ***/
-/*** + Please use ' instead of ", when possible. Note " ***/
-/*** should always be used in _( ) function calls. ***/
-/*** Thank you for your help making the SM code more readable. ***/
-/*****************************************************************/
-
require_once('../src/validate.php');
require_once('../functions/prefs.php');
require_once('../functions/plugin.php');
require_once('../functions/strings.php');
- // Erase any lingering attachments
- if (! isset($attachments)) {
- $attachments = array();
- }
- $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
- foreach ($attachments as $info) {
- $attached_file = "$hashed_attachment_dir/$info[localfilename]";
- if (file_exists($attached_file)) {
- unlink($attached_file);
- }
- }
+/* Erase any lingering attachments */
+if (! isset($attachments)) {
+ $attachments = array();
+}
+$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+foreach ($attachments as $info) {
+ $attached_file = "$hashed_attachment_dir/$info[localfilename]";
+ if (file_exists($attached_file)) {
+ unlink($attached_file);
+ }
+}
+
+if (!isset($frame_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 (! isset($base_uri)) {
- ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs);
- $base_uri = $regs[1];
- }
+/* 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)) {
+ ereg ('(^.*/)[^/]+/[^/]+$', $PHP_SELF, $regs);
+ $base_uri = $regs[1];
+}
- do_hook('logout');
- setcookie('username', '', 0, $base_uri);
- setcookie('key', '', 0, $base_uri);
- session_destroy();
+do_hook('logout');
+setcookie('username', '', 0, $base_uri);
+setcookie('key', '', 0, $base_uri);
+session_destroy();
- if ($signout_page) {
- header("Status: 303 See Other");
- header("Location: $signout_page");
- exit; /* we send no content if we're redirecting. */
- }
+if ($signout_page) {
+ header('Status: 303 See Other');
+ header("Location: $signout_page");
+ exit; /* we send no content if we're redirecting. */
+}
?>
<?php echo $org_title ?> - Signout
@@ -77,7 +65,7 @@ require_once('../functions/strings.php');
LINK="" VLINK=""
ALINK="">