\n";
-
+
if ($msg["FLAG_FLAGGED"] == true) { $flag = ""; $flag_end = ""; }
if ($msg["FLAG_SEEN"] == false) { $bold = ""; $bold_end = ""; }
- if ($mailbox == $sent_folder) { $italic = ""; $italic_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") {
@@ -40,10 +41,10 @@
} 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];
@@ -51,6 +52,11 @@
$search_stuff = "&where=".urlencode($where)."&what=".urlencode($what);
}
+ if ($checkall == 1)
+ $checked = " checked";
+ else
+ $checked = "";
+
for ($i=1; $i <= count($index_order); $i++) {
switch ($index_order[$i]) {
case 1: # checkbox
@@ -67,23 +73,28 @@
break;
case 5: # flags
$stuff = false;
- echo " \n";
+ echo " | \n";
if ($msg["FLAG_ANSWERED"] == true) {
echo "A\n";
$stuff = true;
- }
+ }
if ($msg["TYPE0"] == "multipart") {
echo "+\n";
$stuff = true;
- }
+ }
if (ereg("(1|2)",substr($msg["PRIORITY"],0,1))) {
echo "!\n";
$stuff = true;
}
+ if ($msg["FLAG_DELETED"]) {
+ echo "D\n";
+ $stuff = true;
+ }
+
if (!$stuff) echo " \n";
echo " | \n";
break;
- case 6: # size
+ case 6: # size
echo " $bold".show_readable_size($msg['SIZE'])."$bold_end | \n";
break;
}
@@ -98,99 +109,150 @@
**/
function showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color,$show_num, $use_cache) {
global $msgs, $msort;
- global $sent_folder;
+ global $sent_folder;
global $message_highlight_list;
global $auto_expunge;
- if ($auto_expunge) {
- sqimap_mailbox_expunge($imapConnection, $mailbox);
- sqimap_mailbox_select($imapConnection, $mailbox);
- }
+ if ($auto_expunge == true) sqimap_mailbox_expunge($imapConnection, $mailbox, false);
+ sqimap_mailbox_select($imapConnection, $mailbox);
if (!$use_cache) {
+ // if it's sorted
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;
- $size[$q] = $hdr->size;
- $type[$q] = $hdr->type0;
-
- $flags[$q] = sqimap_get_flags ($imapConnection, $q+1);
+ if ($sort < 6) {
+ 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;
+ $size[$q] = $hdr->size;
+ $type[$q] = $hdr->type0;
+ $flags[$q] = sqimap_get_flags ($imapConnection, $q+1);
+ $id[$q] = $q + 1;
+ }
+ } else {
+ // if it's not sorted
+ 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;
+ }
+
+
+ $real_startMessage = $numMessages - $startMessage + 1;
+ $real_endMessage = $numMessages - $startMessage - $show_num;
+ if ($real_endMessage <= 0)
+ $real_endMessage = 1;
+
+ $j = 0;
+ for ($q = $real_startMessage; $q >= $real_endMessage; $q--) {
+ if($mailbox == $sent_folder)
+ $hdr = sqimap_get_small_header ($imapConnection, $q, true);
+ else
+ $hdr = sqimap_get_small_header ($imapConnection, $q, false);
+
+ $from[$j] = $hdr->from;
+ $date[$j] = $hdr->date;
+ $subject[$j] = $hdr->subject;
+ $to[$j] = $hdr->to;
+ $priority[$j] = $hdr->priority;
+ $cc[$j] = $hdr->cc;
+ $size[$j] = $hdr->size;
+ $type[$j] = $hdr->type0;
+ $flags[$j] = sqimap_get_flags ($imapConnection, $q);
+ $id[$j] = $q;
+ $j++;
+ }
}
}
-
+
$j = 0;
- while ($j < $numMessages) {
+ if ($sort == 6) {
+ $end = $startMessage + $show_num - 1;
+ } else {
+ $end = $numMessages;
+ }
+ while ($j < $end) {
$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]["ID"] = $id[$j];
$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]["PRIORITY"] = $priority[$j];
$messages[$j]["CC"] = $cc[$j];
$messages[$j]["SIZE"] = $size[$j];
$messages[$j]["TYPE0"] = $type[$j];
# fix SUBJECT-SORT to remove Re:
- $re_abbr = # Add more here!
- "vedr|sv|" . # Danish
- "re|aw"; # English
- if (eregi("^($re_abbr):[ ]*(.*)$",
- $messages[$j]['SUBJECT-SORT'], $regs))
- $messages[$j]['SUBJECT-SORT'] = $regs[2];
-
+ $re_abbr = # Add more here!
+ "vedr|sv|" . # Danish
+ "re|aw"; # English
+ if (eregi("^($re_abbr):[ ]*(.*)$", $messages[$j]['SUBJECT-SORT'], $regs))
+ $messages[$j]['SUBJECT-SORT'] = $regs[2];
+
$num = 0;
while ($num < count($flags[$j])) {
if ($flags[$j][$num] == "Deleted") {
$messages[$j]["FLAG_DELETED"] = true;
}
- else if ($flags[$j][$num] == "Answered") {
+ elseif ($flags[$j][$num] == "Answered") {
$messages[$j]["FLAG_ANSWERED"] = true;
}
- else if ($flags[$j][$num] == "Seen") {
+ elseif ($flags[$j][$num] == "Seen") {
$messages[$j]["FLAG_SEEN"] = true;
}
- else if ($flags[$j][$num] == "Flagged") {
+ elseif ($flags[$j][$num] == "Flagged") {
$messages[$j]["FLAG_FLAGGED"] = true;
}
$num++;
}
$j++;
}
-
- /** Find and remove the ones that are deleted */
- $i = 0;
- $j = 0;
- while ($j < $numMessages) {
- if ($messages[$j]["FLAG_DELETED"] == true) {
+
+ /* Only ignore messages flagged as deleted if we are using a
+ * trash folder or auto_expunge */
+ if (($move_to_trash || $auto_expunge) && $sort != 6)
+ {
+ /** 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;
+ } else {
+ $msgs = $messages;
}
- $numMessages = $i;
}
// There's gotta be messages in the array for it to sort them.
- if (($numMessages > 0) && (!$use_cache)) {
+ if ($numMessages > 0 && ! $use_cache) {
/** 0 = Date (up) 4 = Subject (up)
** 1 = Date (dn) 5 = Subject (dn)
** 2 = Name (up)
@@ -203,11 +265,15 @@
$msort = array_cleave ($msgs, "FROM-SORT");
if (($sort == 4) || ($sort == 5))
$msort = array_cleave ($msgs, "SUBJECT-SORT");
-
- if(($sort % 2) == 1) {
- asort($msort);
- } else {
- arsort($msort);
+ if ($sort == 6)
+ $msort = $msgs;
+
+ if ($sort < 6) {
+ if($sort % 2) {
+ asort($msort);
+ } else {
+ arsort($msort);
+ }
}
session_register("msort");
}
@@ -218,28 +284,27 @@
// 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;
- global $index_order;
-
+ global $imapServerAddress;
+ global $index_order, $real_endMessage, $real_startMessage;
+
// 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);
@@ -249,45 +314,67 @@
$Message = '';
if ($startMessage < $endMessage) {
$Message = _("Viewing messages") ." $startMessage ". _("to") ." $endMessage ($numMessages " . _("total") . ")\n";
- } else if ($startMessage == $endMessage) {
+ } elseif ($startMessage == $endMessage) {
$Message = _("Viewing message") ." $startMessage ($numMessages " . _("total") . ")\n";
}
$More = '';
+ if ($sort == 6) {
+ $use = 0;
+ } else {
+ $use = 1;
+ }
if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) {
- $More = "". _("Previous") ." | \n";
- $More .= "". _("Next") ."\n";
+ $More = "". _("Previous") ." | \n";
+ $More .= "". _("Next") ."\n";
}
- else if (($nextGroup > $numMessages) && ($prevGroup >= 0)) {
- $More = "". _("Previous") ." | \n";
+ elseif (($nextGroup > $numMessages) && ($prevGroup >= 0)) {
+ $More = "". _("Previous") ." | \n";
$More .= ""._("Next")."\n";
}
- else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) {
+ elseif (($nextGroup <= $numMessages) && ($prevGroup < 0)) {
$More = ""._("Previous")." | \n";
- $More .= "". _("Next") ."\n";
+ $More .= "". _("Next") ."\n";
}
- mail_message_listing_beginning($imapConnection,
+ mail_message_listing_beginning($imapConnection,
"move_messages.php?msg=$msg&mailbox=$urlMailbox&startMessage=$startMessage",
- $mailbox, $sort, $Message, $More);
+ $mailbox, $sort, $Message, $More, $startMessage);
+
+ $groupNum = $startMessage % ($show_num - 1);
+ $real_startMessage = $startMessage;
+ if ($sort == 6) {
+ if ($endMessage - $startMessage < $show_num - 1) {
+ $endMessage = $endMessage - $startMessage + 1;
+ $startMessage = 1;
+ } else if ($startMessage > $show_num) {
+ $endMessage = $show_num;
+ $startMessage = 1;
+ }
+ }
+
+ $endVar = $endMessage + 1;
-
// 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 "
". _("THIS FOLDER IS EMPTY") ."
| ";
} else if ($startMessage == $endMessage) { // if there's only one message in the box, handle it different.
- $i = $startMessage;
+ if ($sort != 6)
+ $i = $startMessage;
+ else
+ $i = 1;
reset($msort);
do {
$key = key($msort);
next($msort);
$k++;
} while (isset ($key) && ($k < $i));
- printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, 0, 0);
+ printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $real_startMessage, 0, 0);
} else {
$i = $startMessage;
+
reset($msort);
do {
$key = key($msort);
@@ -295,22 +382,29 @@
$k++;
} while (isset ($key) && ($k < $i));
- do {
- printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, 0, 0);
+ do {
+ printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $real_startMessage, 0, 0);
$key = key($msort);
$t++;
$i++;
next($msort);
- } while ($i < ($endMessage+1));
+ } while ($i && $i < $endVar);
}
echo "";
echo " |
\n";
- if ($More)
- {
- echo "![](\"../images/up_pointer.gif\")
![](\"../images/down_pointer.gif\")
![](\"../images/sort_none.gif\")