X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsignout.php;h=1b095056580fd703c43998d527f64de28f18595e;hb=d748c12b6f7f490587c3fee9745576e21c9f30ea;hp=c0f90204f9dc19acb8c9aea18dc3d2da56203c93;hpb=895905c0f766ea03e85deab260b4bb1522dd0e3c;p=squirrelmail.git

diff --git a/src/signout.php b/src/signout.php
index c0f90204..1b095056 100644
--- a/src/signout.php
+++ b/src/signout.php
@@ -1,57 +1,65 @@
 <?php
 
-   /**
-    **  signout.php -- cleans up session and logs the user out
-    **
-    **  Copyright (c) 1999-2001 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$
-    **/
+/**
+ * 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$
+ */
 
-   require_once('../src/validate.php');
-   require_once('../functions/prefs.php');
-   require_once('../functions/plugin.php');
+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();
-   }
-   foreach ($attachments as $info) {
-       if (file_exists($attachment_dir . $info['localfilename'])) {
-           unlink($attachment_dir . $info['localfilename']);
-       }
-   }
+/* Erase any lingering attachments */
+if (isset($attachments) && is_array($attachments) 
+    && sizeof($attachments)){
+    $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 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 (!isset($frame_top)) {
+    $frame_top = '_top';
+}
 
-   do_hook('logout');
-   setcookie('username', '', 0, $base_uri);
-   setcookie('key', '', 0, $base_uri);
-   session_destroy();
+/* 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('../functions/display_messages.php');
+    }
+    $base_uri = sqm_baseuri();
+}
 
-   if ($signout_page) {
-       header("Status: 303 See Other");
-       header("Location: $signout_page");
-       exit; /* we send no content if we're redirecting. */
-   }
+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. */
+}
 ?>
 <HTML>
    <HEAD>
 <?php
-   if ($theme_css != '') {
+    if ($theme_css != '') {
 ?>
 <LINK REL="stylesheet" TYPE="text/css" HREF="<?php echo $theme_css ?>">
 <?php
-   }
+    }
 ?>
 <TITLE><?php echo $org_title ?> - Signout</TITLE>
 </HEAD>
@@ -59,27 +67,27 @@
 LINK="<?php echo $color[7] ?>" VLINK="<?php echo $color[7] ?>"
 ALINK="<?php echo $color[7] ?>">
 <BR><BR>
-<TABLE BGCOLOR="FFFFFF" BORDER="0" COLS="1" WIDTH="50%" CELLSPACING="0" 
+<TABLE BGCOLOR="<?php echo $color[4]; ?>" 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>
-      <A HREF="login.php" TARGET="_top">
+      <A HREF="login.php" TARGET="<?php echo $frame_top ?>">
       <?php echo _("Click here to log back in.") ?>
       </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>
   </TR>
 </TABLE>
 </BODY>
-</HTML>
+</HTML>
\ No newline at end of file
