X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=f2aa0164ed50ea6e7bd40ecbd9564833d042862e;hb=e72fb4f7035aba66d1d2d010ee682c35d23835e7;hp=43836e1ca5973f043ca00e413a76e80b2d2a4e41;hpb=f1e6f580186aed693bd544e31895422f49642571;p=squirrelmail.git diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 43836e1c..f2aa0164 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -13,12 +13,12 @@ return; define('mailbox_display_php', true); - define( 'PG_SEL_MAX', 10 ); // Default value for page_selector_max + 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; @@ -33,7 +33,6 @@ $color_string = $color[12]; } } - $msg = $msgs[$key]; $senderName = sqimap_find_displayable_name($msg['FROM']); @@ -46,46 +45,35 @@ } $urlMailbox = urlencode($mailbox); $subject = processSubject($msg['SUBJECT']); - echo "\n"; - if (isset($msg['FLAG_FLAGGED']) && $msg['FLAG_FLAGGED'] == true) - { + if (isset($msg['FLAG_FLAGGED']) && ($msg['FLAG_FLAGGED'] == true)) { $flag = ""; $flag_end = ''; - } - else - { + } else { $flag = ''; $flag_end = ''; } - if (!isset($msg['FLAG_SEEN']) || $msg['FLAG_SEEN'] == false) - { + if (!isset($msg['FLAG_SEEN']) || ($msg['FLAG_SEEN'] == false)) { $bold = ''; $bold_end = ''; - } - else - { + } else { $bold = ''; $bold_end = ''; } - if ($mailbox == $sent_folder) - { + + if (($mailbox == $sent_folder) || ($mailbox == $draft_folder)) { $italic = ''; $italic_end = ''; - } - else - { + } else { $italic = ''; $italic_end = ''; } - if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) - { + + if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) { $fontstr = ""; $fontstr_end = ''; - } - else - { + } else { $fontstr = ''; $fontstr_end = ''; } @@ -104,30 +92,28 @@ } } - 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"; break; - case 5: # flags + case 5: /* flags */ $stuff = false; echo " \n"; if (isset($msg['FLAG_ANSWERED']) && @@ -170,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); @@ -208,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)); } @@ -235,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]); @@ -278,16 +272,13 @@ $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++; } @@ -297,11 +288,12 @@ /* 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) - { + || (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++; @@ -314,9 +306,10 @@ } $numMessages = $i; } else { - if (! isset($messages)) - $messages = array(); - $msgs = $messages; + if (!isset($messages)) { + $messages = array(); + } + $msgs = $messages; } } @@ -347,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); @@ -370,8 +363,7 @@ if ($endMessage < $startMessage) { $startMessage = $startMessage - $show_num; - if ($startMessage < 1) - $startMessage = 1; + if ($startMessage < 1) { $startMessage = 1; } } $nextGroup = $startMessage + $show_num; @@ -382,9 +374,9 @@ $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 ); } if ($sort == 6) { @@ -397,46 +389,46 @@ if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) { $lMore = "". _("Previous") . ''; $rMore = "". _("Next") ."\n"; - } - elseif (($nextGroup > $numMessages) && ($prevGroup >= 0)) { + } else if (($nextGroup > $numMessages) && ($prevGroup >= 0)) { $lMore = "". _("Previous") . ''; $rMore = ""._("Next")."\n"; - } - elseif (($nextGroup <= $numMessages) && ($prevGroup < 0)) { + } else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) { $lMore = ""._("Previous") . ''; $rMore = "". _("Next") ."\n"; } - if( $lMore <> '' ) - $lMore .= ' | '; + if ($lMore <> '') { + $lMore .= ' | '; + } - // Page selector block. Following code computes page links. + /* 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 ) { + 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 ) { + $i += $k; + } + $mMore .= "$p "; + $i += $k; + while( $i <= $j ) { $pg = intval( $i ); $start = ( ($pg-1) * $show_num ) + 1; $mMore .= "$pg "; $i+=$k; - } - $mMore .= ' | '; + } + $mMore .= ' | '; } if (! isset($msg)) @@ -456,7 +448,6 @@ $startMessage = 1; } } - $endVar = $endMessage + 1; // loop through and display the info for each message. @@ -496,20 +487,18 @@ next($msort); } while ($i && $i < $endVar); } - echo ''; - echo "\n"; - - echo ""; - echo "
'; - echo "$lMore$mMore$rMore"; - if (!$startMessage) - $startMessage=1; - ShowSelectAllLink($startMessage, $sort); - 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. @@ -520,20 +509,27 @@ * $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 ''; + echo "
$Message
" . + '
'; - echo ""; /** The delete and move options */ - echo "'; - echo ""; - echo "
"; + echo "
"; + + echo "
' . + "$More"; + ShowSelectAllLink($startMessage, $sort); + echo "
\n
"; + echo ""; echo "\n
\n"; echo "\n"; @@ -542,7 +538,6 @@ " \n" . - " \n" . " \n" . @@ -555,7 +550,7 @@ for ($i = 0; $i < count($boxes); $i++) { if (!in_array("noselect", $boxes[$i]['flags'])) { $box = $boxes[$i]['unformatted']; - $box2 = str_replace(' ', ' ', $boxes[$i]['unformatted-disp']); + $box2 = str_replace(' ', ' ', $boxes[$i]['formatted']); echo " \n"; } } @@ -563,27 +558,18 @@ echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo "
\n" . '  ' . _("Move selected to:") . "\n" . "
$Message
\n" . '  ' . _("Transform Selected Messages") . ":  
\n" . " 		   \n"; - if (! $auto_expunge) { + if (!$auto_expunge) { echo '  '. _("mailbox") ." \n"; } - echo " \n"; echo " \n"; echo "  \n"; - echo "
\n"; do_hook('mailbox_form_before'); echo '
\n"; - echo "
'; - echo "$More"; - ShowSelectAllLink($startMessage, $sort); - echo "
\n
"; echo ""; 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 ' \n"; break; - case 3: # date + case 3: /* date */ echo ' \n"; break; - case 4: # subject + case 4: /* subject */ echo ' \n"; break; - case 6: # size + case 6: /* size */ echo ' \n"; break; } @@ -631,9 +620,11 @@ 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; @@ -644,32 +635,29 @@ $img = 'down_pointer.gif'; $which = 6; } + + /* 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; - ?>  -
 '. _("To") .''; - else - echo ' '. _("From") .''; + } else { + echo ' '. _("From") .''; + } + ShowSortButton($sort, $mailbox, 2, 3); echo "'. _("Date") .''; ShowSortButton($sort, $mailbox, 0, 1); echo "'. _("Subject") .' '; ShowSortButton($sort, $mailbox, 4, 5); echo "' . _("Size")."