X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=e6e5f114431364407b4eeb1543070e7535ada174;hp=41db001506c8dc2da989a50cbef5548aad195444;hb=d6def997ed1c35054ff1bb48c4a605c28dc0d549;hpb=6edca88531e7ed0314c30eb0ccafb76d6ce270a9
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 41db0015..e6e5f114 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,40 +20,57 @@
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']);
+ if( $mailbox == _("None") ) {
+ // $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+ $boxes = sqimap_mailbox_list($imapConnection);
+ // sqimap_logout($imapConnection);
+ $mailbox = $boxes[0]['unformatted'];
+ unset( $boxes );
+ }
$urlMailbox = urlencode($mailbox);
- $subject = trim($msg['SUBJECT']);
- if ($subject == '')
- $subject = _("(no subject)");
+ $subject = processSubject($msg['SUBJECT']);
echo "
\n";
- if (isset($msg['FLAG_FLAGGED']) && $msg['FLAG_FLAGGED'] == true)
- {
- $flag = "";
- $flag_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 = ' ';
+ if (!isset($msg['FLAG_SEEN']) || $msg['FLAG_SEEN'] == false)
+ {
+ $bold = '';
+ $bold_end = ' ';
}
else
{
$bold = '';
$bold_end = '';
}
- if ($mailbox == $sent_folder)
- {
- $italic = '';
- $italic_end = ' ';
+ if ($mailbox == $sent_folder)
+ {
+ $italic = '';
+ $italic_end = ' ';
}
else
{
@@ -59,9 +78,9 @@
$italic_end = '';
}
if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED'])
- {
- $fontstr = "";
- $fontstr_end = ' ';
+ {
+ $fontstr = "";
+ $fontstr_end = ' ';
}
else
{
@@ -84,48 +103,55 @@
}
if (!isset($hlt_color))
- $hlt_color = $color[4];
+ $hlt_color = $color_string;
if ($where && $what) {
$search_stuff = '&where='.urlencode($where).'&what='.urlencode($what);
}
- if ($checkall == 1)
+ if ($checkall == 1)
$checked = ' checked';
else
$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";
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";
+
+ if ($subject != $msg['SUBJECT']) {
+ $title = get_html_translation_table(HTML_SPECIALCHARS);
+ $title = array_flip($title);
+ $title = strtr($msg['SUBJECT'], $title);
+ $title = str_replace('"', "''", $title);
+ echo " title=\"$title\"";
+ }
+ echo ">$flag$subject$flag_end$bold_end\n";
break;
case 5: # flags
$stuff = false;
- echo " \n";
- if (isset($msg['FLAG_ANSWERED']) &&
+ echo " \n";
+ if (isset($msg['FLAG_ANSWERED']) &&
$msg['FLAG_ANSWERED'] == true) {
echo "A\n";
$stuff = true;
}
+ if (ereg('(5)',substr($msg['PRIORITY'],0,1))) {
+ echo "v \n";
+ $stuff = true;
+ }
if ($msg['TYPE0'] == 'multipart') {
echo "+\n";
$stuff = true;
@@ -143,7 +169,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 +187,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,44 +210,47 @@
$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;
}
- if ($end > $numMessages) $end = $numMessages;
- while ($j < $end) {
- $date[$j] = ereg_replace(' ', ' ', $date[$j]);
- $tmpdate = explode(' ', trim($date[$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']);
@@ -279,14 +293,14 @@
/* Only ignore messages flagged as deleted if we are using a
* trash folder or auto_expunge */
- if (((isset($move_to_trash) && $move_to_trash)
+ 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;
}
@@ -301,7 +315,7 @@
$messages = array();
$msgs = $messages;
}
- }
+ }
// There's gotta be messages in the array for it to sort them.
if ($numMessages > 0 && ! $use_cache) {
@@ -313,15 +327,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);
@@ -338,7 +352,7 @@
global $folder_prefix, $sent_folder;
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');
@@ -370,30 +384,58 @@
$Message = _("Viewing message") ." $startMessage ($numMessages " . _("total") . ")\n";
}
- $More = '';
if ($sort == 6) {
$use = 0;
} else {
$use = 1;
}
+ $lMore = '';
+ $rMore = '';
if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) {
- $More = "". _("Previous") ." | \n";
- $More .= "". _("Next") ." \n";
+ $lMore = "". _("Previous") . ' ';
+ $rMore = "". _("Next") ." \n";
}
elseif (($nextGroup > $numMessages) && ($prevGroup >= 0)) {
- $More = "". _("Previous") ." | \n";
- $More .= ""._("Next")." \n";
+ $lMore = "". _("Previous") . ' ';
+ $rMore = ""._("Next")." \n";
}
elseif (($nextGroup <= $numMessages) && ($prevGroup < 0)) {
- $More = ""._("Previous")." | \n";
- $More .= "". _("Next") ." \n";
+ $lMore = ""._("Previous") . ' ';
+ $rMore = "". _("Next") ." \n";
+ }
+ if( $lMore <> '' )
+ $lMore .= ' | ';
+
+ // Page selector block. Following code computes page links.
+ $mMore = '';
+ if( getPref($data_dir, $username, 'page_selector') && $numMessages > $show_num ) {
+
+ $j = intval( $numMessages / $show_num );
+ if( $numMessages % $show_num <> 0 )
+ $j++;
+ $startMessage = min( $startMessage, $numMessages );
+ for( $i = 0; $i < $j; $i++ ) {
+
+ $start = ( ( $i * $show_num ) + 1 );
+
+ if( $startMessage >= $start &&
+ $startMessage < $start + $show_num ) {
+ $mMore .= '' . ($i+1) . ' ';
+ } else {
+ $mMore .= "" .
+ ($i+1) .
+ ' ';
+ }
+ }
+ $mMore .= ' | ';
}
if (! isset($msg))
- $msg = "";
+ $msg = '';
mail_message_listing_beginning($imapConnection,
"move_messages.php?msg=$msg&mailbox=$urlMailbox&startMessage=$startMessage",
- $mailbox, $sort, $Message, $More, $startMessage);
+ $mailbox, $sort, $Message, $lMore . $mMore . $rMore, $startMessage);
$groupNum = $startMessage % ($show_num - 1);
$real_startMessage = $startMessage;
@@ -446,22 +488,17 @@
next($msort);
} while ($i && $i < $endVar);
}
- echo '';
+ echo '';
echo " \n";
echo "";
echo '';
- echo "$More \n";
+ echo "$lMore$mMore$rMore \n";
if (!$startMessage) $startMessage=1;
- if ( $checkall == '1')
- echo "\n" . _("Unselect All") . " \n";
- else
- echo "\n" . _("Select All") . " \n";
+ ShowSelectAllLink($startMessage, $sort);
- echo '
';
- echo ' ';
- echo ''; /** End of message-list table */
+ echo ''; /** End of message-list table */
do_hook('mailbox_index_after');
}
@@ -481,66 +518,72 @@
global $checkall, $sent_folder;
$urlMailbox = urlencode($mailbox);
- /** This is the beginning of the message list table. It wraps around all messages */
+ /** This is the beginning of the message list table. It wraps around all messages */
echo '';
-
- if ($Message)
- {
+ if ($Message) {
echo "$Message \n";
}
echo "";
echo '';
- echo ' ';
+ ShowSelectAllLink($startMessage, $sort);
+ echo '
';
/** The delete and move options */
echo "";
- echo "\n\n\n ';
echo "";
- echo "";
+ echo "";
echo "";
- $urlMailbox=urlencode($mailbox);
-
// Print the headers
for ($i=1; $i <= count($index_order); $i++) {
switch ($index_order[$i]) {
@@ -548,51 +591,121 @@
case 5: # flags
echo ' ';
break;
-
+
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;
+
+ // This code is from Philippe Mingo
+
+ ?>
+
+";
+ if (isset($checkall) && $checkall == '1')
+ echo _("Unselect All");
+ else
+ echo _("Select All");
+
+ echo "\n \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) . '...';
+ }
+
+?>
\ No newline at end of file