X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=0b67db0cf17ffb3a4879e0113cde938adbf31ff4;hp=2decafb70b570f67c47aa5340a052ba0b28049e8;hb=d059be8f70e972558bf3005e8d1d0c7bd8c1cf96;hpb=cbdc56211e121e2676782da26828959da364ec52 diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 2decafb7..0b67db0c 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -8,28 +8,52 @@ ** **/ - $mailbox_info = true; + $mailbox_display_php = true; - function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage) { + function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, $where, $what) { global $color, $msgs, $msort; global $sent_folder; + global $message_highlight_list; $msg = $msgs[$key]; - $senderName = $msg["FROM"]; + $senderName = sqimap_find_displayable_name($msg["FROM"]); $urlMailbox = urlencode($mailbox); $subject = trim(stripslashes($msg["SUBJECT"])); echo "\n"; if ($msg["FLAG_FLAGGED"] == true) { $flag = ""; $flag_end = ""; } if ($msg["FLAG_SEEN"] == false) { $bold = ""; $bold_end = ""; } - if ($msg["FLAG_ANSWERED"] == true) { $ans = " [A]"; } if ($mailbox == $sent_folder) { $italic = ""; $italic_end = ""; } - echo " \n"; - echo " $italic$bold$flag$senderName$flag_end$bold_end$italic_end\n"; - echo "
$bold$flag".$msg["DATE_STRING"]."$flag_end$bold_end
\n"; - echo " $bold$flag$subject$flag_end$ans$bold_end\n"; + 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("^^".$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; + } + } + } + + if (!$hlt_color) + $hlt_color = $color[4]; + + if ($where && $what) { + $search_stuff = "&where=".urlencode($where)."&what=".urlencode($what); + } + + echo " \n"; + echo " $italic$bold$flag$senderName$flag_end$bold_end$italic_end\n"; + echo "
$bold$flag".$msg["DATE_STRING"]."$flag_end$bold_end
\n"; + if ($msg["FLAG_ANSWERED"] == true) echo " A"; + elseif (ereg("(1|2)",substr($msg["PRIORITY"],0,1))) echo " !"; + else echo "  "; + echo " $bold$flag$subject$flag_end$bold_end\n"; echo "\n"; } @@ -40,18 +64,23 @@ 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) { for ($q = 0; $q < $numMessages; $q++) { if ($mailbox == $sent_folder) - sqimap_get_small_header ($imapConnection, $q+1, $f, $s, $d, true); + $hdr = sqimap_get_small_header ($imapConnection, $q+1, true); else - sqimap_get_small_header ($imapConnection, $q+1, $f, $s, $d, false); + $hdr = sqimap_get_small_header ($imapConnection, $q+1, false); - $from[$q] = $f; - $date[$q] = $d; - $subject[$q] = $s; + $from[$q] = $hdr->from; + $date[$q] = $hdr->date; + $subject[$q] = $hdr->subject; + $to[$q] = $hdr->to; + $priority[$q] = $hdr->priority; + $cc[$q] = $hdr->cc; + $flags[$q] = sqimap_get_flags ($imapConnection, $q+1); } } @@ -65,7 +94,17 @@ $messages[$j]["DATE_STRING"] = getDateString($messages[$j]["TIME_STAMP"]); $messages[$j]["ID"] = $j+1; $messages[$j]["FROM"] = decodeHeader($from[$j]); + $messages[$j]["FROM-SORT"] = strtolower(sqimap_find_displayable_name(decodeHeader($from[$j]))); $messages[$j]["SUBJECT"] = decodeHeader($subject[$j]); + $messages[$j]["SUBJECT-SORT"] = strtolower(decodeHeader($subject[$j])); + $messages[$j]["TO"] = decodeHeader($to[$j]); + $messages[$j]["PRIORITY"] = $priority[$j]; + $messages[$j]["CC"] = $cc[$j]; + + # fix SUBJECT-SORT to remove Re: + if (substr($messages[$j]["SUBJECT-SORT"], 0, 3) == "re:" || + substr($messages[$j]["SUBJECT-SORT"], 0, 3) == "aw:") + $messages[$j]["SUBJECT-SORT"] = trim(substr($messages[$j]["SUBJECT-SORT"], 3)); $num = 0; while ($num < count($flags[$j])) { @@ -109,13 +148,13 @@ ** 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)) - $msort = array_cleave ($msgs, "FROM"); + $msort = array_cleave ($msgs, "FROM-SORT"); if (($sort == 4) || ($sort == 5)) - $msort = array_cleave ($msgs, "SUBJECT"); + $msort = array_cleave ($msgs, "SUBJECT-SORT"); if(($sort % 2) == 1) { asort($msort); @@ -125,6 +164,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 @@ -132,50 +172,54 @@ global $folder_prefix, $sent_folder; global $imapServerAddress; - // do a check to see if the config stuff has already been included or not -// if (!isset($imapServerAddress)) -// include("../config/config.php"); - // if cache isn't already set, do it now if (!session_is_registered("msgs")) session_register("msgs"); if (!session_is_registered("msort")) session_register("msort"); + if ($startMessage + ($show_num - 1) < $numMessages) { $endMessage = $startMessage + ($show_num-1); } else { $endMessage = $numMessages; } - + + if ($endMessage < $startMessage) { + $startMessage = $startMessage - $show_num; + if ($startMessage < 1) + $startMessage = 1; + } + $nextGroup = $startMessage + $show_num; $prevGroup = $startMessage - $show_num; $urlMailbox = urlencode($mailbox); + do_hook("mailbox_index_before"); /** This is the beginning of the message list table. It wraps around all messages */ - echo ""; + echo "
"; if ($startMessage < $endMessage) { echo "\n"; } else if ($startMessage == $endMessage) { - echo "\"TD>"; - echo "
". _("Viewing message ") ."$startMessage ($numMessages ". _("total") .")
\n"; + echo "\n"; } echo "\n"; @@ -184,17 +228,19 @@ echo "
"; - echo "
". _("Viewing messages ") ."$startMessage". _(" to ") ."$endMessage ($numMessages total)
\n"; + echo "
". _("Viewing messages") ." $startMessage ". _("to") ." $endMessage ($numMessages " . _("total") . ")
\n"; echo "
"; + echo "
". _("Viewing message") ." $startMessage ($numMessages " . _("total") . ")
\n"; echo "
"; if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) { - echo "". _("Previous") ."\n"; + echo "". _("Previous") ." | \n"; echo "". _("Next") ."\n"; } else if (($nextGroup > $numMessages) && ($prevGroup >= 0)) { - echo "". _("Previous") ."\n"; - echo "Next\n"; + echo "". _("Previous") ." | \n"; + echo ""._("Next")."\n"; } else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) { - echo "Previous\n"; + echo ""._("Previous")." | \n"; echo "". _("Next") ."\n"; } echo "
"; echo "\n\n\n
"; - echo "\n"; + echo "
\n"; echo " \n"; - echo " "; echo "
\n"; + echo " \n"; echo " ". _("Move selected to:") .""; echo " "; echo " \n"; @@ -209,7 +255,7 @@ echo "
"; - echo ""; + echo "
"; echo ""; echo " "; /** FROM HEADER **/ @@ -232,6 +278,7 @@ echo " \n"; else echo " \n"; + echo " \n"; /** SUBJECT HEADER **/ echo " \n"; else echo " \n"; + echo ""; // 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 ""; + echo ""; } else if ($startMessage == $endMessage) { // if there's only one message in the box, handle it different. - $i = $startMessage - 1; + $i = $startMessage; reset($msort); do { $key = key($msort); next($msort); $k++; } while (isset ($key) && ($k < $i)); - printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage); + printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, 0, 0); } else { $i = $startMessage; reset($msort); @@ -266,7 +314,7 @@ } while (isset ($key) && ($k < $i)); do { - printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage); + printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, 0, 0); $key = key($msort); $t++; $i++; @@ -280,17 +328,19 @@ echo "
  ". _("Subject") ."\n"; if ($sort == 4) @@ -240,22 +287,23 @@ echo "

". _("THIS FOLDER IS EMPTY") ."
 

". _("THIS FOLDER IS EMPTY") ."
 
"; if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) { - echo "" . _("Previous") . "\n"; + echo "" . _("Previous") . " | \n"; echo "" . _("Next") . "\n"; } else if (($nextGroup > $numMessages) && ($prevGroup >= 0)) { - echo "" . _("Previous") . "\n"; + echo "" . _("Previous") . " | \n"; echo "" . _("Next") . "\n"; } else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) { - echo "Previous\n"; + echo "" . _("Previous"). " | \n"; echo "" . _("Next") . "\n"; } - echo "
"; /** End of message-list table */ + echo "
"; /** End of message-list table */ + + do_hook("mailbox_index_after"); } ?>