X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=f19f1f50089faf34a0e88cb89f1f0dc7c594d841;hp=9339e3db341d1e4a30736ae4b5c548b751c642d5;hb=e452ce9b159ee616915c2ca809a6da3f97b2c60b;hpb=9c83f905fef00de60528b7efcfc4dd3b7c4fa4ee diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 9339e3db..f19f1f50 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -10,9 +10,9 @@ $mailbox_info = true; - function printMessageInfo($imapConnection, $t, $msg, $mailbox, $sort, $startMessage) { - //require ("../config/config.php"); - global $color; + function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage) { + global $color, $msgs, $msort; + $msg = $msgs[$key]; $senderName = $msg["FROM"]; $urlMailbox = urlencode($mailbox); @@ -23,10 +23,10 @@ if ($msg["FLAG_SEEN"] == false) { $bold = ""; $bold_end = ""; } if ($msg["FLAG_ANSWERED"] == true) { $ans = " [A]"; } - echo " \n"; + 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 " $bold$flag$subject$flag_end$ans$bold_end\n"; echo "\n"; } @@ -34,132 +34,106 @@ /** ** This function loops through a group of messages in the mailbox and shows them **/ - function showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color,$show_num) { + function showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color,$show_num, $use_cache) { + global $msgs, $msort; include ("../config/config.php"); - 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; + if (!$use_cache) { + 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); } - 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; + } + + $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[$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++; } - $num++; + $j++; } - $j++; - } - - /** Find and remove the ones that are deleted */ - $i = 0; - $j = 0; - while ($j < $numMessages) { - if ($messages[$j]["FLAG_DELETED"] == true) { + + /** 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++; - continue; } - $msgs[$i] = $messages[$j]; - - $i++; - $j++; - } - - $numMessages = $i; + $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) **/ - 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 == 0) || ($sort == 1)) + $msort = array_cleave ($msgs, "TIME_STAMP"); + if (($sort == 2) || ($sort == 3)) + $msort = array_cleave ($msgs, "FROM"); + if (($sort == 4) || ($sort == 5)) + $msort = array_cleave ($msgs, "SUBJECT"); + + if(($sort % 2) == 1) { + asort($msort); + } else { + arsort($msort); } + session_register("msort"); } - -// session_register("messages"); -// $messages = serialize($msgs); - - displayMessageArray($imapConnection, $numMessages, $startMessage, $msgs, $mailbox, $sort, $color,$show_num); + displayMessageArray($imapConnection, $numMessages, $startMessage, $msgs, $msort, $mailbox, $sort, $color,$show_num); } // generic function to convert the msgs array into an HTML table - function displayMessageArray($imapConnection, $numMessages, $startMessage, $msgs, $mailbox, $sort, $color,$show_num) { + function displayMessageArray($imapConnection, $numMessages, $startMessage, &$msgs, $msort, $mailbox, $sort, $color,$show_num) { + global $folder_prefix; + // 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("messages")) -// session_register("messages"); + 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 { @@ -185,23 +159,23 @@ 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 "". _("Previous") ."\n"; echo "Next\n"; } else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) { echo "Previous\n"; - echo "". _("Next") ."\n"; + echo "". _("Next") ."\n"; } echo "\n"; /** The delete and move options */ echo ""; - echo "\n\n\n
"; + echo "\n\n\n"; echo "\n"; echo " \n"; 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"; /** SUBJECT HEADER **/ echo " \n"; + echo " \n"; else if ($sort == 5) - echo " \n"; + echo " \n"; else - echo " \n"; + echo " \n"; echo ""; @@ -275,12 +237,29 @@ 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); + reset($msort); + do { + $key = key($msort); + next($msort); + $k++; + } while (isset ($key) && ($k < $i)); + printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage); } else { - for ($i = $startMessage - 1;$i <= $endMessage - 1; $i++) { - printMessageInfo($imapConnection, $t, $msgs[$i], $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); + $key = key($msort); $t++; - } + $i++; + next($msort); + } while ($i < ($endMessage+1)); } echo "
\n"; @@ -210,21 +184,9 @@ $boxes = sqimap_mailbox_list($imapConnection); for ($i = 0; $i < count($boxes); $i++) { - $use_folder = true; - for ($p = 0; $p < count($special_folders); $p++) { - if ($boxes[$i]["unformatted"] == $special_folders[0]) { - $use_folder = true; - } else if ($boxes[$i]["unformatted"] == $special_folders[$p]) { - $use_folder = false; - } else if (substr($boxes[$i]["unformatted"], 0, strlen($trash_folder)) == $trash_folder) { - $use_folder = false; - } - } - if ($use_folder == true) { - $box = $boxes[$i]["unformatted"]; - $box2 = replace_spaces($boxes[$i]["formatted"]); - echo " ". _("From") .""; if ($sort == 2) - echo " ". _("Date") .""; if ($sort == 0) - echo " ". _("Subject") ."\n"; if ($sort == 4) - echo "

". _("THIS FOLDER IS EMPTY") ."
 
"; @@ -289,16 +268,16 @@ 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 "" . _("Previous") . "\n"; echo "" . _("Next") . "\n"; } else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) { echo "Previous\n"; - echo "" . _("Next") . "\n"; + echo "" . _("Next") . "\n"; } echo ""; /** End of message-list table */ }