X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=e4d3c6816d33eb1502c9d31f175e74fec830a8ab;hb=e4821f6c30b9211cf836ae706aa79356f780bb0a;hp=8613c2b535122b2185d18def6767332647e4d5c6;hpb=ec6762416d9243d08bc94344d506cf4421aed385;p=squirrelmail.git
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 8613c2b5..e4d3c681 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -19,7 +19,7 @@
$senderName = sqimap_find_displayable_name($msg["FROM"]);
$urlMailbox = urlencode($mailbox);
- $subject = trim(stripslashes($msg["SUBJECT"]));
+ $subject = trim($msg["SUBJECT"]);
echo "
\n";
if ($msg["FLAG_FLAGGED"] == true) { $flag = ""; $flag_end = ""; }
@@ -29,11 +29,11 @@
for ($i=0; $i < count($message_highlight_list); $i++) {
if (trim($message_highlight_list[$i]["value"]) != "") {
if ($message_highlight_list[$i]["match_type"] == "to_cc") {
- if (strpos("^^".strtolower($msg["TO"]), $message_highlight_list[$i]["value"]) || strpos("^^".strtolower($msg["CC"]), $message_highlight_list[$i]["value"])) {
+ if (strpos("^^".strtolower($msg["TO"]), strtolower($message_highlight_list[$i]["value"])) || strpos("^^".strtolower($msg["CC"]), strtolower($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"])) {
+ } else if (strpos("^^".strtolower($msg[strtoupper($message_highlight_list[$i]["match_type"])]),strtolower($message_highlight_list[$i]["value"]))) {
$hlt_color = $message_highlight_list[$i]["color"];
continue;
}
@@ -66,6 +66,12 @@
global $msgs, $msort;
global $sent_folder;
global $message_highlight_list;
+ global $auto_expunge;
+
+ if ($auto_expunge) {
+ sqimap_mailbox_expunge($imapConnection, $mailbox);
+ sqimap_mailbox_select($imapConnection, $mailbox);
+ }
if (!$use_cache) {
if ($numMessages >= 1) {
@@ -229,6 +235,7 @@
echo "
";
echo "\n\n\n |