X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=functions%2Fmailbox_display.php;h=e098e3b3fa0797a3def0c8f9c373f65cd15767cb;hb=2c86c02c16613d2e95d735e15b2b26d17c563453;hp=4174bbc1b2fca7493db56925834fc4035aae81d8;hpb=6a8e7cae9c5f0779b5aa4afb8acfc295b0d8e974;p=squirrelmail.git
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 4174bbc1..e098e3b3 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -20,10 +20,24 @@ require_once(SM_PATH . 'functions/imap_mailbox.php');
/* Default value for page_selector_max. */
define('PG_SEL_MAX', 10);
+function elapsed($start)
+{
+ $end = microtime();
+ list($start2, $start1) = explode(" ", $start);
+ list($end2, $end1) = explode(" ", $end);
+ $diff1 = $end1 - $start1;
+ $diff2 = $end2 - $start2;
+ if( $diff2 < 0 ){
+ $diff1 -= 1;
+ $diff2 += 1.0;
+ }
+ return $diff2 + $diff1;
+}
+
function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox,
$start_msg, $where, $what) {
global $checkall,
- $color, $msgs, $msort,
+ $color, $msgs, $msort, $td_str, $msg,
$default_use_priority,
$message_highlight_list,
$index_order,
@@ -58,25 +72,29 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox,
if (handleAsSent($mailbox)) {
$msg['FROM'] = $msg['TO'];
+ }
/*
* This is done in case you're looking into Sent folders,
* because you can have multiple receivers.
*/
- $senderNames = explode(',', $msg['FROM']);
- $senderName = '';
- if (sizeof($senderNames)){
- foreach ($senderNames as $senderNames_part) {
+
+ $senderNames = $msg['FROM'];
+ $senderName = '';
+ if (sizeof($senderNames)){
+ foreach ($senderNames as $senderNames_part) {
if ($senderName != '') {
$senderName .= ', ';
}
- $senderName .= sqimap_find_displayable_name($senderNames_part);
- }
- }
- } else {
- $senderName = sqimap_find_displayable_name($msg['FROM']);
- }
-
- $subject = processSubject($msg['SUBJECT'], $indent_array[$msg['ID']]);
+ if ($senderNames_part[1]) {
+ $senderName .= decodeHeader($senderNames_part[1]);
+ } else {
+ $senderName .= htmlspecialchars($senderNames_part[0]);
+ }
+ }
+ }
+
+ $subject_full = decodeHeader($msg['SUBJECT']);
+ $subject = processSubject($subject_full, $indent_array[$msg['ID']]);
echo html_tag( 'tr','','','','VALIGN="top"') . "\n";
@@ -124,10 +142,19 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox,
$high_val = strtolower($message_highlight_list_part['value']);
$match_type = strtoupper($message_highlight_list_part['match_type']);
if ($match_type == 'TO_CC') {
- if (strstr('^^' . strtolower($msg['TO']), $high_val) ||
- strstr('^^' . strtolower($msg['CC']), $high_val)) {
- $hlt_color = $message_highlight_list_part['color'];
- continue;
+ foreach ($msg['TO'] as $address) {
+ if (strstr('^^' . strtolower($address[0]), $high_val) ||
+ strstr('^^' . strtolower($address[1]), $high_val)) {
+ $hlt_color = $message_highlight_list_part['color'];
+ continue;
+ }
+ }
+ foreach ($msg['CC'] as $address) {
+ if( strstr('^^' . strtolower($address[0]), $high_val) ||
+ strstr('^^' . strtolower($address[1]), $high_val)) {
+ $hlt_color = $message_highlight_list_part['color'];
+ continue;
+ }
}
} else {
if (strstr('^^' . strtolower($msg[$match_type]), $high_val)) {
@@ -155,7 +182,7 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox,
break;
case 2: /* from */
echo html_tag( 'td',
- $italic . $bold . $flag . $fontstr . htmlentities($senderName) .
+ $italic . $bold . $flag . $fontstr . $senderName .
$fontstr_end . $flag_end . $bold_end . $italic_end,
'left',
$hlt_color );
@@ -183,10 +210,10 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox,
. '&passed_id='. $msg["ID"]
. '&startMessage='.$start_msg.$searchstr.'"';
do_hook("subject_link");
- if ($subject != $msg['SUBJECT']) {
+ if ($subject != $subject_full) {
$title = get_html_translation_table(HTML_SPECIALCHARS);
$title = array_flip($title);
- $title = strtr($msg['SUBJECT'], $title);
+ $title = strtr($subject_full, $title);
$title = str_replace('"', "''", $title);
$td_str .= " title=\"$title\"";
}
@@ -222,6 +249,7 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox,
if (!$stuff) {
$td_str .= ' ';
}
+ do_hook("msg_envelope");
$td_str .= '';
echo html_tag( 'td',
$td_str,
@@ -250,13 +278,7 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox,
function getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id) {
if ($id != 'no') {
- if ($start_msg + ($show_num - 1) < $num_msgs) {
- $end_msg = $start_msg + ($show_num-1);
- } else {
- $end_msg = $num_msgs;
- }
- $id = array_slice($id, ($start_msg-1), ($end_msg));
-
+ $id = array_slice($id, ($start_msg-1), $show_num);
$end = $start_msg + $show_num - 1;
if ($num_msgs < $show_num) {
$end_loop = $num_msgs;
@@ -303,7 +325,7 @@ function getSelfSortMessages($imapConnection, $start_msg, $show_num,
$start_msg = 1;
}
}
- $id = array_slice(array_reverse($id), ($start_msg-1), ($end_msg));
+ $id = array_slice(array_reverse($id), ($start_msg-1), $show_num);
$end = $start_msg + $show_num - 1;
if ($num_msgs < $show_num) {
$end_loop = $num_msgs;
@@ -330,6 +352,21 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs,
global $msgs, $msort, $auto_expunge, $thread_sort_messages,
$allow_server_sort, $server_sort_order;
+ /*
+ * For some reason, on PHP 4.3+, this being unset, and set in the session causes havoc
+ * so setting it to an empty array beforehand seems to clean up the issue, and stopping the
+ * "Your script possibly relies on a session side-effect which existed until PHP 4.2.3" error
+ */
+
+ if (!isset($msort)) {
+ $msort = array();
+ }
+
+ if (!isset($msgs)) {
+ $msgs = array();
+ }
+
+ $start = microtime();
/* If autoexpunge is turned on, then do it now. */
$mbxresponse = sqimap_mailbox_select($imapConnection, $mailbox);
$srt = $sort;
@@ -443,6 +480,8 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs,
mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $color);
echo '';
+ $t = elapsed($start);
+ //echo("elapsed time = $t seconds\n");
}
function calc_msort($msgs, $sort) {
@@ -482,67 +521,7 @@ function calc_msort($msgs, $sort) {
}
function fillMessageArray($imapConnection, $id, $count) {
- $msgs_list = sqimap_get_small_header_list($imapConnection, $id);
- $messages = array();
- if (sizeof($msgs_list)) {
- foreach ($msgs_list as $hdr) {
- $unique_id[] = $hdr->uid;
- $from[] = $hdr->from;
- $date[] = $hdr->date;
- $subject[] = $hdr->subject;
- $to[] = $hdr->to;
- $priority[] = $hdr->priority;
- $cc[] = $hdr->cc;
- $size[] = $hdr->size;
- $type[] = $hdr->type0;
- $flag_deleted[] = $hdr->flag_deleted;
- $flag_answered[] = $hdr->flag_answered;
- $flag_seen[] = $hdr->flag_seen;
- $flag_flagged[] = $hdr->flag_flagged;
- }
- }
-
- for($j = 0; $j < $count; ++$j) {
- if (isset($date[$j])) {
- $date[$j] = str_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'] = $unique_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];
- $messages[$j]['FLAG_DELETED'] = $flag_deleted[$j];
- $messages[$j]['FLAG_ANSWERED'] = $flag_answered[$j];
- $messages[$j]['FLAG_SEEN'] = $flag_seen[$j];
- $messages[$j]['FLAG_FLAGGED'] = $flag_flagged[$j];
-
- /*
- * fix SUBJECT-SORT to remove Re:
- * vedr|sv (Danish)
- * re|aw (English)
- *
- * TODO: i18n should be incorporated here. E.g. we catch the ones
- * we know about, but also define in i18n what the localized
- * "Re: " is for this or that locale.
- */
- if (preg_match("/^(vedr|sv|re|aw):\s*(.*)$/si",
- $messages[$j]['SUBJECT-SORT'], $matches)){
- $messages[$j]['SUBJECT-SORT'] = $matches[2];
- }
- }
- return $messages;
+ return sqimap_get_small_header_list($imapConnection, $id);
}
@@ -669,13 +648,18 @@ function mail_message_listing_beginning ($imapConnection,
if (!isset($msg)) {
$msg = '';
}
- $moveURL = "move_messages.php?msg=$msg&mailbox=$urlMailbox"
- . "&startMessage=$start_msg";
+ $moveFields = '' .
+ '' .
+ '';
+
+// $moveURL = "move_messages.php?msg=$msg&mailbox=$urlMailbox"
+// . "&startMessage=$start_msg";
/*
* This is the beginning of the message list table.
* It wraps around all messages
*/
- echo "