X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=14cf003f87c81f49e44ded73c85149bd345275b1;hp=a4ed4b0fcd8c85993c77bae066575fa9539cafdd;hb=8fca0a655858da407d32d6d165c326a1c8738f73;hpb=5e90d34a2e2d4dee490f7b50796bf0d4f75a8d1a diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index a4ed4b0f..14cf003f 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -1,4 +1,4 @@ -\n"; - if ($seen == false) { - echo " \n"; - echo " $senderName\n"; - echo "
$dateString
\n"; - echo " $subject\n"; - } else { - echo " \n"; - echo " $senderName\n"; - echo "
$dateString
\n"; - echo " $subject\n"; + + if ($msg["FLAG_FLAGGED"] == true) { $flag = ""; $flag_end = ""; } + if ($msg["FLAG_SEEN"] == false) { $bold = ""; $bold_end = ""; } + if ($mailbox == $sent_folder) { $italic = ""; $italic_end = ""; } + + 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"]), 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"])]),strtolower($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 " \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\n"; + elseif (ereg("(1|2)",substr($msg["PRIORITY"],0,1))) echo " !\n"; + else echo "  \n"; + echo " $bold$flag$subject$flag_end$bold_end\n"; + + echo "\n"; } /** ** This function loops through a group of messages in the mailbox and shows them **/ - function showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color) { - include ("../config/config.php"); + function showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color,$show_num, $use_cache) { + global $msgs, $msort; + global $sent_folder; + global $message_highlight_list; + global $auto_expunge; - if (1 <= $numMessages) { - getMessageHeaders($imapConnection, 1, $numMessages, $from, $subject, $date); - getMessageFlags($imapConnection, 1, $numMessages, $flags); + if ($auto_expunge) { + sqimap_mailbox_expunge($imapConnection, $mailbox); + sqimap_mailbox_select($imapConnection, $mailbox); } - $j = 0; - while ($j < $numMessages) { - $date[$j] = ereg_replace(" ", " ", $date[$j]); - $tmpdate = explode(" ", trim($date[$j])); - - $messages[$j]["TIME_STAMP"] = getTimeStamp($tmpdate); - $messages[$j]["DATE_STRING"] = getDateString($messages[$j]["TIME_STAMP"]); - $messages[$j]["ID"] = $j+1; - $messages[$j]["FROM"] = getSenderName($from[$j]); - $messages[$j]["SUBJECT"] = $subject[$j]; - $messages[$j]["FLAG_DELETED"] = false; - $messages[$j]["FLAG_ANSWERED"] = false; - $messages[$j]["FLAG_SEEN"] = false; - - $num = 0; - while ($num < count($flags[$j])) { - if ($flags[$j][$num] == "Deleted") { - $messages[$j]["FLAG_DELETED"] = true; - } - else if ($flags[$j][$num] == "Answered") { - $messages[$j]["FLAG_ANSWERED"] = true; - } - else if ($flags[$j][$num] == "Seen") { - $messages[$j]["FLAG_SEEN"] = true; + if (!$use_cache) { + if ($numMessages >= 1) { + for ($q = 0; $q < $numMessages; $q++) { + 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; + $priority[$q] = $hdr->priority; + $cc[$q] = $hdr->cc; + + $flags[$q] = sqimap_get_flags ($imapConnection, $q+1); } - $num++; } - $j++; - } + + $j = 0; + while ($j < $numMessages) { + $date[$j] = ereg_replace(" ", " ", $date[$j]); + $tmpdate = explode(" ", trim($date[$j])); + + $messages[$j]["TIME_STAMP"] = getTimeStamp($tmpdate); + $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]; - /** Find and remove the ones that are deleted */ - $i = 0; - $j = 0; - while ($j < $numMessages) { - if ($messages[$j]["FLAG_DELETED"] == true) { + # 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])) { + if ($flags[$j][$num] == "Deleted") { + $messages[$j]["FLAG_DELETED"] = true; + } + else if ($flags[$j][$num] == "Answered") { + $messages[$j]["FLAG_ANSWERED"] = true; + } + else if ($flags[$j][$num] == "Seen") { + $messages[$j]["FLAG_SEEN"] = true; + } + else if ($flags[$j][$num] == "Flagged") { + $messages[$j]["FLAG_FLAGGED"] = true; + } + $num++; + } $j++; - continue; } - $msgs[$i]["TIME_STAMP"] = $messages[$j]["TIME_STAMP"]; - $msgs[$i]["DATE_STRING"] = $messages[$j]["DATE_STRING"]; - $msgs[$i]["ID"] = $messages[$j]["ID"]; - $msgs[$i]["FROM"] = $messages[$j]["FROM"]; - $msgs[$i]["SUBJECT"] = $messages[$j]["SUBJECT"]; - $msgs[$i]["FLAG_DELETED"] = $messages[$j]["FLAG_DELETED"]; - $msgs[$i]["FLAG_ANSWERED"] = $messages[$j]["FLAG_ANSWERED"]; - $msgs[$i]["FLAG_SEEN"] = $messages[$j]["FLAG_SEEN"]; - - $i++; - $j++; - } - - $numMessages = $i; + + /** Find and remove the ones that are deleted */ + $i = 0; + $j = 0; + while ($j < $numMessages) { + if ($messages[$j]["FLAG_DELETED"] == true) { + $j++; + continue; + } + $msgs[$i] = $messages[$j]; + + $i++; + $j++; + } + $numMessages = $i; + } // There's gotta be messages in the array for it to sort them. - if ($numMessages > 0) { + if (($numMessages > 0) && (!$use_cache)) { /** 0 = Date (up) 4 = Subject (up) ** 1 = Date (dn) 5 = Subject (dn) ** 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-SORT"); + if (($sort == 4) || ($sort == 5)) + $msort = array_cleave ($msgs, "SUBJECT-SORT"); - if ($sort == 0) - $msgs = ary_sort($msgs, "TIME_STAMP", -1); - else if ($sort == 1) - $msgs = ary_sort($msgs, "TIME_STAMP", 1); - else { - - $original = $msgs; - $i = 0; - while ($i < count($msgs)) { - $msgs[$i]["FROM"] = strtolower($msgs[$i]["FROM"]); - $msgs[$i]["SUBJECT"] = strtolower($msgs[$i]["SUBJECT"]); - $i++; - } - - if ($sort == 2) - $msgs = ary_sort($msgs, "FROM", -1); - else if ($sort == 3) - $msgs = ary_sort($msgs, "FROM", 1); - else if ($sort == 4) - $msgs = ary_sort($msgs, "SUBJECT", -1); - else if ($sort == 5) - $msgs = ary_sort($msgs, "SUBJECT", 1); - else - $msgs = ary_sort($msgs, "TIME_STAMP", -1); - - $i = 0; - while ($i < count($msgs)) { - $j = 0; - $loop = true; - while ($j < count($original)) { - if ($msgs[$i]["ID"] == $original[$j]["ID"]) { - $msgs[$i]["FROM"] = $original[$j]["FROM"]; - $msgs[$i]["SUBJECT"] = $original[$j]["SUBJECT"]; - - // exit out of this loop if we find the thing. - $j = count($original) + 1; - } - $j++; - } - $i++; - } + if(($sort % 2) == 1) { + asort($msort); + } else { + arsort($msort); } + 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 + function displayMessageArray($imapConnection, $numMessages, $startMessage, &$msgs, $msort, $mailbox, $sort, $color,$show_num) { + global $folder_prefix, $sent_folder; + global $imapServerAddress; + + // 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 + 24 < $numMessages) { - $endMessage = $startMessage + 24; + + if ($startMessage + ($show_num - 1) < $numMessages) { + $endMessage = $startMessage + ($show_num-1); } else { $endMessage = $numMessages; } - - $nextGroup = $startMessage + 25; - $prevGroup = $startMessage - 25; + + 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"; /** The delete and move options */ 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 "". _("Next") ."\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 "". _("Next") ."\n"; + echo ""._("Previous")." | \n"; + echo "". _("Next") ."\n"; } echo "
"; - echo "\n\n\n
"; - echo "\n"; + echo "\n\n\n"; + do_hook("mailbox_form_before"); + echo "
\n"; echo " \n"; - echo " \n"; echo " "; echo " \n"; @@ -223,47 +266,71 @@ echo ""; echo "
\n"; - echo " ". _("Move selected to:") .""; + echo " \n"; + echo " ". _("Move selected to:") .""; echo " "; - echo " \n"; + echo " \n"; echo " \n"; - echo "  ". _("checked messages") ."\n"; + echo "  ". _("checked messages") ."\n"; echo "
"; - echo ""; + echo "
"; echo ""; - echo " "; + echo " "; /** FROM HEADER **/ - echo " \n"; + echo " \n"; else if ($sort == 3) - echo " \n"; + echo " \n"; else - echo " \n"; + echo " \n"; /** DATE HEADER **/ - echo " \n"; + echo " \n"; else if ($sort == 1) - echo " \n"; + echo " \n"; else - echo " \n"; + echo " \n"; + echo " \n"; /** SUBJECT HEADER **/ - echo " \n"; + echo " \n"; else if ($sort == 5) - echo " \n"; + echo " \n"; else - echo " \n"; + 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; - printMessageInfo($imapConnection, $t, $msgs[$i]["ID"], $msgs[$i]["FROM"], $msgs[$i]["SUBJECT"], $msgs[$i]["DATE_STRING"], $msgs[$i]["FLAG_ANSWERED"], $msgs[$i]["FLAG_SEEN"], $mailbox, $sort, $startMessage); + $i = $startMessage; + reset($msort); + do { + $key = key($msort); + next($msort); + $k++; + } while (isset ($key) && ($k < $i)); + printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, 0, 0); } else { - for ($i = $startMessage - 1;$i <= $endMessage - 1; $i++) { - printMessageInfo($imapConnection, $t, $msgs[$i]["ID"], $msgs[$i]["FROM"], $msgs[$i]["SUBJECT"], $msgs[$i]["DATE_STRING"], $msgs[$i]["FLAG_ANSWERED"], $msgs[$i]["FLAG_SEEN"], $mailbox, $sort, $startMessage); + $i = $startMessage; + reset($msort); + do { + $key = key($msort); + next($msort); + $k++; + } while (isset ($key) && ($k < $i)); + + do { + printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, 0, 0); + $key = key($msort); $t++; - } + $i++; + next($msort); + } while ($i < ($endMessage+1)); } echo "
  ". _("From") .""; + if ($mailbox == $sent_folder) + echo " ". _("To") .""; + else + echo " ". _("From") .""; + if ($sort == 2) - echo " ". _("Date") .""; + echo " ". _("Date") .""; if ($sort == 0) - echo "  ". _("Subject") ."\n"; + echo " ". _("Subject") ."\n"; if ($sort == 4) - echo "

THIS FOLDER IS EMPTY
 

". _("THIS FOLDER IS EMPTY") ."
 
"; @@ -272,17 +339,19 @@ echo "
"; 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 "" . _("Next") . "\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"; } - echo "
"; /** End of message-list table */ + echo "
"; /** End of message-list table */ + + do_hook("mailbox_index_after"); } ?>