X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=functions%2Fmailbox_display.php;h=0947bc647e1dd41f9e6498c521392e925296f11b;hb=97876814d7f47f9ea38c1cd97cb8bd73191fa9c4;hp=7b71f9ed64c1a0ec02f82afc7ef04681e71fdadd;hpb=02ad7ce1ad7c5e651edf58b19cc84e1d4adaf4ec;p=squirrelmail.git
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 7b71f9ed..0947bc64 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -6,9 +6,12 @@
** This contains functions that display mailbox information, such as the
** table row that has sender, date, subject, etc...
**
+ ** $Id$
**/
- $mailbox_display_php = true;
+ if (defined('mailbox_display_php'))
+ return;
+ define('mailbox_display_php', true);
function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, $where, $what) {
global $checkall;
@@ -17,77 +20,128 @@
global $message_highlight_list;
global $index_order;
+ $color_string = $color[4];
+ if ($GLOBALS['alt_index_colors']) {
+ if (!isset($GLOBALS["row_count"])) {
+ $GLOBALS["row_count"] = 0;
+ }
+ $GLOBALS["row_count"]++;
+ if ($GLOBALS["row_count"] % 2) {
+ if (!isset($color[12])) $color[12] = "#EAEAEA";
+ $color_string = $color[12];
+ }
+ }
+
$msg = $msgs[$key];
- $senderName = sqimap_find_displayable_name($msg["FROM"]);
+ $senderName = sqimap_find_displayable_name($msg['FROM']);
$urlMailbox = urlencode($mailbox);
- $subject = trim($msg["SUBJECT"]);
- if ($subject == "")
- $subject = _("(no subject)");
+ $subject = processSubject($msg['SUBJECT']);
echo "
\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 ($msg["FLAG_DELETED"]) { $fontstr = ""; $fontstr_end = " "; }
+ 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"];
+ 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"];
+ } 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];
+ if (!isset($hlt_color))
+ $hlt_color = $color_string;
if ($where && $what) {
- $search_stuff = "&where=".urlencode($where)."&what=".urlencode($what);
+ $search_stuff = '&where='.urlencode($where).'&what='.urlencode($what);
}
if ($checkall == 1)
- $checked = " checked";
+ $checked = ' checked';
else
- $checked = "";
+ $checked = '';
for ($i=1; $i <= count($index_order); $i++) {
switch ($index_order[$i]) {
case 1: # checkbox
- echo " \n";
+ echo " \n";
break;
case 2: # from
- echo " $italic$bold$flag$fontstr$senderName$fontstr_end$flag_end$bold_end$italic_end \n";
+ 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";
+ echo " $bold$flag$fontstr".$msg["DATE_STRING"]."$fontstr_end$flag_end$bold_end \n";
break;
case 4: # subject
- echo " $bold$flag$subject$flag_end $bold_end \n";
+ echo " $bold";
+ if (! isset($search_stuff)) { $search_stuff = ''; }
+ echo "$flag$subject$flag_end $bold_end \n";
break;
case 5: # flags
$stuff = false;
- echo " \n";
- if ($msg["FLAG_ANSWERED"] == true) {
+ echo " \n";
+ if (isset($msg['FLAG_ANSWERED']) &&
+ $msg['FLAG_ANSWERED'] == true) {
echo "A\n";
$stuff = true;
}
- if ($msg["TYPE0"] == "multipart") {
+ if ($msg['TYPE0'] == 'multipart') {
echo "+\n";
$stuff = true;
}
- if (ereg("(1|2)",substr($msg["PRIORITY"],0,1))) {
+ if (ereg('(1|2)',substr($msg['PRIORITY'],0,1))) {
echo "! \n";
$stuff = true;
}
- if ($msg["FLAG_DELETED"]) {
+ if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) {
echo "D \n";
$stuff = true;
}
@@ -96,7 +150,7 @@
echo " \n";
break;
case 6: # size
- echo " $bold$fontstr".show_readable_size($msg['SIZE'])."$fontstr_end$bold_end \n";
+ echo " $bold$fontstr".show_readable_size($msg['SIZE'])."$fontstr_end$bold_end \n";
break;
}
}
@@ -114,30 +168,15 @@
global $message_highlight_list;
global $auto_expunge;
- if ($auto_expunge == true) sqimap_mailbox_expunge($imapConnection, $mailbox, false);
+ if ($auto_expunge == true) sqimap_mailbox_expunge($imapConnection, $mailbox, false);
sqimap_mailbox_select($imapConnection, $mailbox);
+ $issent = ($mailbox == $sent_folder);
if (!$use_cache) {
// if it's sorted
if ($numMessages >= 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;
- }
+ $id = range(1, $numMessages);
} else {
// if it's not sorted
if ($startMessage + ($show_num - 1) < $numMessages) {
@@ -152,77 +191,81 @@
$startMessage = 1;
}
-
$real_startMessage = $numMessages - $startMessage + 1;
- $real_endMessage = $numMessages - $startMessage - $show_num;
+ $real_endMessage = $numMessages - $startMessage - $show_num + 2;
if ($real_endMessage <= 0)
$real_endMessage = 1;
+ $id = array_reverse(range($real_endMessage, $real_startMessage));
+ }
- $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++;
- }
+ $msgs_list = sqimap_get_small_header_list($imapConnection, $id, $issent);
+ $flags = sqimap_get_flags_list($imapConnection, $id, $issent);
+ foreach ($msgs_list as $hdr) {
+ $from[] = $hdr->from;
+ $date[] = $hdr->date;
+ $subject[] = $hdr->subject;
+ $to[] = $hdr->to;
+ $priority[] = $hdr->priority;
+ $cc[] = $hdr->cc;
+ $size[] = $hdr->size;
+ $type[] = $hdr->type0;
}
}
$j = 0;
if ($sort == 6) {
$end = $startMessage + $show_num - 1;
+ if ($numMessages < $show_num)
+ $end_loop = $numMessages;
+ elseif ($end > $numMessages)
+ $end_loop = $numMessages - $startMessage + 1;
+ else
+ $end_loop = $show_num;
} else {
$end = $numMessages;
+ $end_loop = $end;
}
- 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];
+ while ($j < $end_loop) {
+ if (isset($date[$j])) {
+ $date[$j] = ereg_replace(' ', ' ', $date[$j]);
+ $tmpdate = explode(' ', trim($date[$j]));
+ } else {
+ $tmpdate = $date = array("","","","","","");
+ }
+
+ $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
+ '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;
}
- elseif ($flags[$j][$num] == "Answered") {
- $messages[$j]["FLAG_ANSWERED"] = true;
+ elseif ($flags[$j][$num] == 'Answered') {
+ $messages[$j]['FLAG_ANSWERED'] = true;
}
- elseif ($flags[$j][$num] == "Seen") {
- $messages[$j]["FLAG_SEEN"] = true;
+ elseif ($flags[$j][$num] == 'Seen') {
+ $messages[$j]['FLAG_SEEN'] = true;
}
- elseif ($flags[$j][$num] == "Flagged") {
- $messages[$j]["FLAG_FLAGGED"] = true;
+ elseif ($flags[$j][$num] == 'Flagged') {
+ $messages[$j]['FLAG_FLAGGED'] = true;
}
$num++;
}
@@ -231,13 +274,14 @@
/* Only ignore messages flagged as deleted if we are using a
* trash folder or auto_expunge */
- if (($move_to_trash || $auto_expunge) && $sort != 6)
+ 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) {
+ if (isset($messages[$j]['FLAG_DELETED']) && $messages[$j]['FLAG_DELETED'] == true) {
$j++;
continue;
}
@@ -248,6 +292,8 @@
}
$numMessages = $i;
} else {
+ if (! isset($messages))
+ $messages = array();
$msgs = $messages;
}
}
@@ -261,25 +307,25 @@
**/
session_unregister("msgs");
if (($sort == 0) || ($sort == 1))
- $msort = array_cleave ($msgs, "TIME_STAMP");
- if (($sort == 2) || ($sort == 3))
- $msort = array_cleave ($msgs, "FROM-SORT");
- if (($sort == 4) || ($sort == 5))
- $msort = array_cleave ($msgs, "SUBJECT-SORT");
- if ($sort == 6)
+ $msort = array_cleave ($msgs, 'TIME_STAMP');
+ elseif (($sort == 2) || ($sort == 3))
+ $msort = array_cleave ($msgs, 'FROM-SORT');
+ elseif (($sort == 4) || ($sort == 5))
+ $msort = array_cleave ($msgs, 'SUBJECT-SORT');
+ else // ($sort == 6)
$msort = $msgs;
if ($sort < 6) {
- if($sort % 2) {
+ 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");
+ session_register('msgs');
}
// generic function to convert the msgs array into an HTML table
@@ -289,10 +335,10 @@
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);
@@ -310,7 +356,7 @@
$prevGroup = $startMessage - $show_num;
$urlMailbox = urlencode($mailbox);
- do_hook("mailbox_index_before");
+ do_hook('mailbox_index_before');
$Message = '';
if ($startMessage < $endMessage) {
@@ -338,6 +384,8 @@
$More .= "". _("Next") ." \n";
}
+ if (! isset($msg))
+ $msg = "";
mail_message_listing_beginning($imapConnection,
"move_messages.php?msg=$msg&mailbox=$urlMailbox&startMessage=$startMessage",
$mailbox, $sort, $Message, $More, $startMessage);
@@ -367,6 +415,7 @@
else
$i = 1;
reset($msort);
+ $k = 0;
do {
$key = key($msort);
next($msort);
@@ -377,6 +426,7 @@
$i = $startMessage;
reset($msort);
+ $k = 0;
do {
$key = key($msort);
next($msort);
@@ -391,24 +441,21 @@
next($msort);
} while ($i && $i < $endVar);
}
- echo "";
+ echo '';
echo " \n";
echo "