Nuke obsolete function general_info

[squirrelmail.git] / src / signout.php

diff --git a/src/signout.php b/src/signout.php
index fae6ce9c7dce8de3c5deacf6edb7785c460b13f0..1b095056580fd703c43998d527f64de28f18595e 100644 (file)
--- a/src/signout.php
+++ b/src/signout.php
@@ -17,26 +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)) {
-    ereg ('(^.*/)[^/]+/[^/]+$', $PHP_SELF, $regs);
-    $base_uri = $regs[1];
+if (!isset($base_uri)) {
+    if (!function_exists('sqm_baseuri')){
+        require_once('../functions/display_messages.php');
+    }
+    $base_uri = sqm_baseuri();
 }
 
 do_hook('logout');