X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=f2aa0164ed50ea6e7bd40ecbd9564833d042862e;hp=d297debbd461faadb77e3db695c9aa1c4858e076;hb=e72fb4f7035aba66d1d2d010ee682c35d23835e7;hpb=4333449ddbb4022923ffcb0413cfed9294d788a2 diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index d297debb..f2aa0164 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -13,10 +13,12 @@ return; define('mailbox_display_php', true); + define('PG_SEL_MAX', 10); /* Default value for page_selector_max. */ + function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, $where, $what) { global $checkall; global $color, $msgs, $msort; - global $sent_folder; + global $sent_folder, $draft_folder; global $message_highlight_list; global $index_order; @@ -27,56 +29,51 @@ } $GLOBALS["row_count"]++; if ($GLOBALS["row_count"] % 2) { - if (!isset($color[12])) $color[12] = "#EAEAEA"; + 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']); - echo "\n"; - if (isset($msg['FLAG_FLAGGED']) && $msg['FLAG_FLAGGED'] == true) - { - $flag = ""; - $flag_end = ''; - } - else - { + 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 - { + if (!isset($msg['FLAG_SEEN']) || ($msg['FLAG_SEEN'] == false)) { + $bold = ''; + $bold_end = ''; + } else { $bold = ''; $bold_end = ''; } - if ($mailbox == $sent_folder) - { - $italic = ''; - $italic_end = ''; - } - else - { + + 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 - { + + if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) { + $fontstr = ""; + $fontstr_end = ''; + } else { $fontstr = ''; $fontstr_end = ''; } @@ -95,45 +92,54 @@ } } - if (!isset($hlt_color)) - $hlt_color = $color_string; + if (!isset($hlt_color)) { + $hlt_color = $color_string; + } if ($where && $what) { $search_stuff = '&where='.urlencode($where).'&what='.urlencode($what); } - if ($checkall == 1) - $checked = ' checked'; - else - $checked = ''; - + $checked = ($checkall == 1 ?' checked' : ''); + for ($i=1; $i <= count($index_order); $i++) { switch ($index_order[$i]) { - case 1: # checkbox + case 1: /* checkbox */ echo " \n"; break; - case 2: # from + case 2: /* from */ echo " $italic$bold$flag$fontstr$senderName$fontstr_end$flag_end$bold_end$italic_end\n"; break; - case 3: # date + case 3: /* date */ echo "
$bold$flag$fontstr".$msg["DATE_STRING"]."$fontstr_end$flag_end$bold_end
\n"; break; - case 4: # subject + 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 + case 5: /* flags */ $stuff = false; echo " \n"; - if (isset($msg['FLAG_ANSWERED']) && + 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,31 +156,35 @@ if (!$stuff) echo " \n"; echo "\n"; break; - case 6: # size + case 6: /* size */ echo " $bold$fontstr".show_readable_size($msg['SIZE'])."$fontstr_end$bold_end\n"; break; } } - - echo "\n"; } /** - ** This function loops through a group of messages in the mailbox and shows them - **/ - function showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color,$show_num, $use_cache) { + * This function loops through a group of messages in the mailbox + * and shows them to the user. + */ + function showMessagesForMailbox + ($imapConnection, $mailbox, $numMessages, $startMessage, + $sort, $color,$show_num, $use_cache) { global $msgs, $msort; - global $sent_folder; + global $sent_folder, $draft_folder; global $message_highlight_list; global $auto_expunge; - if ($auto_expunge == true) sqimap_mailbox_expunge($imapConnection, $mailbox, false); + /* If autoexpunge is turned on, then do it now. */ + if ($auto_expunge == true) { + sqimap_mailbox_expunge($imapConnection, $mailbox, false); + } sqimap_mailbox_select($imapConnection, $mailbox); - $issent = ($mailbox == $sent_folder); + $issent = (($mailbox == $sent_folder) || ($mailbox == $draft_folder)); if (!$use_cache) { - // if it's sorted + /* If it is sorted... */ if ($numMessages >= 1) { if ($sort < 6) { $id = range(1, $numMessages); @@ -188,14 +198,16 @@ if ($endMessage < $startMessage) { $startMessage = $startMessage - $show_num; - if ($startMessage < 1) - $startMessage = 1; + if ($startMessage < 1) { + $startMessage = 1; + } } $real_startMessage = $numMessages - $startMessage + 1; $real_endMessage = $numMessages - $startMessage - $show_num + 2; - if ($real_endMessage <= 0) - $real_endMessage = 1; + if ($real_endMessage <= 0) { + $real_endMessage = 1; + } $id = array_reverse(range($real_endMessage, $real_startMessage)); } @@ -215,17 +227,19 @@ $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; + $end = $startMessage + $show_num - 1; + if ($numMessages < $show_num) { + $end_loop = $numMessages; + } else if ($end > $numMessages) { + $end_loop = $numMessages - $startMessage + 1; + } else { + $end_loop = $show_num; + } } else { $end = $numMessages; $end_loop = $end; } + while ($j < $end_loop) { if (isset($date[$j])) { $date[$j] = ereg_replace(' ', ' ', $date[$j]); @@ -251,22 +265,20 @@ $re_abbr = # Add more here! 'vedr|sv|' . # Danish 're|aw'; # English - if (eregi("^($re_abbr):[ ]*(.*)$", $messages[$j]['SUBJECT-SORT'], $regs)) + + if (eregi( "^($re_abbr):[ ]*(.*)$", $messages[$j]['SUBJECT-SORT'], $regs)) $messages[$j]['SUBJECT-SORT'] = $regs[2]; $num = 0; while ($num < count($flags[$j])) { if ($flags[$j][$num] == 'Deleted') { - $messages[$j]['FLAG_DELETED'] = true; - } - elseif ($flags[$j][$num] == 'Answered') { - $messages[$j]['FLAG_ANSWERED'] = true; - } - elseif ($flags[$j][$num] == 'Seen') { - $messages[$j]['FLAG_SEEN'] = true; - } - elseif ($flags[$j][$num] == 'Flagged') { - $messages[$j]['FLAG_FLAGGED'] = true; + $messages[$j]['FLAG_DELETED'] = true; + } else if ($flags[$j][$num] == 'Answered') { + $messages[$j]['FLAG_ANSWERED'] = true; + } else if ($flags[$j][$num] == 'Seen') { + $messages[$j]['FLAG_SEEN'] = true; + } else if ($flags[$j][$num] == 'Flagged') { + $messages[$j]['FLAG_FLAGGED'] = true; } $num++; } @@ -275,12 +287,13 @@ /* Only ignore messages flagged as deleted if we are using a * trash folder or auto_expunge */ - if (((isset($move_to_trash) && $move_to_trash) - || (isset($auto_expunge) && $auto_expunge)) && $sort != 6) - { + 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 (isset($messages[$j]['FLAG_DELETED']) && $messages[$j]['FLAG_DELETED'] == true) { $j++; @@ -293,11 +306,12 @@ } $numMessages = $i; } else { - if (! isset($messages)) - $messages = array(); - $msgs = $messages; + if (!isset($messages)) { + $messages = array(); + } + $msgs = $messages; } - } + } // There's gotta be messages in the array for it to sort them. if ($numMessages > 0 && ! $use_cache) { @@ -326,20 +340,20 @@ session_register('msort'); } displayMessageArray($imapConnection, $numMessages, $startMessage, $msgs, $msort, $mailbox, $sort, $color,$show_num); - session_register('msgs'); + session_register('msgs'); } - // generic function to convert the msgs array into an HTML table + /******************************************************************/ + /* Generic function to convert the msgs array into an HTML table. */ + /******************************************************************/ function displayMessageArray($imapConnection, $numMessages, $startMessage, &$msgs, $msort, $mailbox, $sort, $color,$show_num) { global $folder_prefix, $sent_folder; - global $imapServerAddress; + global $imapServerAddress, $data_dir, $username, $use_mailbox_cache; 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'); - if (!session_is_registered('msort')) - session_register('msort'); + + /* If cache isn't already set, do it now. */ + if (!session_is_registered('msgs')) { session_register('msgs'); } + if (!session_is_registered('msort')) { session_register('msort'); } if ($startMessage + ($show_num - 1) < $numMessages) { $endMessage = $startMessage + ($show_num-1); @@ -349,8 +363,7 @@ if ($endMessage < $startMessage) { $startMessage = $startMessage - $show_num; - if ($startMessage < 1) - $startMessage = 1; + if ($startMessage < 1) { $startMessage = 1; } } $nextGroup = $startMessage + $show_num; @@ -361,35 +374,68 @@ $Message = ''; if ($startMessage < $endMessage) { - $Message = _("Viewing messages") ." $startMessage ". _("to") ." $endMessage ($numMessages " . _("total") . ")\n"; + $Message = sprintf( _("Viewing Messages: %s to %s (%s total)"), $startMessage, $endMessage, $numMessages ); } elseif ($startMessage == $endMessage) { - $Message = _("Viewing message") ." $startMessage ($numMessages " . _("total") . ")\n"; + $Message = sprintf( _("Viewing Message: %s to %s (%s total)"), $startMessage, $endMessage, $numMessages ); } - $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"; + } else if (($nextGroup > $numMessages) && ($prevGroup >= 0)) { + $lMore = "". _("Previous") . ''; + $rMore = ""._("Next")."\n"; + } else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) { + $lMore = ""._("Previous") . ''; + $rMore = "". _("Next") ."\n"; } - elseif (($nextGroup > $numMessages) && ($prevGroup >= 0)) { - $More = "". _("Previous") ." | \n"; - $More .= ""._("Next")."\n"; + if ($lMore <> '') { + $lMore .= ' | '; } - elseif (($nextGroup <= $numMessages) && ($prevGroup < 0)) { - $More = ""._("Previous")." | \n"; - $More .= "". _("Next") ."\n"; + + /* Page selector block. Following code computes page links. */ + $mMore = ''; + if (!getPref($data_dir, $username, 'page_selector') + && ($numMessages > $show_num)) { + $j = intval( $numMessages / $show_num ); // Max pages + $k = max( 1, $j / getPref($data_dir, $username, 'page_selector_max', PG_SEL_MAX ) ); + if ($numMessages % $show_num <> 0 ) { + $j++; + } + $startMessage = min( $startMessage, $numMessages ); + $p = intval( $startMessage / $show_num ) + 1; + $i = 1; + while( $i < $p ) { + $pg = intval( $i ); + $start = ( ($pg-1) * $show_num ) + 1; + $mMore .= "$pg "; + $i += $k; + } + $mMore .= "$p "; + $i += $k; + while( $i <= $j ) { + $pg = intval( $i ); + $start = ( ($pg-1) * $show_num ) + 1; + $mMore .= "$pg "; + $i+=$k; + } + $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; @@ -402,7 +448,6 @@ $startMessage = 1; } } - $endVar = $endMessage + 1; // loop through and display the info for each message. @@ -442,21 +487,18 @@ next($msort); } while ($i && $i < $endVar); } - echo ''; - - echo "\n"; - echo ""; - echo '
'; - echo "$More\n"; - if (!$startMessage) $startMessage=1; - ShowSelectAllLink($startMessage, $sort); - - echo '
'; - echo ''; - echo ''; /** End of message-list table */ + echo ''; + echo "" . + "" . + "
". + "
$lMore$mMore$rMore$Message
". + "". + ""; + /** End of message-list table */ do_hook('mailbox_index_after'); + echo "\n"; } /* Displays the standard message list header. @@ -467,59 +509,63 @@ * $Message is a message that is centered on top of the list * $More is a second line that is left aligned */ - function mail_message_listing_beginning($imapConnection, $moveURL, - $mailbox = '', $sort = -1, $Message = '', $More = '', $startMessage = 1) - { + function mail_message_listing_beginning + ($imapConnection, $moveURL, $mailbox = '', $sort = -1, + $Message = '', $More = '', $startMessage = 1) { global $color, $index_order, $auto_expunge, $move_to_trash; - global $checkall, $sent_folder; + global $checkall, $sent_folder, $draft_folder; $urlMailbox = urlencode($mailbox); - /** This is the beginning of the message list table. It wraps around all messages */ - echo ''; - if ($Message) - { - echo "\n"; - } + /** This is the beginning of the message list table. It wraps around all messages */ + echo "
$Message
" . + '
$Message
'; - echo "'; + echo "
"; - echo '
'; - echo "$More\n"; - ShowSelectAllLink($startMessage, $sort); + echo "
"; - echo '
'; - echo '
' . + "$More"; + ShowSelectAllLink($startMessage, $sort); + echo "
\n"; /** The delete and move options */ - echo ""; + echo ""; - echo "\n\n\n
\n"; + echo "\n\n"; echo "\n"; - echo " \n"; - echo " \n" . + " \n" . + " \n" . + " \n" . + " \n" . + " \n"; - echo " \n"; echo " \n"; - echo "
\n"; - - echo ' '. _("Move selected to:") .''; - echo '
\n" . + '  ' . _("Move selected to:") . "\n" . + " \n" . + '  ' . _("Transform Selected Messages") . ":  
\n" . + "
\n" . + '  '; - echo ' \n"; + echo ' '; + echo " \n"; echo " \n"; - if (! $auto_expunge) { - echo '  '. _("mailbox") ."  \n"; + echo "    \n"; + if (!$auto_expunge) { + echo '  '. _("mailbox") ." \n"; } - echo "  ". _("checked messages") ."\n"; + echo " \n"; + echo " \n"; + echo "  \n"; echo "
\n"; do_hook('mailbox_form_before'); echo ''; @@ -534,82 +580,84 @@ echo " BGCOLOR=\"$color[0]\">"; echo ""; - // Print the headers + /* Print the headers. */ for ($i=1; $i <= count($index_order); $i++) { switch ($index_order[$i]) { - case 1: # checkbox - case 5: # flags + case 1: /* checkbox */ + case 5: /* flags */ echo '  '; break; - - case 2: # from - if ($mailbox == $sent_folder) + + case 2: /* from */ + if (($mailbox == $sent_folder) + || ($mailbox == $draft_folder)) { echo ' '. _("To") .''; - else - echo ' '. _("From") .''; - ShowSortButton($sort, $mailbox, 2, 3); + } else { + echo ' '. _("From") .''; + } + + ShowSortButton($sort, $mailbox, 2, 3); echo "\n"; break; - - case 3: # date + + case 3: /* date */ echo ' '. _("Date") .''; - ShowSortButton($sort, $mailbox, 0, 1); + ShowSortButton($sort, $mailbox, 0, 1); echo "\n"; break; - - case 4: # subject + + case 4: /* subject */ echo ' '. _("Subject") .' '; - ShowSortButton($sort, $mailbox, 4, 5); + ShowSortButton($sort, $mailbox, 4, 5); echo "\n"; break; - - case 6: # size + + case 6: /* size */ echo ' ' . _("Size")."\n"; break; } } echo "\n"; } - + + /*******************************************************************/ + /* This function shows the sort button. Isn't this a good comment? */ + /*******************************************************************/ function ShowSortButton($sort, $mailbox, $Up, $Down) { + /* Figure out which image we want to use. */ if ($sort != $Up && $sort != $Down) { $img = 'sort_none.gif'; $which = $Up; } elseif ($sort == $Up) { $img = 'up_pointer.gif'; - $which = $Down; + $which = $Down; } else { $img = 'down_pointer.gif'; - $which = 6; + $which = 6; } - echo ' '; + + /* Now that we have everything figured out, show the actual button. */ + echo ' '; } - - function ShowSelectAllLink($startMessage, $sort) - { + + function ShowSelectAllLink($startMessage, $sort) { global $checkall, $PHP_SELF, $what, $where, $mailbox; - // This code is from Philippe Mingo - - ?> -