X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=3cad43f9108f383c4b47d462956da2e547cfe4b7;hb=1a0e098373693d1b3d878622c5e86924585f3b5b;hp=b521590babe28e86bd5e58831d4635c316f8917c;hpb=a91b14d8a4ff44c8af0976949e9fd84cae1306dd;p=squirrelmail.git diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index b521590b..3cad43f9 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -1,13 +1,15 @@ $bold"; if (! isset($search_stuff)) { $search_stuff = ''; } - 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"; @@ -169,7 +174,7 @@ * and shows them to the user. */ function showMessagesForMailbox - ($imapConnection, $mailbox, $numMessages, $startMessage, + ($imapConnection, $mailbox, $num_msgs, $start_msg, $sort, $color,$show_num, $use_cache) { global $msgs, $msort; global $sent_folder, $draft_folder; @@ -185,26 +190,26 @@ $issent = (($mailbox == $sent_folder) || ($mailbox == $draft_folder)); if (!$use_cache) { /* If it is sorted... */ - if ($numMessages >= 1) { + 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; + $real_startMessage = $num_msgs - $start_msg + 1; + $real_endMessage = $num_msgs - $start_msg - $show_num + 2; if ($real_endMessage <= 0) { $real_endMessage = 1; } @@ -227,16 +232,16 @@ $j = 0; if ($sort == 6) { - $end = $startMessage + $show_num - 1; - if ($numMessages < $show_num) { - $end_loop = $numMessages; - } else if ($end > $numMessages) { - $end_loop = $numMessages - $startMessage + 1; + $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; } @@ -294,7 +299,7 @@ $i = 0; $j = 0; - while ($j < $numMessages) { + while ($j < $num_msgs) { if (isset($messages[$j]['FLAG_DELETED']) && $messages[$j]['FLAG_DELETED'] == true) { $j++; continue; @@ -304,7 +309,7 @@ $i++; $j++; } - $numMessages = $i; + $num_msgs = $i; } else { if (!isset($messages)) { $messages = array(); @@ -314,7 +319,7 @@ } // 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) @@ -339,14 +344,14 @@ } session_register('msort'); } - displayMessageArray($imapConnection, $numMessages, $startMessage, $msgs, $msort, $mailbox, $sort, $color,$show_num); + 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) { + function displayMessageArray($imapConnection, $num_msgs, $start_msg, &$msgs, $msort, $mailbox, $sort, $color, $show_num) { global $folder_prefix, $sent_folder; global $imapServerAddress, $data_dir, $username, $use_mailbox_cache; global $index_order, $real_endMessage, $real_startMessage, $checkall; @@ -355,146 +360,93 @@ 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 = sprintf( _("Viewing Messages: %s to %s (%s total)"), $startMessage, $endMessage, $numMessages ); - } elseif ($startMessage == $endMessage) { - $Message = _("Viewing Message: 1 (1 total)"); - } else { - $Message = '
'; - } + $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"; - } else if (($nextGroup > $numMessages) && ($prevGroup >= 0)) { - $lMore = "". _("Previous") . ''; - $rMore = ""._("Next")."\n"; - } else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) { - $lMore = ""._("Previous") . ''; - $rMore = "". _("Next") ."\n"; - } - if ($lMore <> '') { - $lMore .= ' | '; + if (! isset($msg)) { + $msg = ''; } - /* 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 .= ' | '; - } + mail_message_listing_beginning + ($imapConnection, + "move_messages.php?msg=$msg&mailbox=$urlMailbox&startMessage=$start_msg", + $mailbox, $sort, $msg_cnt_str, $paginator_str, $start_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); - - $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 = $endMessage + 1; + $endVar = $end_msg + 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); + if ($num_msgs == 0) { // if there's no messages in this folder + echo "\n"; + echo "

". _("THIS FOLDER IS EMPTY") ."
 
\n"; + 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; + } + + 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); + $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 "" . "" . - "
". - "
$lMore$mMore$rMore$Message
". + "". + "
$paginator_str$msg_cnt_str
". "". ""; /** End of message-list table */ @@ -503,8 +455,10 @@ 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]) @@ -513,25 +467,27 @@ */ function mail_message_listing_beginning ($imapConnection, $moveURL, $mailbox = '', $sort = -1, - $Message = '', $More = '', $startMessage = 1) { + $msg_cnt_str = '', $paginator = '', $start_msg = 1) { global $color, $index_order, $auto_expunge, $move_to_trash; global $checkall, $sent_folder, $draft_folder; $urlMailbox = urlencode($mailbox); - /** This is the beginning of the message list table. It wraps around all messages */ - echo "
$Message
" . - ''; + /**************************************************** + * This is the beginning of the message list table. * + * It wraps around all messages * + ****************************************************/ + echo "
\n"; - echo ""; + echo ""; /** The delete and move options */ - echo "
"; - - echo "
' . - "$More"; - ShowSelectAllLink($startMessage, $sort); - echo "
\n
"; + echo " \n"; + echo " \n"; + echo ' \n"; + echo " \n"; + echo "
$paginator' . get_selectall_link($start_msg, $sort) . "$msg_cnt_str
\n"; + echo "
"; + echo "
"; echo "\n
\n"; echo "\n"; @@ -645,10 +601,11 @@ '" BORDER=0 WIDTH=12 HEIGHT=10>'; } - function ShowSelectAllLink($startMessage, $sort) { + function get_selectall_link($start_msg, $sort) { global $checkall, $PHP_SELF, $what, $where, $mailbox; - echo ' \n\n"; + $result .= "%s to %s (%s total)"), $start_msg, $end_msg, $num_msgs); + } else if ($start_msg == $end_msg) { + $result = sprintf(_("Viewing Message: %s (1 total)"), $start_msg); + } else { + $result = '
'; + } + + /* Return our result string. */ + return ($result); + } + + /** + * This function computes the paginator string. + */ + function get_paginator_str + ($urlMailbox, $start_msg, $end_msg, $num_msgs, $show_num, $sort) { + global $username, $data_dir, $use_mailbox_cache; + + $nextGroup = $start_msg + $show_num; + $prevGroup = $start_msg - $show_num; + + if ($sort == 6) { + $use = 0; + } else { + $use = 1; + } + $lMore = ''; + $rMore = ''; + if (($nextGroup <= $num_msgs) && ($prevGroup >= 0)) { + $lMore = "". _("Previous") . ''; + $rMore = "". _("Next") ."\n"; + } else if (($nextGroup > $num_msgs) && ($prevGroup >= 0)) { + $lMore = "". _("Previous") . ''; + $rMore = ""._("Next")."\n"; + } else if (($nextGroup <= $num_msgs) && ($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') + && ($num_msgs > $show_num)) { + $j = intval( $num_msgs / $show_num ); // Max pages + $k = max( 1, $j / getPref($data_dir, $username, 'page_selector_max', PG_SEL_MAX ) ); + if ($num_msgs % $show_num <> 0 ) { + $j++; + } + $start_msgs = min( $start_msgs, $num_msgs ); + $p = intval( $start_msg / $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 .= ' | '; + } + + /* Return the resulting string. */ + return ($lMore . $mMore . $rMore); + } + + function processSubject($subject) { // Shouldn't ever happen -- caught too many times in the IMAP functions if ($subject == '') return _("(no subject)");