X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=825ce5284c74fe22d88eca5e869b5cadd8fefed0;hp=a4823676e6bab7fa0a30aff1fcb57c89c9a23a4a;hb=ff8a98e7e1d368c57b088522586bddcf68d443a5;hpb=ac53fb5645d47313e6efe3327b57f0e2a30327c1 diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index a4823676..825ce528 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -110,29 +110,41 @@ 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$subject$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"; + 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; @@ -150,7 +162,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; } } @@ -168,30 +180,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) { @@ -206,31 +203,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; } } @@ -330,15 +320,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); @@ -463,7 +453,7 @@ next($msort); } while ($i && $i < $endVar); } - echo ''; + echo ''; echo "\n"; @@ -555,8 +545,6 @@ echo " BGCOLOR=\"$color[0]\">"; echo ""; - $urlMailbox=urlencode($mailbox); - // Print the headers for ($i=1; $i <= count($index_order); $i++) { switch ($index_order[$i]) { @@ -567,69 +555,88 @@ 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; - - echo "\n + + ?> +\n"; } function processSubject($subject)