- added a bunch of sqimap_logout's where none existed

[squirrelmail.git] / functions / mailbox_display.php

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 9f82bfec675860bc4750a261693bebfb53a6f9ec..d1589cd5f0d2ba11cb9280c23f7a0397b29a8631 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -27,7 +27,12 @@
                if ($mailbox == $sent_folder) { $italic = "<i>"; $italic_end = "</i>"; }
       
       for ($i=0; $i < count($message_highlight_list); $i++) {
-         if (eregi($message_highlight_list[$i]["value"],$msg[strtoupper($message_highlight_list[$i]["match_type"])])) {
+         if ($message_highlight_list[$i]["match_type"] == "to_cc") {
+            if (eregi($message_highlight_list[$i]["value"],$msg["TO"]) || eregi($message_highlight_list[$i]["value"],$msg["CC"])) {
+               $hlt_color = $message_highlight_list[$i]["color"];
+               continue;
+            }
+         } else if (eregi($message_highlight_list[$i]["value"],$msg[strtoupper($message_highlight_list[$i]["match_type"])])) {
             $hlt_color = $message_highlight_list[$i]["color"];
             continue;
          }   
@@ -67,6 +72,7 @@
                                        $subject[$q] = $hdr->subject;
                $to[$q] = $hdr->to;
                $priority[$q] = $hdr->priority;
+               $cc[$q] = $hdr->cc;
 
                $flags[$q] = sqimap_get_flags ($imapConnection, $q+1);
             }
@@ -84,6 +90,7 @@
             $messages[$j]["SUBJECT"] = decodeHeader($subject[$j]);
             $messages[$j]["TO"] = decodeHeader($to[$j]);
                                $messages[$j]["PRIORITY"] = $priority[$j];
+            $messages[$j]["CC"] = $cc[$j];
    
             $num = 0;
             while ($num < count($flags[$j])) {