Ver código fonte

Removed warnings

Tyler Akins 24 anos atrás
pai
commit
030caca93c
3 arquivos alterados com 11 adições e 4 exclusões
  1. 1 1
      functions/mailbox_display.php
  2. 4 0
      functions/mime.php
  3. 6 3
      src/left_main.php

+ 1 - 1
functions/mailbox_display.php

@@ -353,7 +353,7 @@
    // generic function to convert the msgs array into an HTML table
    // generic function to convert the msgs array into an HTML table
    function displayMessageArray($imapConnection, $numMessages, $startMessage, &$msgs, $msort, $mailbox, $sort, $color,$show_num) {
    function displayMessageArray($imapConnection, $numMessages, $startMessage, &$msgs, $msort, $mailbox, $sort, $color,$show_num) {
       global $folder_prefix, $sent_folder;
       global $folder_prefix, $sent_folder;
-      global $imapServerAddress;
+      global $imapServerAddress, $data_dir, $username, $use_mailbox_cache;
       global $index_order, $real_endMessage, $real_startMessage, $checkall;
       global $index_order, $real_endMessage, $real_startMessage, $checkall;
 
 
       // if cache isn't already set, do it now
       // if cache isn't already set, do it now

+ 4 - 0
functions/mime.php

@@ -915,6 +915,8 @@
                             $ret .= '<b>' . _("Title:") . " </b>$title<br>\n";
                             $ret .= '<b>' . _("Title:") . " </b>$title<br>\n";
                         $ret .= "<TABLE";
                         $ret .= "<TABLE";
                         $i += 5;
                         $i += 5;
+			if (! isset($base))
+			   $base = '';
                         $ret .= stripEvent( $i, $j, $body, $id, $base );
                         $ret .= stripEvent( $i, $j, $body, $id, $base );
                         //if( $bgcolor <> '' )
                         //if( $bgcolor <> '' )
                             $ret .= " bgcolor=$bgcolor";
                             $ret .= " bgcolor=$bgcolor";
@@ -952,6 +954,8 @@
                     default:
                     default:
                         // Following tags can contain some event handler, lets search it
                         // Following tags can contain some event handler, lets search it
                         stripComments( $i, $j, $body );
                         stripComments( $i, $j, $body );
+			if (! isset($base))
+			   $base = '';
                         $ret .= stripEvent( $i, $j, $body, $id, $base ) . '>';
                         $ret .= stripEvent( $i, $j, $body, $id, $base ) . '>';
                         // $ret .= "<!-- $tag detected -->";
                         // $ret .= "<!-- $tag detected -->";
                 }
                 }

+ 6 - 3
src/left_main.php

@@ -238,7 +238,7 @@
      * status and parent (or not parent) status for all children boxes.
      * status and parent (or not parent) status for all children boxes.
      */
      */
     function compute_folder_children(&$parbox, $boxcount) {
     function compute_folder_children(&$parbox, $boxcount) {
-        global $boxes;
+        global $boxes, $data_dir, $username;
         $nextbox = $parbox + 1;
         $nextbox = $parbox + 1;
 
 
         /* Retreive the name for the parent box. */
         /* Retreive the name for the parent box. */
@@ -254,7 +254,10 @@
         $boxes[$parbox]['collapse'] = $collapse;
         $boxes[$parbox]['collapse'] = $collapse;
 
 
         /* Otherwise, get the name of the next box. */
         /* 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. */
         /* Compute any children boxes for this box. */
         while (($nextbox < $boxcount) &&
         while (($nextbox < $boxcount) &&
@@ -279,4 +282,4 @@
         $parbox = $nextbox;
         $parbox = $nextbox;
     }
     }
     echo "</BODY></HTML>\n";
     echo "</BODY></HTML>\n";
-?>
+?>