fixed some more quoting problems with searching and message highlighting

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

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index d83111f781fdc90bbe60996bca7c7303b2dccdd7..0b67db0cf17ffb3a4879e0113cde938adbf31ff4 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -27,15 +27,17 @@
                if ($mailbox == $sent_folder) { $italic = "<i>"; $italic_end = "</i>"; }
       
       for ($i=0; $i < count($message_highlight_list); $i++) {
-         if ($message_highlight_list[$i]["match_type"] == "to_cc") {
-            if (strpos("^^".$msg["TO"], strtolower($message_highlight_list[$i]["value"])) || strpos("^^".$msg["CC"], strtolower($message_highlight_list[$i]["value"]))) {
+         if (trim($message_highlight_list[$i]["value"]) != "") {
+            if ($message_highlight_list[$i]["match_type"] == "to_cc") {
+               if (strpos("^^".$msg["TO"], $message_highlight_list[$i]["value"]) || strpos("^^".$msg["CC"], $message_highlight_list[$i]["value"])) {
+                  $hlt_color = $message_highlight_list[$i]["color"];
+                  continue;
+               }
+            } else if (strpos("^^".$msg[strtoupper($message_highlight_list[$i]["match_type"])],$message_highlight_list[$i]["value"])) {
                $hlt_color = $message_highlight_list[$i]["color"];
                continue;
-            }
-         } else if (strpos("^^".strtolower($msg[strtoupper($message_highlight_list[$i]["match_type"])]),$message_highlight_list[$i]["value"])) {
-            $hlt_color = $message_highlight_list[$i]["color"];
-            continue;
-         }   
+            }   
+         }
       }   
       
       if (!$hlt_color)