Fix #542812, mdn checkboxes were not being preserved.

[squirrelmail.git] / src / signout.php

diff --git a/src/signout.php b/src/signout.php
index d8b15ec495c040a402082d0d01816947d886c1a1..1b095056580fd703c43998d527f64de28f18595e 100644 (file)
--- a/src/signout.php
+++ b/src/signout.php
@@ -17,25 +17,28 @@ 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);
+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 (!isset($frame_top)) {
-     $frame_top = '_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)) {
-    $base_uri = dirname(dirname($PHP_SELF)) . "/";
+    if (!function_exists('sqm_baseuri')){
+        require_once('../functions/display_messages.php');
+    }
+    $base_uri = sqm_baseuri();
 }
 
 do_hook('logout');
@@ -75,8 +78,7 @@ CELLPADDING="2" ALIGN="CENTER">
     <TD ALIGN="CENTER">
       <?php do_hook('logout_above_text'); ?>
       <?php echo _("You have been successfully signed out.") ?><BR>
-      <A HREF="<?php echo "$base_uri/login.php" ?>" 
-           TARGET="<?php echo $frame_top ?>">
+      <A HREF="login.php" TARGET="<?php echo $frame_top ?>">
       <?php echo _("Click here to log back in.") ?>
       </A><BR><BR>
     </TD>