X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=6e49080e507db048b28c21d02fc0b1b12d18eac0;hp=84025faa479aaa0d32904a7883f0e0d27acb24cc;hb=31f3d7c03a7c155d48a955b4beb15105ba154086;hpb=3e054c439cee79e856555fba92166173a197388d diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 84025faa..6e49080e 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -8,22 +8,20 @@ ** **/ - function printMessageInfo($imapConnection, $t, $i, $from, $subject, $dateString, $answered, $seen) { + function printMessageInfo($imapConnection, $t, $i, $from, $subject, $dateString, $answered, $seen, $mailbox, $sort, $startMessage) { $senderName = getSenderName($from); - if (strlen(Chop($subject)) == 0) - $subject = "(no subject)"; - + $urlMailbox = urlencode($mailbox); echo "\n"; if ($seen == false) { echo " \n"; echo " $senderName\n"; echo "
$dateString
\n"; - echo " $subject\n"; + echo " $subject\n"; } else { echo " \n"; echo " $senderName\n"; echo "
$dateString
\n"; - echo " $subject\n"; + echo " $subject\n"; } echo "\n"; } @@ -40,10 +38,14 @@ $j = 0; while ($j < $numMessages) { - $messages[$j]["TIME_STAMP"] = getTimeStamp(explode(" ", trim($date[$j]))); - $messages[$j]["DATE_STRING"] = getDateString(explode(" ", trim($date[$j]))); +// echo "$numMessages -- $j -- $subject[$j]
"; + $date[$j] = ereg_replace(" ", " ", $date[$j]); + $tmpdate = explode(" ", trim($date[$j])); + + $messages[$j]["TIME_STAMP"] = getTimeStamp($tmpdate); + $messages[$j]["DATE_STRING"] = getDateString($tmpdate); $messages[$j]["ID"] = $j+1; - $messages[$j]["FROM"] = $from[$j]; + $messages[$j]["FROM"] = getSenderName($from[$j]); $messages[$j]["SUBJECT"] = $subject[$j]; $messages[$j]["FLAG_DELETED"] = false; $messages[$j]["FLAG_ANSWERED"] = false; @@ -82,6 +84,7 @@ $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++; } @@ -90,12 +93,59 @@ // 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 + 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; + while ($j < count($original)) { + if ($msgs[$i]["ID"] == $original[$j]["ID"]) { + $msgs[$i]["FROM"] = $original[$j]["FROM"]; + $msgs[$i]["SUBJECT"] = $original[$j]["SUBJECT"]; + } + $j++; + } + $i++; + } + } } +// $j = 0; +// while ($j < $numMessages) { +// $sub = $msgs[$j]["SUBJECT"]; +// $id = $msgs[$j]["ID"]; +// echo "$id -- $sub
"; +// $j++; +// } +//exit; + if ($startMessage + 24 < $numMessages) { $endMessage = $startMessage + 24; } else { @@ -106,12 +156,19 @@ $prevGroup = $startMessage - 25; $urlMailbox = urlencode($mailbox); + /** 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 "\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 "
Viewing message $startMessage ($numMessages total)
\n"; + echo "
"; if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) { @@ -128,25 +185,70 @@ } echo "
"; - echo "
"; - echo ""; + /** The delete and move options */ + echo "
"; + + echo "\n\n\n"; + echo "\n"; + echo " \n"; + echo " \n"; + echo " "; + echo " \n"; + if (($move_to_trash == true) && ($mailbox == $trash_folder)) - echo "            Empty Trash"; + echo ""; + echo "
\n"; + echo " \n"; + echo " \n"; + + echo " \n"; + echo "  checked messages\n"; + echo "
            Empty Trash
\n\n\n"; echo "
"; + echo "
"; echo ""; echo ""; echo " "; - echo " "; + /** FROM HEADER **/ + echo " \n"; + else if ($sort == 3) + echo " \n"; + else + echo " \n"; + /** DATE HEADER **/ echo " \n"; - else + else if ($sort == 1) echo " \n"; - echo " \n"; + else + echo " \n"; + /** SUBJECT HEADER **/ + echo " \n"; + else if ($sort == 5) + echo " \n"; + else + echo " \n"; echo ""; // loop through and display the info for each message. @@ -155,23 +257,16 @@ 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"]); + 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); } 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"]); + 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); $t++; } } - echo "
NumFromFrom"; + if ($sort == 2) + echo " Date"; if ($sort == 0) echo " SubjectSubject\n"; + if ($sort == 4) + echo "

THIS FOLDER IS EMPTY
 
"; - - /** The "DELETE" button */ - echo "
"; - echo ""; - if (($move_to_trash == true) && ($mailbox == $trash_folder)) - echo "            Empty Trash"; - echo "
"; - echo "\n"; + echo "\n"; echo "\n"; echo "";