X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=5d95cdfeb1f09a58c578c6977a678ea95e7ecf51;hb=3e69e88b2bd4d8ed662ff6443aa4567bf1c26be2;hp=ab348b92049ec893724f8ccfc64c511d97586a61;hpb=15a9cd31950714c2cadd6cb6dfe92c178aa71abc;p=squirrelmail.git

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index ab348b92..5d95cdfe 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -13,6 +13,7 @@
    function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage) {
       global $color, $msgs, $msort;
 		global $sent_folder;
+      global $message_highlight_list;
 
 		$msg = $msgs[$key];
 
@@ -25,12 +26,21 @@
       if ($msg["FLAG_SEEN"] == false) { $bold = "<b>"; $bold_end = "</b>"; }
 		if ($mailbox == $sent_folder) { $italic = "<i>"; $italic_end = "</i>"; }
       
-      echo "   <td width=1% align=center><input type=checkbox name=\"msg[$t]\" value=".$msg["ID"]."></TD>\n";
-      echo "   <td width=30%>$italic$bold$flag$senderName$flag_end$bold_end$italic_end</td>\n";
-      echo "   <td nowrap width=1%><center>$bold$flag".$msg["DATE_STRING"]."$flag_end$bold_end</center></td>\n";
-		if ($msg["FLAG_ANSWERED"] == true) echo "   <td width=1%><b><small>A</small></b></td>";
-		else	echo "   <td width=1%>&nbsp;</td>";
-      echo "   <td width=%>$bold<a href=\"read_body.php?mailbox=$urlMailbox&passed_id=".$msg["ID"]."&startMessage=$startMessage&show_more=0\">$flag$subject$flag_end</a>$bold_end</td>\n";
+      for ($i=0; $i < count($message_highlight_list); $i++) {
+         if (eregi($message_highlight_list[$i]["value"],$msg[strtoupper($message_highlight_list[$i]["match_type"])])) {
+            $hlt_color = $message_highlight_list[$i]["color"];
+            continue;
+         }   
+      }   
+      if (!$hlt_color)
+         $hlt_color = $color[4];
+      
+      echo "   <td width=1% bgcolor=$hlt_color align=center><input type=checkbox name=\"msg[$t]\" value=".$msg["ID"]."></TD>\n";
+      echo "   <td width=30% bgcolor=$hlt_color>$italic$bold$flag$senderName$flag_end$bold_end$italic_end</td>\n";
+      echo "   <td nowrap width=1% bgcolor=$hlt_color><center>$bold$flag".$msg["DATE_STRING"]."$flag_end$bold_end</center></td>\n";
+		if ($msg["FLAG_ANSWERED"] == true) echo "   <td bgcolor=$hlt_color width=1%><b><small>A</small></b></td>";
+		else	echo "   <td bgcolor=$hlt_color width=1%>&nbsp;</td>";
+      echo "   <td bgcolor=$hlt_color width=%>$bold<a href=\"read_body.php?mailbox=$urlMailbox&passed_id=".$msg["ID"]."&startMessage=$startMessage&show_more=0\">$flag$subject$flag_end</a>$bold_end</td>\n";
 
       echo "</tr>\n";
    }
@@ -41,18 +51,20 @@
    function showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color,$show_num, $use_cache) {
       global $msgs, $msort;
 		global $sent_folder;
+      global $message_highlight_list;
 
       if (!$use_cache) {
          if ($numMessages >= 1) {
-				if ($mailbox == $sent_folder)
-              	$ary = sqimap_get_small_header ($imapConnection, 1, $numMessages, true);
-				else
-              	$ary = sqimap_get_small_header ($imapConnection, 1, $numMessages, false);
-						
             for ($q = 0; $q < $numMessages; $q++) {
-					$from[$q] = $ary[$q]->from;
-					$date[$q] = $ary[$q]->date;
-					$subject[$q] = $ary[$q]->subject;
+					if ($mailbox == $sent_folder)
+   	           	$hdr = sqimap_get_small_header ($imapConnection, $q+1, true);
+					else
+         	     	$hdr = sqimap_get_small_header ($imapConnection, $q+1, false);
+						
+					$from[$q] = $hdr->from;
+					$date[$q] = $hdr->date;
+					$subject[$q] = $hdr->subject;
+               $to[$q] = $hdr->to;
 
                $flags[$q] = sqimap_get_flags ($imapConnection, $q+1);
             }
@@ -68,6 +80,7 @@
             $messages[$j]["ID"] = $j+1;
             $messages[$j]["FROM"] = decodeHeader($from[$j]);
             $messages[$j]["SUBJECT"] = decodeHeader($subject[$j]);
+            $messages[$j]["TO"] = decodeHeader($to[$j]);
    
             $num = 0;
             while ($num < count($flags[$j])) {
@@ -111,7 +124,7 @@
           ** 2 = Name (up)
           ** 3 = Name (dn)
           **/
-
+         session_unregister("msgs");
          if (($sort == 0) || ($sort == 1))
             $msort = array_cleave ($msgs, "TIME_STAMP");
          if (($sort == 2) || ($sort == 3))
@@ -127,6 +140,7 @@
          session_register("msort");
       }
       displayMessageArray($imapConnection, $numMessages, $startMessage, $msgs, $msort, $mailbox, $sort, $color,$show_num);
+     session_register("msgs");
    }
 
    // generic function to convert the msgs array into an HTML table
@@ -194,9 +208,11 @@
 
       $boxes = sqimap_mailbox_list($imapConnection);
       for ($i = 0; $i < count($boxes); $i++) {
-         $box = $boxes[$i]["unformatted"];
-         $box2 = replace_spaces($boxes[$i]["formatted"]);
-         echo "         <OPTION VALUE=\"$box\">$box2\n";
+			if ($boxes[$i]["flags"][0] != "noselect" && $boxes[$i]["flags"][1] != "noselect" && $boxes[$i]["flags"][2] != "noselect") {
+         	$box = $boxes[$i]["unformatted"];
+         	$box2 = replace_spaces($boxes[$i]["formatted"]);
+         	echo "         <OPTION VALUE=\"$box\">$box2\n";
+			}	
       }
       echo "         </SELECT></SMALL></TT>";
       echo "         <SMALL><INPUT TYPE=SUBMIT NAME=\"moveButton\" VALUE=\"". _("Move") ."\"></SMALL></NOBR>\n";
@@ -250,7 +266,7 @@
       // loop through and display the info for each message.
       $t = 0; // $t is used for the checkbox number
       if ($numMessages == 0) { // if there's no messages in this folder
-         echo "<TR><TD BGCOLOR=\"$color[4]\" COLSPAN=5><CENTER><BR><B>". _("THIS FOLDER IS EMPTY") ."</B><BR>&nbsp</CENTER></TD></TR>";
+         echo "<TR><TD BGCOLOR=\"$color[4]\" COLSPAN=5><CENTER><BR><B>". _("THIS FOLDER IS EMPTY") ."</B><BR>&nbsp;</CENTER></TD></TR>";
       } else if ($startMessage == $endMessage) { // if there's only one message in the box, handle it different.
          $i = $startMessage - 1;
          reset($msort);
@@ -296,5 +312,6 @@
          echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Next") . "</A>\n";
       }
       echo "</TD></TR></TABLE>"; /** End of message-list table */
+
    }
 ?>