Removed warnings

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1627 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 43836e1ca5973f043ca00e413a76e80b2d2a4e41..088bedd66648e0fd5e29b1cae6354667e24c111a 100644 (file)
--- 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 8720083c69fab8ba37267eec800d2ca0f6ea0f23..c9571e950e553a9b207f56fddcb6000523043bd4 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -915,6 +915,8 @@
                             $ret .= '<b>' . _("Title:") . " </b>$title<br>\n";
                         $ret .= "<TABLE";
                         $i += 5;
+                       if (! isset($base))
+                          $base = '';
                         $ret .= stripEvent( $i, $j, $body, $id, $base );
                         //if( $bgcolor <> '' )
                             $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 .= "<!-- $tag detected -->";
                 }

diff --git a/src/left_main.php b/src/left_main.php
index 4bb0e0b6165f2dc373ea30c31f0a58da0b091420..50155aa298f5846b2353cca9bb323534efb29946 100644 (file)
--- 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 "</BODY></HTML>\n";
-?>
\ No newline at end of file
+?>