X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=62ad7181a5b3b7754034a887f89034f19d34b013;hb=367e4f70490865d893981c68dc3931b379d24f09;hp=2decafb70b570f67c47aa5340a052ba0b28049e8;hpb=cbdc56211e121e2676782da26828959da364ec52;p=squirrelmail.git
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 2decafb7..62ad7181 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -6,30 +6,148 @@
** This contains functions that display mailbox information, such as the
** table row that has sender, date, subject, etc...
**
+ ** $Id$
**/
- $mailbox_info = true;
+ $mailbox_display_php = true;
- function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage) {
+ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, $where, $what) {
+ global $checkall;
global $color, $msgs, $msort;
- global $sent_folder;
+ global $sent_folder;
+ global $message_highlight_list;
+ global $index_order;
- $msg = $msgs[$key];
+ $msg = $msgs[$key];
- $senderName = $msg["FROM"];
+ $senderName = sqimap_find_displayable_name($msg['FROM']);
$urlMailbox = urlencode($mailbox);
- $subject = trim(stripslashes($msg["SUBJECT"]));
+ $subject = trim($msg['SUBJECT']);
+ if ($subject == '')
+ $subject = _("(no subject)");
+
echo "
\n";
+
+ if (isset($msg['FLAG_FLAGGED']) && $msg['FLAG_FLAGGED'] == true)
+ {
+ $flag = "";
+ $flag_end = ' ';
+ }
+ else
+ {
+ $flag = '';
+ $flag_end = '';
+ }
+ if (!isset($msg['FLAG_SEEN']) || $msg['FLAG_SEEN'] == false)
+ {
+ $bold = '';
+ $bold_end = ' ';
+ }
+ else
+ {
+ $bold = '';
+ $bold_end = '';
+ }
+ if ($mailbox == $sent_folder)
+ {
+ $italic = '';
+ $italic_end = ' ';
+ }
+ else
+ {
+ $italic = '';
+ $italic_end = '';
+ }
+ if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED'])
+ {
+ $fontstr = "";
+ $fontstr_end = ' ';
+ }
+ else
+ {
+ $fontstr = '';
+ $fontstr_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 (!isset($hlt_color))
+ $hlt_color = $color[4];
+
+ if ($where && $what) {
+ $search_stuff = '&where='.urlencode($where).'&what='.urlencode($what);
+ }
+
+ if ($checkall == 1)
+ $checked = ' checked';
+ else
+ $checked = '';
- if ($msg["FLAG_FLAGGED"] == true) { $flag = ""; $flag_end = " "; }
- if ($msg["FLAG_SEEN"] == false) { $bold = ""; $bold_end = " "; }
- if ($msg["FLAG_ANSWERED"] == true) { $ans = " [A]"; }
- if ($mailbox == $sent_folder) { $italic = ""; $italic_end = " "; }
-
- 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";
- echo " $bold$flag$subject$flag_end $ans$bold_end \n";
+ for ($i=1; $i <= count($index_order); $i++) {
+ switch ($index_order[$i]) {
+ case 1: # checkbox
+ echo " \n";
+ break;
+ case 2: # from
+ echo " $italic$bold$flag$fontstr$senderName$fontstr_end$flag_end$bold_end$italic_end \n";
+ break;
+ case 3: # date
+ echo " $bold$flag$fontstr".$msg["DATE_STRING"]."$fontstr_end$flag_end$bold_end \n";
+ break;
+ case 4: # subject
+ echo " $bold";
+ if (! isset($search_stuff)) { $search_stuff = ''; }
+ echo "$flag";
+ if (strlen($subject) > 55)
+ echo substr($subject, 0, 50) . '...';
+ else
+ echo $subject;
+ echo "$flag_end $bold_end \n";
+ break;
+ case 5: # flags
+ $stuff = false;
+ echo " \n";
+ if (isset($msg['FLAG_ANSWERED']) &&
+ $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 (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) {
+ echo "D \n";
+ $stuff = true;
+ }
+
+ if (!$stuff) echo " \n";
+ echo " \n";
+ break;
+ case 6: # size
+ echo " $bold$fontstr".show_readable_size($msg['SIZE'])."$fontstr_end$bold_end \n";
+ break;
+ }
+ }
+
echo " \n";
}
@@ -39,108 +157,193 @@
**/
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 == 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)
- sqimap_get_small_header ($imapConnection, $q+1, $f, $s, $d, true);
- else
- sqimap_get_small_header ($imapConnection, $q+1, $f, $s, $d, false);
-
- $from[$q] = $f;
- $date[$q] = $d;
- $subject[$q] = $s;
- $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) {
- $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]);
-
+ if ($sort == 6) {
+ $end = $startMessage + $show_num - 1;
+ } else {
+ $end = $numMessages;
+ }
+ if ($end > $numMessages) $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'] = $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]['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];
+
$num = 0;
while ($num < count($flags[$j])) {
- if ($flags[$j][$num] == "Deleted") {
- $messages[$j]["FLAG_DELETED"] = true;
+ if ($flags[$j][$num] == 'Deleted') {
+ $messages[$j]['FLAG_DELETED'] = true;
}
- else if ($flags[$j][$num] == "Answered") {
- $messages[$j]["FLAG_ANSWERED"] = true;
+ elseif ($flags[$j][$num] == 'Answered') {
+ $messages[$j]['FLAG_ANSWERED'] = true;
}
- else if ($flags[$j][$num] == "Seen") {
- $messages[$j]["FLAG_SEEN"] = true;
+ elseif ($flags[$j][$num] == 'Seen') {
+ $messages[$j]['FLAG_SEEN'] = true;
}
- else if ($flags[$j][$num] == "Flagged") {
- $messages[$j]["FLAG_FLAGGED"] = true;
+ 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 (((isset($move_to_trash) && $move_to_trash)
+ || (isset($auto_expunge) && $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 {
+ if (! isset($messages))
+ $messages = array();
+ $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)
** 3 = Name (dn)
**/
-
+ session_unregister("msgs");
if (($sort == 0) || ($sort == 1))
- $msort = array_cleave ($msgs, "TIME_STAMP");
+ $msort = array_cleave ($msgs, 'TIME_STAMP');
if (($sort == 2) || ($sort == 3))
- $msort = array_cleave ($msgs, "FROM");
+ $msort = array_cleave ($msgs, 'FROM-SORT');
if (($sort == 4) || ($sort == 5))
- $msort = array_cleave ($msgs, "SUBJECT");
+ $msort = array_cleave ($msgs, 'SUBJECT-SORT');
+ if ($sort == 6)
+ $msort = $msgs;
- if(($sort % 2) == 1) {
- asort($msort);
- } else {
- arsort($msort);
+ if ($sort < 6) {
+ if($sort % 2) {
+ asort($msort);
+ } else {
+ arsort($msort);
+ }
}
- session_register("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;
-
- // do a check to see if the config stuff has already been included or not
-// if (!isset($imapServerAddress))
-// include("../config/config.php");
-
+ global $imapServerAddress;
+ global $index_order, $real_endMessage, $real_startMessage, $checkall;
+
// 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 (!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);
@@ -148,149 +351,248 @@
$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);
- /** This is the beginning of the message list table. It wraps around all messages */
- echo "";
+ do_hook('mailbox_index_before');
+ $Message = '';
if ($startMessage < $endMessage) {
- echo "";
- echo "". _("Viewing messages ") ."$startMessage ". _(" to ") ."$endMessage ($numMessages total) \n";
- echo " \n";
- } else if ($startMessage == $endMessage) {
- echo "\"TD>";
- echo "". _("Viewing message ") ."$startMessage ($numMessages ". _("total") .") \n";
- echo " \n";
+ $Message = _("Viewing messages") ." $startMessage ". _("to") ." $endMessage ($numMessages " . _("total") . ")\n";
+ } elseif ($startMessage == $endMessage) {
+ $Message = _("Viewing message") ." $startMessage ($numMessages " . _("total") . ")\n";
}
- echo "";
+ $More = '';
+ if ($sort == 6) {
+ $use = 0;
+ } else {
+ $use = 1;
+ }
if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) {
- echo "". _("Previous") ." \n";
- echo "". _("Next") ." \n";
+ $More = "". _("Previous") ." | \n";
+ $More .= "". _("Next") ." \n";
}
- else if (($nextGroup > $numMessages) && ($prevGroup >= 0)) {
- echo "". _("Previous") ." \n";
- echo "Next \n";
+ elseif (($nextGroup > $numMessages) && ($prevGroup >= 0)) {
+ $More = "". _("Previous") ." | \n";
+ $More .= ""._("Next")." \n";
}
- else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) {
- echo "Previous \n";
- echo "". _("Next") ." \n";
+ elseif (($nextGroup <= $numMessages) && ($prevGroup < 0)) {
+ $More = ""._("Previous")." | \n";
+ $More .= "". _("Next") ." \n";
}
- echo " \n";
- /** The delete and move options */
- echo "";
-
- echo "\n\n\n ";
+ $endVar = $endMessage + 1;
- echo "";
- echo "";
- echo "";
- echo " ";
- /** FROM HEADER **/
- if ($mailbox == $sent_folder)
- echo " ". _("To") ." ";
- else
- echo " ". _("From") ." ";
-
- if ($sort == 2)
- echo " \n";
- else if ($sort == 3)
- echo " \n";
- else
- echo " \n";
- /** DATE HEADER **/
- echo " ". _("Date") ." ";
- if ($sort == 0)
- echo " \n";
- else if ($sort == 1)
- echo " \n";
- else
- echo " \n";
- /** SUBJECT HEADER **/
- echo " ". _("Subject") ." \n";
- if ($sort == 4)
- echo " \n";
- else if ($sort == 5)
- echo " \n";
- else
- 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 "". _("THIS FOLDER IS EMPTY") ."   ";
+ echo "". _("THIS FOLDER IS EMPTY") ." ";
} else if ($startMessage == $endMessage) { // if there's only one message in the box, handle it different.
- $i = $startMessage - 1;
+ if ($sort != 6)
+ $i = $startMessage;
+ else
+ $i = 1;
reset($msort);
+ $k = 0;
do {
$key = key($msort);
next($msort);
$k++;
} while (isset ($key) && ($k < $i));
- printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage);
+ printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $real_startMessage, 0, 0);
} else {
$i = $startMessage;
+
reset($msort);
+ $k = 0;
do {
$key = key($msort);
next($msort);
$k++;
} while (isset ($key) && ($k < $i));
- do {
- printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage);
+ 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 '
';
- echo "\n";
- echo "\n";
+ echo "\n";
echo "";
- if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) {
- echo "" . _("Previous") . " \n";
- echo "" . _("Next") . " \n";
+ echo '';
+ echo ' ';
+ echo ''; /** End of message-list table */
+
+ do_hook('mailbox_index_after');
+ }
+
+ /* Displays the standard message list header.
+ * To finish the table, you need to do a "";
+ * $moveURL is the URL to submit the delete/move form to
+ * $mailbox is the current mailbox
+ * $sort is the current sorting method (-1 for no sorting available [searches])
+ * $Message is a message that is centered on top of the list
+ * $More is a second line that is left aligned
+ */
+ function mail_message_listing_beginning($imapConnection, $moveURL,
+ $mailbox = '', $sort = -1, $Message = '', $More = '', $startMessage = 1)
+ {
+ global $color, $index_order, $auto_expunge, $move_to_trash;
+ global $checkall, $sent_folder;
+ $urlMailbox = urlencode($mailbox);
+
+ /** This is the beginning of the message list table. It wraps around all messages */
+ echo '';
+
+ if ($Message)
+ {
+ echo "$Message \n";
+ }
+
+ echo "";
+ echo '';
+ echo ' ';
+
+ /** The delete and move options */
+ echo "";
+
+ echo "\n\n\n ';
+
+ echo "";
+ echo "";
+ echo "";
+
+ $urlMailbox=urlencode($mailbox);
+
+ // Print the headers
+ for ($i=1; $i <= count($index_order); $i++) {
+ switch ($index_order[$i]) {
+ case 1: # checkbox
+ case 5: # flags
+ echo ' ';
+ break;
+
+ case 2: # from
+ if ($mailbox == $sent_folder)
+ echo ' '. _("To") .' ';
+ else
+ echo ' '. _("From") .' ';
+
+ if ($sort == 2)
+ echo " \n";
+ elseif ($sort == 3)
+ echo " \n";
+ elseif ($sort != -1)
+ echo " \n";
+ echo "";
+ break;
+
+ case 3: # date
+ echo ' '. _("Date") .' ';
+ if ($sort == 0)
+ echo " \n";
+ elseif ($sort == 1)
+ echo " \n";
+ elseif ($sort == 6)
+ echo " \n";
+ elseif ($sort != -1)
+ echo " \n";
+ echo '';
+ break;
+
+ case 4: # subject
+ echo ' '. _("Subject") ." \n";
+ if ($sort == 4)
+ echo " \n";
+ elseif ($sort == 5)
+ echo " \n";
+ elseif ($sort != -1)
+ echo " \n";
+ echo "";
+ break;
+
+ case 6: # size
+ echo ' ' . _("Size")." \n";
+ break;
+ }
}
- echo "
"; /** End of message-list table */
+ echo " \n";
}
?>