X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=0947bc647e1dd41f9e6498c521392e925296f11b;hb=97876814d7f47f9ea38c1cd97cb8bd73191fa9c4;hp=e534c9360f5e43a80748ebacc4fdb320fb9911ce;hpb=cbbdef2abcc419765b40a3eda08643063216fbca;p=squirrelmail.git
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index e534c936..0947bc64 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -9,7 +9,9 @@
** $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;
@@ -18,13 +20,23 @@
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']);
$urlMailbox = urlencode($mailbox);
- $subject = trim($msg['SUBJECT']);
- if ($subject == '')
- $subject = _("(no subject)");
+ $subject = processSubject($msg['SUBJECT']);
echo "
\n";
@@ -84,7 +96,7 @@
}
if (!isset($hlt_color))
- $hlt_color = $color[4];
+ $hlt_color = $color_string;
if ($where && $what) {
$search_stuff = '&where='.urlencode($where).'&what='.urlencode($what);
@@ -98,29 +110,24 @@
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";
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";
+ echo ">$flag$subject$flag_end$bold_end\n";
break;
case 5: # flags
$stuff = false;
- echo " \n";
+ echo " \n";
if (isset($msg['FLAG_ANSWERED']) &&
$msg['FLAG_ANSWERED'] == true) {
echo "A\n";
@@ -143,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;
}
}
@@ -161,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) {
@@ -199,31 +191,24 @@
$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;
}
}
@@ -232,13 +217,14 @@
$end = $startMessage + $show_num - 1;
if ($numMessages < $show_num)
$end_loop = $numMessages;
- else
+ elseif ($end > $numMessages)
+ $end_loop = $numMessages - $startMessage + 1;
+ else
$end_loop = $show_num;
} else {
$end = $numMessages;
$end_loop = $end;
}
- if ($end > $numMessages) $end = $numMessages;
while ($j < $end_loop) {
if (isset($date[$j])) {
$date[$j] = ereg_replace(' ', ' ', $date[$j]);
@@ -322,15 +308,15 @@
session_unregister("msgs");
if (($sort == 0) || ($sort == 1))
$msort = array_cleave ($msgs, 'TIME_STAMP');
- if (($sort == 2) || ($sort == 3))
+ elseif (($sort == 2) || ($sort == 3))
$msort = array_cleave ($msgs, 'FROM-SORT');
- if (($sort == 4) || ($sort == 5))
+ elseif (($sort == 4) || ($sort == 5))
$msort = array_cleave ($msgs, 'SUBJECT-SORT');
- if ($sort == 6)
+ else // ($sort == 6)
$msort = $msgs;
if ($sort < 6) {
- if($sort % 2) {
+ if ($sort % 2) {
asort($msort);
} else {
arsort($msort);
@@ -455,7 +441,7 @@
next($msort);
} while ($i && $i < $endVar);
}
- echo '';
+ echo '';
echo " \n";
@@ -486,7 +472,6 @@
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 '';
@@ -519,7 +504,7 @@
for ($i = 0; $i < count($boxes); $i++) {
if (!in_array("noselect", $boxes[$i]['flags'])) {
$box = $boxes[$i]['unformatted'];
- $box2 = replace_spaces($boxes[$i]['unformatted-disp']);
+ $box2 = str_replace(' ', ' ', $boxes[$i]['unformatted-disp']);
echo " $box2 \n";
}
}
@@ -539,11 +524,15 @@
echo '';
echo "";
- echo "";
+ echo "";
echo "";
- $urlMailbox=urlencode($mailbox);
-
// Print the headers
for ($i=1; $i <= count($index_order); $i++) {
switch ($index_order[$i]) {
@@ -554,51 +543,50 @@
case 2: # from
if ($mailbox == $sent_folder)
- echo ' '. _("To") .' ';
+ echo ' '. _("To") .' ';
else
- echo ' '. _("From") .' ';
-
- if ($sort == 2)
- echo " \n";
- elseif ($sort == 3)
- echo " \n";
- elseif ($sort != -1)
- echo " \n";
- echo "";
+ echo ' '. _("From") .' ';
+ ShowSortButton($sort, $mailbox, 2, 3);
+ echo " \n";
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 '';
+ echo ' '. _("Date") .' ';
+ ShowSortButton($sort, $mailbox, 0, 1);
+ echo " \n";
break;
case 4: # subject
- echo ' '. _("Subject") ." \n";
- if ($sort == 4)
- echo " \n";
- elseif ($sort == 5)
- echo " \n";
- elseif ($sort != -1)
- echo " \n";
- echo "";
+ echo ' '. _("Subject") .' ';
+ ShowSortButton($sort, $mailbox, 4, 5);
+ echo " \n";
break;
- case 6: # size
- echo ' ' . _("Size")." \n";
+ case 6: # size
+ echo ' ' . _("Size")." \n";
break;
}
}
echo " \n";
}
+ function ShowSortButton($sort, $mailbox, $Up, $Down) {
+ if ($sort != $Up && $sort != $Down) {
+ $img = 'sort_none.gif';
+ $which = $Up;
+ } elseif ($sort == $Up) {
+ $img = 'up_pointer.gif';
+ $which = $Down;
+ } else {
+ $img = 'down_pointer.gif';
+ $which = 6;
+ }
+ echo ' ';
+ }
+
function ShowSelectAllLink($startMessage, $sort)
{
global $checkall, $PHP_SELF, $what, $where, $mailbox;
@@ -618,5 +606,35 @@
echo _("Select All");
echo "\n";
}
-
+
+ function processSubject($subject)
+ {
+ // Shouldn't ever happen -- caught too many times in the IMAP functions
+ if ($subject == '')
+ return _("(no subject)");
+
+ if (strlen($subject) <= 55)
+ return $subject;
+
+ $ent_strlen=strlen($subject);
+ $trim_val=50;
+ $ent_offset=0;
+ // see if this is entities-encoded string
+ // If so, Iterate through the whole string, find out
+ // the real number of characters, and if more
+ // than 55, substr with an updated trim value.
+ while (($ent_loc = strpos($subject, '&', $ent_offset)) !== false &&
+ ($ent_loc_end = strpos($subject, ';', $ent_loc)) !== false)
+ {
+ $trim_val += ($ent_loc_end-$ent_loc)+1;
+ $ent_strlen -= $ent_loc_end-$ent_loc;
+ $ent_offset = $ent_loc_end+1;
+ }
+
+ if ($ent_strlen <= 55)
+ return $subject;
+
+ return substr($subject, 0, $trim_val) . '...';
+ }
+
?>