X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=3268d5c7326fcb401941a3efef7061e6a60fe1af;hp=f19f1f50089faf34a0e88cb89f1f0dc7c594d841;hb=0fba4d30d140ce0f4b72925403c17fd4494acd77;hpb=e452ce9b159ee616915c2ca809a6da3f97b2c60b
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index f19f1f50..3268d5c7 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -8,25 +8,87 @@
**
**/
- $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 $color, $msgs, $msort;
+ global $sent_folder;
+ global $message_highlight_list;
+ global $index_order;
+
$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 ($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 = " "; }
+
+ 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;
+ }
+ }
+ }
- 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";
+ if (!$hlt_color)
+ $hlt_color = $color[4];
+
+ if ($where && $what) {
+ $search_stuff = "&where=".urlencode($where)."&what=".urlencode($what);
+ }
+
+ 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$senderName$flag_end$bold_end$italic_end \n";
+ break;
+ case 3: # date
+ echo " $bold$flag".$msg["DATE_STRING"]."$flag_end$bold_end \n";
+ break;
+ case 4: # subject
+ echo " $bold$flag$subject$flag_end $bold_end \n";
+ break;
+ case 5: # flags
+ $stuff = false;
+ 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 (!$stuff) echo " \n";
+ echo " \n";
+ break;
+ case 6: # size
+ echo " $bold".show_readable_size($msg['SIZE'])."$bold_end \n";
+ break;
+ }
+ }
+
echo " \n";
}
@@ -36,15 +98,32 @@
**/
function showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color,$show_num, $use_cache) {
global $msgs, $msort;
- include ("../config/config.php");
+ global $sent_folder;
+ global $message_highlight_list;
+ global $auto_expunge;
+
+ if ($auto_expunge) {
+ sqimap_mailbox_expunge($imapConnection, $mailbox);
+ sqimap_mailbox_select($imapConnection, $mailbox);
+ }
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;
+ 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);
}
}
@@ -58,7 +137,19 @@
$messages[$j]["DATE_STRING"] = getDateString($messages[$j]["TIME_STAMP"]);
$messages[$j]["ID"] = $j+1;
$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:
+ if (substr($messages[$j]["SUBJECT-SORT"], 0, 3) == "re:" ||
+ substr($messages[$j]["SUBJECT-SORT"], 0, 3) == "aw:")
+ $messages[$j]["SUBJECT-SORT"] = trim(substr($messages[$j]["SUBJECT-SORT"], 3));
$num = 0;
while ($num < count($flags[$j])) {
@@ -102,13 +193,13 @@
** 2 = Name (up)
** 3 = Name (dn)
**/
-
+ session_unregister("msgs");
if (($sort == 0) || ($sort == 1))
$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 % 2) == 1) {
asort($msort);
@@ -118,15 +209,14 @@
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;
-
- // do a check to see if the config stuff has already been included or not
- if (!isset($imapServerAddress))
- include("../config/config.php");
+ global $folder_prefix, $sent_folder;
+ global $imapServerAddress;
+ global $index_order;
// if cache isn't already set, do it now
if (!session_is_registered("msgs"))
@@ -134,40 +224,48 @@
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);
+ do_hook("mailbox_index_before");
/** This is the beginning of the message list table. It wraps around all messages */
- echo "";
+ echo "";
if ($startMessage < $endMessage) {
echo "";
- echo "". _("Viewing messages ") ."$startMessage ". _(" to ") ."$endMessage ($numMessages total) \n";
+ 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 " ";
+ echo "". _("Viewing message") ." $startMessage ($numMessages " . _("total") . ") \n";
echo " \n";
}
echo "";
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 "". _("Previous") ." | \n";
+ echo ""._("Next")." \n";
}
else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) {
- echo "Previous \n";
+ echo ""._("Previous")." | \n";
echo "". _("Next") ." \n";
}
echo " \n";
@@ -176,17 +274,19 @@
echo "";
echo "\n\n\n ";
echo "";
- echo "";
+ echo "";
echo "";
- echo " ";
- /** FROM HEADER **/
- 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";
+
+ for ($i=1; $i <= count($index_order); $i++) {
+ switch ($index_order[$i]) {
+ case 1: # checkbox
+ echo " ";
+ break;
+ case 2: # from
+ if ($mailbox == $sent_folder)
+ echo " ". _("To") ." ";
+ else
+ echo " ". _("From") ." ";
+
+ if ($sort == 2)
+ echo " \n";
+ else if ($sort == 3)
+ echo " \n";
+ else
+ echo " \n";
+ break;
+ case 3: # date
+ echo " ". _("Date") ." ";
+ if ($sort == 0)
+ echo " \n";
+ else if ($sort == 1)
+ echo " \n";
+ else
+ echo " \n";
+ break;
+ case 4: # subject
+ echo " ". _("Subject") ." \n";
+ if ($sort == 4)
+ echo " \n";
+ else if ($sort == 5)
+ echo " \n";
+ else
+ echo " \n";
+ break;
+ case 5: # flags
+ echo " \n";
+ break;
+ case 6: # size
+ echo " " . _("Size")." \n";
+ break;
+ }
+ }
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;
+ $i = $startMessage;
reset($msort);
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, $startMessage, 0, 0);
} else {
$i = $startMessage;
reset($msort);
@@ -254,31 +377,34 @@
} while (isset ($key) && ($k < $i));
do {
- printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage);
+ printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, 0, 0);
$key = key($msort);
$t++;
$i++;
next($msort);
} while ($i < ($endMessage+1));
}
- echo "
";
+ echo "
";
echo "
\n";
echo "\n";
echo "";
if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) {
- echo "" . _("Previous") . " \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 "" . _("Previous"). " | \n";
echo "" . _("Next") . " \n";
}
- echo "
"; /** End of message-list table */
+ echo "";
+ echo ""; /** End of message-list table */
+
+ do_hook("mailbox_index_after");
}
?>