X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=cad21478b0d36251a303367a4583e5744b4f59e1;hb=c6b144ddc3e49b4dab25f68477d6e9110db31879;hp=ed3bf981cea18c8d67dc06888251f373d531cdf2;hpb=b3b103cbbfc8cf14f79421b269ade59e6264ee10;p=squirrelmail.git diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index ed3bf981..cad21478 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,20 +20,28 @@ global $message_highlight_list; global $index_order; - 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]; - } else { - $color_string = $color[4]; + $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 = processSubject($msg['SUBJECT']); @@ -68,7 +78,7 @@ $italic_end = ''; } if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) - { + { $fontstr = ""; $fontstr_end = ''; } @@ -107,29 +117,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"; 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; @@ -147,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; } } @@ -165,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) { @@ -203,31 +210,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; } } @@ -236,13 +236,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]); @@ -326,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); @@ -351,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'); @@ -383,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; @@ -459,19 +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; ShowSelectAllLink($startMessage, $sort); - echo '
'; - echo ''; - echo ''; /** End of message-list table */ + echo ''; /** End of message-list table */ do_hook('mailbox_index_after'); } @@ -503,13 +530,12 @@ echo "$More\n"; ShowSelectAllLink($startMessage, $sort); - echo ''; - echo ''; + echo ''; /** The delete and move options */ echo ""; - echo "\n\n\n
\n"; + echo "\n\n"; echo "\n"; echo " \n"; echo " '; echo "
\n"; @@ -542,11 +568,15 @@ echo '
"; - echo ""; + echo "
"; echo ""; - $urlMailbox=urlencode($mailbox); - // Print the headers for ($i=1; $i <= count($index_order); $i++) { switch ($index_order[$i]) { @@ -557,69 +587,88 @@ case 2: # from if ($mailbox == $sent_folder) - echo ' \n"; - elseif ($sort == 3) - echo " \n"; - elseif ($sort != -1) - echo " \n"; - echo ""; + echo ' \n"; break; case 3: # date - echo ' \n"; - elseif ($sort == 1) - echo " \n"; - elseif ($sort == 6) - echo " \n"; - elseif ($sort != -1) - echo " \n"; - echo ''; + echo ' \n"; break; case 4: # subject - echo ' \n"; - elseif ($sort == 5) - echo " \n"; - elseif ($sort != -1) - echo " \n"; - echo ""; + echo ' \n"; break; - case 6: # size - echo ' \n"; + case 6: # size + echo ' \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)
'. _("To") .''; + echo ' '. _("To") .''; else - echo ' '. _("From") .''; - - if ($sort == 2) - echo " '. _("From") .''; + ShowSortButton($sort, $mailbox, 2, 3); + echo "'. _("Date") .''; - if ($sort == 0) - echo " '. _("Date") .''; + ShowSortButton($sort, $mailbox, 0, 1); + echo "'. _("Subject") ."\n"; - if ($sort == 4) - echo " '. _("Subject") .' '; + ShowSortButton($sort, $mailbox, 4, 5); + echo "' . _("Size")."' . _("Size")."