X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsignout.php;h=75a36ccfa38e89f8a0f3cfe8d5e0f7138e58e84a;hb=43fdb2a474b990b8b7db21bfb05b30a70ac768a0;hp=d7258a77c2c50c9fbaebf159bc9daabb9e1ff00e;hpb=cf6df86f2c2a324311683edd44e657c9e75d0990;p=squirrelmail.git

diff --git a/src/signout.php b/src/signout.php
index d7258a77..75a36ccf 100644
--- a/src/signout.php
+++ b/src/signout.php
@@ -1,27 +1,46 @@
 <?php
-   /**
-    **  signout.php -- cleans up session and logs the user out
-    **
-    **  Copyright (c) 1999-2000 The SquirrelMail development team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Cleans up after the user. Resets cookies and terminates
-    **  session.
-    **
-    **  $Id$
-    **/
 
-   include('../src/validate.php');
-   include ('../functions/prefs.php');
-   include ('../functions/plugin.php');
+/**
+ * signout.php -- cleans up session and logs the user out
+ *
+ * Copyright (c) 1999-2002 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$
+ */
+
+/*****************************************************************/
+/*** 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');
+include_once('../functions/strings.php');
 
    // Erase any lingering attachments
    if (! isset($attachments)) {
        $attachments = array();
    }
+   $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
    foreach ($attachments as $info) {
-       if (file_exists($attachment_dir . $info['localfilename'])) {
-           unlink($attachment_dir . $info['localfilename']);
+       $attached_file = "$hashed_attachment_dir/$info[localfilename]";
+       if (file_exists($attached_file)) {
+           unlink($attached_file);
        }
    }
 
@@ -60,12 +79,12 @@ ALINK="<?php echo $color[7] ?>">
 <BR><BR>
 <TABLE BGCOLOR="FFFFFF" BORDER="0" COLS="1" WIDTH="50%" CELLSPACING="0" 
 CELLPADDING="2" ALIGN="CENTER">
-  <TR BGCOLOR="<?php echo $color[0] ?>" WIDTH=100%>
+  <TR BGCOLOR="<?php echo $color[0] ?>" WIDTH="100%">
     <TD ALIGN="CENTER">
       <B><?php echo _("Sign Out") ?></B>
     </TD>
   </TR>
-  <TR BGCOLOR="<?php echo $color[4] ?>" WIDTH=100%>
+  <TR BGCOLOR="<?php echo $color[4] ?>" WIDTH="100%">
     <TD ALIGN="CENTER">
       <?php do_hook('logout_above_text'); ?>
       <?php echo _("You have been successfully signed out.") ?><BR>
@@ -74,7 +93,7 @@ CELLPADDING="2" ALIGN="CENTER">
       </A><BR><BR>
     </TD>
   </TR>
-  <TR BGCOLOR="<?php echo $color[0] ?>" WIDTH=100%>
+  <TR BGCOLOR="<?php echo $color[0] ?>" WIDTH="100%">
     <TD ALIGN="CENTER">
       <BR>
     </TD>