X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=5a36afb3cf4592f00629ca7b14c86a711f33c833;hp=9636d06de8f761ea9c9bbed5a13575db9e4c1346;hb=1fa67a32fff567626c417c81821e499a9665ce76;hpb=0c6d50f181b8cb37911fb4bc17ad2b6f429f91a9 diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 9636d06d..5a36afb3 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -1,22 +1,27 @@ \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 = ''; } @@ -102,33 +95,31 @@ } } - 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']) && @@ -148,17 +139,19 @@ 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; } - if (ereg('(1|2)',substr($msg['PRIORITY'],0,1))) { - echo "!\n"; - $stuff = true; + if ($default_use_priority) { + if (ereg('(1|2)',substr($msg['PRIORITY'],0,1))) { + echo "!\n"; + $stuff = true; + } + if (ereg('(5)',substr($msg['PRIORITY'],0,1))) { + echo "?\n"; + $stuff = true; + } } if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) { echo "D\n"; @@ -168,52 +161,58 @@ 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, $num_msgs, $start_msg, + $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 ($numMessages >= 1) { + /* If it is sorted... */ + if ($num_msgs >= 1) { if ($sort < 6) { - $id = range(1, $numMessages); + $id = range(1, $num_msgs); } else { // if it's not sorted - if ($startMessage + ($show_num - 1) < $numMessages) { - $endMessage = $startMessage + ($show_num-1); + if ($start_msg + ($show_num - 1) < $num_msgs) { + $end_msg = $start_msg + ($show_num-1); } else { - $endMessage = $numMessages; + $end_msg = $num_msgs; } - if ($endMessage < $startMessage) { - $startMessage = $startMessage - $show_num; - if ($startMessage < 1) - $startMessage = 1; + if ($end_msg < $start_msg) { + $start_msg = $start_msg - $show_num; + if ($start_msg < 1) { + $start_msg = 1; + } } - $real_startMessage = $numMessages - $startMessage + 1; - $real_endMessage = $numMessages - $startMessage - $show_num + 2; - if ($real_endMessage <= 0) - $real_endMessage = 1; + $real_startMessage = $num_msgs - $start_msg + 1; + $real_endMessage = $num_msgs - $start_msg - $show_num + 2; + if ($real_endMessage <= 0) { + $real_endMessage = 1; + } $id = array_reverse(range($real_endMessage, $real_startMessage)); } @@ -233,17 +232,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 = $start_msg + $show_num - 1; + if ($num_msgs < $show_num) { + $end_loop = $num_msgs; + } else if ($end > $num_msgs) { + $end_loop = $num_msgs - $start_msg + 1; + } else { + $end_loop = $show_num; + } } else { - $end = $numMessages; + $end = $num_msgs; $end_loop = $end; } + while ($j < $end_loop) { if (isset($date[$j])) { $date[$j] = ereg_replace(' ', ' ', $date[$j]); @@ -269,22 +270,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++; } @@ -294,12 +293,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) - { + || (isset($auto_expunge) && $auto_expunge)) && $sort != 6) { + /** Find and remove the ones that are deleted */ $i = 0; $j = 0; - while ($j < $numMessages) { + + while ($j < $num_msgs) { if (isset($messages[$j]['FLAG_DELETED']) && $messages[$j]['FLAG_DELETED'] == true) { $j++; continue; @@ -309,16 +309,17 @@ $i++; $j++; } - $numMessages = $i; + $num_msgs = $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) { + if ($num_msgs > 0 && ! $use_cache) { /** 0 = Date (up) 4 = Subject (up) ** 1 = Date (dn) 5 = Subject (dn) ** 2 = Name (up) @@ -343,192 +344,147 @@ } session_register('msort'); } - displayMessageArray($imapConnection, $numMessages, $startMessage, $msgs, $msort, $mailbox, $sort, $color,$show_num); - session_register('msgs'); + displayMessageArray($imapConnection, $num_msgs, $start_msg, $msgs, $msort, $mailbox, $sort, $color,$show_num); + session_register('msgs'); } - // generic function to convert the msgs array into an HTML table - function displayMessageArray($imapConnection, $numMessages, $startMessage, &$msgs, $msort, $mailbox, $sort, $color,$show_num) { + /******************************************************************/ + /* Generic function to convert the msgs array into an HTML table. */ + /******************************************************************/ + function displayMessageArray($imapConnection, $num_msgs, $start_msg, &$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); + if ($start_msg + ($show_num - 1) < $num_msgs) { + $end_msg = $start_msg + ($show_num-1); } else { - $endMessage = $numMessages; + $end_msg = $num_msgs; } - if ($endMessage < $startMessage) { - $startMessage = $startMessage - $show_num; - if ($startMessage < 1) - $startMessage = 1; + if ($end_msg < $start_msg) { + $start_msg = $start_msg - $show_num; + if ($start_msg < 1) { $start_msg = 1; } } - $nextGroup = $startMessage + $show_num; - $prevGroup = $startMessage - $show_num; $urlMailbox = urlencode($mailbox); do_hook('mailbox_index_before'); - $Message = ''; - if ($startMessage < $endMessage) { - $Message = _("Viewing messages") ." $startMessage ". _("to") ." $endMessage ($numMessages " . _("total") . ")\n"; - } elseif ($startMessage == $endMessage) { - $Message = _("Viewing message") ." $startMessage ($numMessages " . _("total") . ")\n"; - } + $msg_cnt_str = get_msgcnt_str($start_msg, $end_msg, $num_msgs); + $paginator_str = get_paginator_str($urlMailbox, $start_msg, $end_msg, $num_msgs, $show_num, $sort); - if ($sort == 6) { - $use = 0; - } else { - $use = 1; - } - $lMore = ''; - $rMore = ''; - if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) { - $lMore = "". _("Previous") . ''; - $rMore = "". _("Next") ."\n"; - } - elseif (($nextGroup > $numMessages) && ($prevGroup >= 0)) { - $lMore = "". _("Previous") . ''; - $rMore = ""._("Next")."\n"; - } - elseif (($nextGroup <= $numMessages) && ($prevGroup < 0)) { - $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 = ''; } - if (! isset($msg)) - $msg = ''; - mail_message_listing_beginning($imapConnection, - "move_messages.php?msg=$msg&mailbox=$urlMailbox&startMessage=$startMessage", - $mailbox, $sort, $Message, $lMore . $mMore . $rMore, $startMessage); + mail_message_listing_beginning + ($imapConnection, + "move_messages.php?msg=$msg&mailbox=$urlMailbox&startMessage=$start_msg", + $mailbox, $sort, $msg_cnt_str, $paginator_str, $start_msg); - $groupNum = $startMessage % ($show_num - 1); - $real_startMessage = $startMessage; + $groupNum = $start_msg % ($show_num - 1); + $real_startMessage = $start_msg; if ($sort == 6) { - if ($endMessage - $startMessage < $show_num - 1) { - $endMessage = $endMessage - $startMessage + 1; - $startMessage = 1; - } else if ($startMessage > $show_num) { - $endMessage = $show_num; - $startMessage = 1; + if ($end_msg - $start_msg < $show_num - 1) { + $end_msg = $end_msg - $start_msg + 1; + $start_msg = 1; + } else if ($start_msg > $show_num) { + $end_msg = $show_num; + $start_msg = 1; } } + $endVar = $end_msg + 1; - $endVar = $endMessage + 1; - - // loop through and display the info for each message. + /* Loop through and display the info for each message. */ $t = 0; // $t is used for the checkbox number - if ($numMessages == 0) { // if there's no messages in this folder - echo "

". _("THIS FOLDER IS EMPTY") ."
 
"; - } else if ($startMessage == $endMessage) { // if there's only one message in the box, handle it different. - if ($sort != 6) - $i = $startMessage; - else - $i = 1; - reset($msort); - $k = 0; - do { - $key = key($msort); - next($msort); - $k++; - } while (isset ($key) && ($k < $i)); - printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $real_startMessage, 0, 0); - } else { - $i = $startMessage; - - reset($msort); - $k = 0; - do { - $key = key($msort); - next($msort); - $k++; - } while (isset ($key) && ($k < $i)); - - do { - printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $real_startMessage, 0, 0); - $key = key($msort); - $t++; - $i++; - next($msort); - } while ($i && $i < $endVar); - } - echo ''; - - echo "\n"; - - echo ""; - echo '"; + } else if ($start_msg == $end_msg) { + /* If there's only one message in the box, handle it differently. */ + if ($sort != 6) { + $i = $start_msg; + } else { + $i = 1; + } - echo '
'; - echo "$lMore$mMore$rMore\n"; - if (!$startMessage) $startMessage=1; - ShowSelectAllLink($startMessage, $sort); + if ($num_msgs == 0) { // if there's no messages in this folder + echo "
\n"; + echo "

". _("THIS FOLDER IS EMPTY") ."
 
\n"; + echo "
'; /** End of message-list table */ + reset($msort); + $k = 0; + do { + $key = key($msort); + next($msort); + $k++; + } while (isset ($key) && ($k < $i)); + printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $real_startMessage, 0, 0); + } else { + $i = $start_msg; + + reset($msort); + $k = 0; + do { + $key = key($msort); + next($msort); + $k++; + } while (isset ($key) && ($k < $i)); + + do { + printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $real_startMessage, 0, 0); + $key = key($msort); + $t++; + $i++; + next($msort); + } while ($i && $i < $endVar); + } + + echo ''; + echo "" . + "" . + "
". + "
$paginator_str$msg_cnt_str
". + "". + ""; + /** End of message-list table */ do_hook('mailbox_index_after'); + echo "\n"; } - /* Displays the standard message list header. - * To finish the table, you need to do a ""; + /** + * Displays the standard message list header. To finish the table, + * you need to do a ""; + * * $moveURL is the URL to submit the delete/move form to * $mailbox is the current mailbox * $sort is the current sorting method (-1 for no sorting available [searches]) * $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, + $msg_cnt_str = '', $paginator = '', $start_msg = 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
\n"; - echo "'; + echo ""; /** The delete and move options */ echo "
"; - echo '
'; - echo "$More\n"; - ShowSelectAllLink($startMessage, $sort); - echo '
"; + echo " \n"; + echo " \n"; + echo ' \n"; + echo " \n"; + echo "
$paginator' . get_selectall_link($start_msg, $sort) . "$msg_cnt_str
\n"; + echo "
"; @@ -536,18 +492,17 @@ echo "\n
\n"; echo "\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n" . + " \n" . + " \n" . + " \n" . + " \n" . + " \n"; - echo " \n"; 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; } @@ -621,7 +578,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; @@ -632,54 +593,142 @@ $img = 'down_pointer.gif'; $which = 6; } + + /* Now that we have everything figured out, show the actual button. */ echo ' '; } - function ShowSelectAllLink($startMessage, $sort) - { + function get_selectall_link($start_msg, $sort) { global $checkall, $PHP_SELF, $what, $where, $mailbox; - // This code is from Philippe Mingo + $result = + ' \n
\n"; - echo '  ' . _("Move selected to:") . "\n"; - echo "  \n"; - echo '  ' . _("Transform Selected Messages") . ":  
\n"; - echo "
\n"; - echo '  
\n" . + '  ' . _("Move selected to:") . "\n" . + " \n" . + '  ' . _("Transform Selected Messages") . ":  
\n" . + "
\n" . + '  '; echo " \n"; echo "     \n"; - if (! $auto_expunge) { + if (!$auto_expunge) { echo '  '. _("mailbox") ." \n"; } echo " \n"; @@ -584,36 +538,39 @@ echo " BGCOLOR=\"$color[0]\">"; echo "
 '. _("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")."