X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=functions%2Fmailbox_display.php;h=2f476ba4cb32e2d34ae6df0b300684f82afe0623;hb=4cf438432a1f2bfdba752e075ec6458ec3e290ba;hp=5a36afb3cf4592f00629ca7b14c86a711f33c833;hpb=1fa67a32fff567626c417c81821e499a9665ce76;p=squirrelmail.git diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 5a36afb3..2f476ba4 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -1,263 +1,397 @@ \n"; - - 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) || ($mailbox == $draft_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']; - 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; + } + } + $msg = $msgs[$key]; + + /* + * 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) { + if ($senderName != '') { + $senderName .= ', '; } - } - } + $senderName .= sqimap_find_displayable_name($senderNames_part); + } + } - if (!isset($hlt_color)) { - $hlt_color = $color_string; - } + if( $mailbox == 'None' ) { + $boxes = sqimap_mailbox_list($imapConnection); + $mailbox = $boxes[0]['unformatted']; + unset( $boxes ); + } + $urlMailbox = urlencode($mailbox); + $subject = processSubject($msg['SUBJECT']); + echo html_tag( 'tr' ) . "\n"; + + 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 (handleAsSent($mailbox)) { + $italic = ''; + $italic_end = ''; + } else { + $italic = ''; + $italic_end = ''; + } + if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) { + $fontstr = ""; + $fontstr_end = ''; + } else { + $fontstr = ''; + $fontstr_end = ''; + } - if ($where && $what) { - $search_stuff = '&where='.urlencode($where).'&what='.urlencode($what); - } + /** + * AAAAH! Make my eyes stop bleeding! + * Who wrote this?! + */ + if (sizeof($message_highlight_list)){ + foreach ($message_highlight_list as $message_highlight_list_part) { + if (trim($message_highlight_list_part['value']) != '') { + if ($message_highlight_list_part['match_type'] == 'to_cc') { + if (strstr('^^' . strtolower($msg['TO']), + strtolower($message_highlight_list_part['value'])) + || strstr('^^'.strtolower($msg['CC']), + strtolower($message_highlight_list_part['value']))) { + $hlt_color = $message_highlight_list_part['color']; + continue; + } + } else + if (strstr('^^' . strtolower($msg[strtoupper($message_highlight_list_part['match_type'])]), + strtolower($message_highlight_list_part['value']))) { + $hlt_color = $message_highlight_list_part['color']; + continue; + } + } + } + } - $checked = ($checkall == 1 ?' checked' : ''); + if (!isset($hlt_color)) { + $hlt_color = $color_string; + } - for ($i=1; $i <= count($index_order); $i++) { - switch ($index_order[$i]) { + if ($where && $what) { + if(!isset($pos) || $pos == '') { + $pos = '0'; + } + $search_stuff = "&pos=" . urlencode($pos) + . "&where=" . urlencode($where) . '&what=' . urlencode($what); + } else { + $search_stuff = ''; + } + + $checked = ($checkall == 1) ? ' checked' : ''; + + if (sizeof($index_order)){ + foreach ($index_order as $index_order_part) { + switch ($index_order_part) { case 1: /* checkbox */ - echo "
$paginator_str | ". - "$msg_cnt_str |
";
- echo "
| |||
"; - - echo "\n | |||
";
- echo "
|