From 4aaea201d977a4ee3c1074118348df36d07d0384 Mon Sep 17 00:00:00 2001 From: fidian Date: Sat, 27 Oct 2001 17:47:03 +0000 Subject: [PATCH] Removed warnings git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1627 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/mailbox_display.php | 2 +- functions/mime.php | 4 ++++ src/left_main.php | 9 ++++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 43836e1c..088bedd6 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -353,7 +353,7 @@ // generic function to convert the msgs array into an HTML table function displayMessageArray($imapConnection, $numMessages, $startMessage, &$msgs, $msort, $mailbox, $sort, $color,$show_num) { global $folder_prefix, $sent_folder; - global $imapServerAddress; + global $imapServerAddress, $data_dir, $username, $use_mailbox_cache; global $index_order, $real_endMessage, $real_startMessage, $checkall; // if cache isn't already set, do it now diff --git a/functions/mime.php b/functions/mime.php index 8720083c..c9571e95 100644 --- a/functions/mime.php +++ b/functions/mime.php @@ -915,6 +915,8 @@ $ret .= '' . _("Title:") . " $title
\n"; $ret .= " '' ) $ret .= " bgcolor=$bgcolor"; @@ -952,6 +954,8 @@ default: // Following tags can contain some event handler, lets search it stripComments( $i, $j, $body ); + if (! isset($base)) + $base = ''; $ret .= stripEvent( $i, $j, $body, $id, $base ) . '>'; // $ret .= ""; } diff --git a/src/left_main.php b/src/left_main.php index 4bb0e0b6..50155aa2 100644 --- a/src/left_main.php +++ b/src/left_main.php @@ -238,7 +238,7 @@ * status and parent (or not parent) status for all children boxes. */ function compute_folder_children(&$parbox, $boxcount) { - global $boxes; + global $boxes, $data_dir, $username; $nextbox = $parbox + 1; /* Retreive the name for the parent box. */ @@ -254,7 +254,10 @@ $boxes[$parbox]['collapse'] = $collapse; /* Otherwise, get the name of the next box. */ - $nextbox_name = $boxes[$nextbox]['unformatted']; + if (isset($boxes[$nextbox]['unformatted'])) + $nextbox_name = $boxes[$nextbox]['unformatted']; + else + $nextbox_name = ''; /* Compute any children boxes for this box. */ while (($nextbox < $boxcount) && @@ -279,4 +282,4 @@ $parbox = $nextbox; } echo "\n"; -?> \ No newline at end of file +?> -- 2.25.1