X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=3c4ae6f433bd16a7eb9834cf1edbcc9b3fad7310;hb=32b3d87eb50fd8a021cc5711aae022532a8cad12;hp=27ff6da271c38bdb479a87f118dfaca3176b62a8;hpb=aa4c3749e589871cd930b3cd2e94ccaeb5a71bc5;p=squirrelmail.git diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 27ff6da2..3c4ae6f4 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -1,4 +1,5 @@ \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"; - } - 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]"; } + + echo " \n"; + echo " $bold$flag$senderName$flag_end$bold_end\n"; + echo "
$bold$flag".$msg["DATE_STRING"]."$flag_end$bold_end
\n"; + echo " $bold$flag$subject$flag_end$ans$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) { - $j = 1; - while ($j <= $numMessages) { - $q = 0; - getMessageHeaders($imapConnection, $j, $from, $subject, $date); - getMessageFlags($imapConnection, $j, $flags); - - $messages[$j]["TIME_STAMP"] = getTimeStamp(explode(" ", trim($date))); - $messages[$j]["DATE_STRING"] = getDateString(explode(" ", trim($date))); - $messages[$j]["ID"] = $j; - $messages[$j]["FROM"] = $from; - $messages[$j]["SUBJECT"] = $subject; - $messages[$j]["FLAG_DELETED"] = false; - $messages[$j]["FLAG_ANSWERED"] = false; - $messages[$j]["FLAG_SEEN"] = false; - - while ($q < count($flags)) { - if ($flags[$q] == "Deleted") { + function showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color) { + include ("../config/config.php"); + global $PHPSESSID; + + if ($numMessages >= 1) { + for ($q = 0; $q < $numMessages; $q++) { + sqimap_get_small_header ($imapConnection, $q+1, $f, $s, $d); + $from[$q] = $f; + $date[$q] = $d; + $subject[$q] = $s; + $flags[$q] = sqimap_get_flags ($imapConnection, $q+1); + } + } + + $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]["SUBJECT"] = decodeHeader($subject[$j]); + + $num = 0; + while ($num < count($flags[$j])) { + if ($flags[$j][$num] == "Deleted") { $messages[$j]["FLAG_DELETED"] = true; } - else if ($flags[$q] == "Answered") { + else if ($flags[$j][$num] == "Answered") { $messages[$j]["FLAG_ANSWERED"] = true; } - else if ($flags[$q] == "Seen") { + else if ($flags[$j][$num] == "Seen") { $messages[$j]["FLAG_SEEN"] = true; } - $q++; + else if ($flags[$j][$num] == "Flagged") { + $messages[$j]["FLAG_FLAGGED"] = true; + } + $num++; } - $j++; } /** Find and remove the ones that are deleted */ - $i = 1; - $j = 1; - while ($j <= $numMessages) { + $i = 0; + $j = 0; + while ($j < $numMessages) { if ($messages[$j]["FLAG_DELETED"] == true) { $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"]; + $msgs[$i] = $messages[$j]; + $i++; $j++; } - $numMessagesOld = $numMessages; - $numMessages = $i - 1; + $numMessages = $i; - if ($sort == 0) - $msgs = ary_sort($msgs, "TIME_STAMP", -1); - else - $msgs = ary_sort($msgs, "TIME_STAMP", 1); + // There's gotta be messages in the array for it to sort them. + if ($numMessages > 0) { + /** 0 = Date (up) 4 = Subject (up) + ** 1 = Date (dn) 5 = Subject (dn) + ** 2 = Name (up) + ** 3 = Name (dn) + **/ + + 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 ($startMessage + 24 < $numMessages) { $endMessage = $startMessage + 24; @@ -103,71 +159,132 @@ /** This is the beginning of the message list table. It wraps around all messages */ echo ""; - echo "\n"; + if ($startMessage < $endMessage) { + echo "\n"; + } else if ($startMessage == $endMessage) { + echo "\"TD>"; + echo "
". _("Viewing message ") ."$startMessage ($numMessages ". _("total") .")
\n"; + echo "\n"; + } - echo "\n"; - /** The "DELETE" button */ - echo ""; - echo ""; + echo "
"; - echo "
Viewing messages $startMessage to $endMessage ($numMessages total)
\n"; - echo "
"; + echo "
". _("Viewing messages ") ."$startMessage". _(" to ") ."$endMessage ($numMessages total)
\n"; + echo "
"; + 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 "
"; - echo " selected messages"; + /** The delete and move options */ + echo "
"; + + echo "\n\n\n"; + echo "\n"; + echo " \n"; + echo " \n"; + echo " "; + echo " \n"; + + echo "
\n"; + echo " ". _("Move selected to:") .""; + echo " "; + echo " \n"; + + echo " \n"; + echo "  ". _("checked messages") ."\n"; + echo "
\n\n\n"; echo "
"; - echo ""; - echo ""; - echo " "; - echo " "; - echo " \n"; + echo "
NumFromDate"; + echo "
"; + echo ""; + echo ""; + echo " "; + /** FROM HEADER **/ + echo " \n"; + else if ($sort == 3) + echo " \n"; + else + echo " \n"; + /** DATE HEADER **/ + echo " \n"; + echo " \n"; + else if ($sort == 1) + echo " \n"; + else + echo " \n"; + /** SUBJECT HEADER **/ + echo " \n"; + else if ($sort == 5) + echo " \n"; else - echo " \n"; - echo " \n"; + echo " \n"; echo ""; + // loop through and display the info for each message. $t = 0; // $t is used for the checkbox number - 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"]); - $t++; + if ($numMessages == 0) { // if there's no messages in this folder + 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], $mailbox, $sort, $startMessage); + } else { + for ($i = $startMessage - 1;$i <= $endMessage - 1; $i++) { + printMessageInfo($imapConnection, $t, $msgs[$i], $mailbox, $sort, $startMessage); + $t++; + } } - echo "
 ". _("From") .""; + if ($sort == 2) + echo " ". _("Date") .""; if ($sort == 0) - echo " ". _("Subject") ."\n"; + if ($sort == 4) + echo " Subject

". _("THIS FOLDER IS EMPTY") ."
 
\n"; - echo "
"; - /** The "DELETE" button */ - echo "
"; - echo "
"; - echo " selected messages"; - echo "
\n"; + echo "\n"; - echo ""; + 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 */ }