From: philippe_mingo Date: Mon, 3 Dec 2001 19:32:09 +0000 (+0000) Subject: Added All messages display X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=bdfb67f8c88976632ff76bd2b40ad9c74f2c4136 Added All messages display Bunzo, tell me if this is what you want. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1832 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 20c740c1..8e80efa6 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -12,258 +12,246 @@ * $Id$ */ -/*****************************************************************/ -/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!! ***/ -/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION. ***/ -/*** + Base level indent should begin at left margin, as ***/ -/*** the first line of the function definition below. ***/ -/*** + All identation should consist of four space blocks ***/ -/*** + Tab characters are evil. ***/ -/*** + all comments should use "slash-star ... star-slash" ***/ -/*** style -- no pound characters, no slash-slash style ***/ -/*** + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD ***/ -/*** ALWAYS USE { AND } CHARACTERS!!! ***/ -/*** + Please use ' instead of ", when possible. Note " ***/ -/*** should always be used in _( ) function calls. ***/ -/*** Thank you for your help making the SM code more readable. ***/ -/*****************************************************************/ - define('PG_SEL_MAX', 10); /* Default value for page_selector_max. */ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start_msg, $where, $what) { - global $checkall; - global $color, $msgs, $msort; - global $sent_folder, $draft_folder; - global $default_use_priority; - global $message_highlight_list; - global $index_order; - - $color_string = $color[4]; - if ($GLOBALS['alt_index_colors']) { - if (!isset($GLOBALS["row_count"])) { + global $checkall; + global $color, $msgs, $msort; + global $sent_folder, $draft_folder; + global $default_use_priority; + global $message_highlight_list; + global $index_order; + + $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'; + } + $GLOBALS["row_count"]++; + if ($GLOBALS["row_count"] % 2) { + if (!isset($color[12])) $color[12] = '#EAEAEA'; $color_string = $color[12]; - } - } - $msg = $msgs[$key]; - - $senderName = htmlspecialchars(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 { - $flag = ''; - $flag_end = ''; - } - if (!isset($msg['FLAG_SEEN']) || ($msg['FLAG_SEEN'] == false)) { - $bold = ''; - $bold_end = ''; - } else { - $bold = ''; - $bold_end = ''; - } - - 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 { - $fontstr = ''; - $fontstr_end = ''; - } - - for ($i=0; $i < count($message_highlight_list); $i++) { - if (trim($message_highlight_list[$i]['value']) != '') { + } + } + $msg = $msgs[$key]; + + $senderName = htmlspecialchars(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 { + $flag = ''; + $flag_end = ''; + } + if (!isset($msg['FLAG_SEEN']) || ($msg['FLAG_SEEN'] == false)) { + $bold = ''; + $bold_end = ''; + } else { + $bold = ''; + $bold_end = ''; + } + + 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 { + $fontstr = ''; + $fontstr_end = ''; + } + + for ($i=0; $i < count($message_highlight_list); $i++) { + if (trim($message_highlight_list[$i]['value']) != '') { if ($message_highlight_list[$i]['match_type'] == 'to_cc') { - if (strpos('^^'.strtolower($msg['TO']), strtolower($message_highlight_list[$i]['value'])) || strpos('^^'.strtolower($msg['CC']), strtolower($message_highlight_list[$i]['value']))) { - $hlt_color = $message_highlight_list[$i]['color']; - continue; - } + if (strpos('^^'.strtolower($msg['TO']), strtolower($message_highlight_list[$i]['value'])) || strpos('^^'.strtolower($msg['CC']), strtolower($message_highlight_list[$i]['value']))) { + $hlt_color = $message_highlight_list[$i]['color']; + continue; + } } else if (strpos('^^'.strtolower($msg[strtoupper($message_highlight_list[$i]['match_type'])]),strtolower($message_highlight_list[$i]['value']))) { - $hlt_color = $message_highlight_list[$i]['color']; - continue; + $hlt_color = $message_highlight_list[$i]['color']; + continue; } - } - } - - if (!isset($hlt_color)) { - $hlt_color = $color_string; - } - - if ($where && $what) { - $search_stuff = '&where='.urlencode($where).'&what='.urlencode($what); - } - - $checked = ($checkall == 1 ?' checked' : ''); - - for ($i=1; $i <= count($index_order); $i++) { - switch ($index_order[$i]) { - case 1: /* checkbox */ - echo " \n"; - break; - case 2: /* from */ - 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"; - 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"; - if (isset($msg['FLAG_ANSWERED']) && - $msg['FLAG_ANSWERED'] == true) { - echo "A\n"; - $stuff = true; - } - if ($msg['TYPE0'] == 'multipart') { - 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"; - $stuff = true; - } - - if (!$stuff) echo " \n"; - echo "\n"; - break; - 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 to the user. - */ - function showMessagesForMailbox + } + } + + if (!isset($hlt_color)) { + $hlt_color = $color_string; + } + + if ($where && $what) { + $search_stuff = '&where='.urlencode($where).'&what='.urlencode($what); + } + + $checked = ($checkall == 1 ?' checked' : ''); + + for ($i=1; $i <= count($index_order); $i++) { + switch ($index_order[$i]) { + case 1: /* checkbox */ + echo " \n"; + break; + case 2: /* from */ + 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"; + 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"; + if (isset($msg['FLAG_ANSWERED']) && + $msg['FLAG_ANSWERED'] == true) { + echo "A\n"; + $stuff = true; + } + if ($msg['TYPE0'] == 'multipart') { + 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"; + $stuff = true; + } + + if (!$stuff) { + echo " \n"; + } + echo "\n"; + break; + 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 to the user. + */ +function showMessagesForMailbox ($imapConnection, $mailbox, $num_msgs, $start_msg, - $sort, $color,$show_num, $use_cache) { - global $msgs, $msort; - global $sent_folder, $draft_folder; - global $message_highlight_list; - global $auto_expunge; - - /* 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) || ($mailbox == $draft_folder)); - if (!$use_cache) { - /* If it is sorted... */ - if ($num_msgs >= 1) { + $sort, $color,$show_num, $use_cache) { + global $msgs, $msort; + global $sent_folder, $draft_folder; + global $message_highlight_list; + global $auto_expunge; + + /* 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) || ($mailbox == $draft_folder)); + if (!$use_cache) { + /* If it is sorted... */ + if ($num_msgs >= 1) { if ($sort < 6) { - $id = range(1, $num_msgs); + $id = range(1, $num_msgs); } else { - // if it's not sorted - if ($start_msg + ($show_num - 1) < $num_msgs) { - $end_msg = $start_msg + ($show_num-1); - } else { - $end_msg = $num_msgs; - } - - if ($end_msg < $start_msg) { - $start_msg = $start_msg - $show_num; - if ($start_msg < 1) { - $start_msg = 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)); + // if it's not sorted + if ($start_msg + ($show_num - 1) < $num_msgs) { + $end_msg = $start_msg + ($show_num-1); + } else { + $end_msg = $num_msgs; + } + + if ($end_msg < $start_msg) { + $start_msg = $start_msg - $show_num; + if ($start_msg < 1) { + $start_msg = 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)); } $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; + $from[] = $hdr->from; + $date[] = $hdr->date; + $subject[] = $hdr->subject; + $to[] = $hdr->to; + $priority[] = $hdr->priority; + $cc[] = $hdr->cc; + $size[] = $hdr->size; + $type[] = $hdr->type0; + } + } + + $j = 0; + if ($sort == 6) { + $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; } - } - - $j = 0; - if ($sort == 6) { - $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 { + } else { $end = $num_msgs; $end_loop = $end; - } + } - while ($j < $end_loop) { + while ($j < $end_loop) { if (isset($date[$j])) { $date[$j] = ereg_replace(' ', ' ', $date[$j]); $tmpdate = explode(' ', trim($date[$j])); } else { - $tmpdate = $date = array("","","","","",""); + $tmpdate = $date = array('', '', '', '', '', ''); } $messages[$j]['TIME_STAMP'] = getTimeStamp($tmpdate); @@ -280,494 +268,503 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start $messages[$j]['TYPE0'] = $type[$j]; # fix SUBJECT-SORT to remove Re: - $re_abbr = # Add more here! - 'vedr|sv|' . # Danish - 're|aw'; # English + $re_abbr = /* Add more here! */ + 'vedr|sv|' . /* Danish */ + 're|aw'; /* English */ - if (eregi( "^($re_abbr):[ ]*(.*)$", $messages[$j]['SUBJECT-SORT'], $regs)) - $messages[$j]['SUBJECT-SORT'] = $regs[2]; + 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; - } 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++; + if ($flags[$j][$num] == 'Deleted') { + $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++; } $j++; - } + } - /* 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) { + /* 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) { /** Find and remove the ones that are deleted */ $i = 0; $j = 0; while ($j < $num_msgs) { - if (isset($messages[$j]['FLAG_DELETED']) && $messages[$j]['FLAG_DELETED'] == true) { - $j++; - continue; - } - $msgs[$i] = $messages[$j]; - - $i++; - $j++; + if (isset($messages[$j]['FLAG_DELETED']) && $messages[$j]['FLAG_DELETED'] == true) { + $j++; + continue; + } + $msgs[$i] = $messages[$j]; + + $i++; + $j++; } $num_msgs = $i; - } else { - if (!isset($messages)) { - $messages = array(); - } - $msgs = $messages; - } - } - - // There's gotta be messages in the array for it to sort them. - if ($num_msgs > 0 && ! $use_cache) { - /** 0 = Date (up) 4 = Subject (up) - ** 1 = Date (dn) 5 = Subject (dn) - ** 2 = Name (up) - ** 3 = Name (dn) - **/ - session_unregister("msgs"); - if (($sort == 0) || ($sort == 1)) + } else { + if (!isset($messages)) { + $messages = array(); + } + $msgs = $messages; + } + } + + // There's gotta be messages in the array for it to sort them. + if ($num_msgs > 0 && ! $use_cache) { + /** 0 = Date (up) 4 = Subject (up) + ** 1 = Date (dn) 5 = Subject (dn) + ** 2 = Name (up) + ** 3 = Name (dn) + **/ + session_unregister("msgs"); + if (($sort == 0) || ($sort == 1)) $msort = array_cleave ($msgs, 'TIME_STAMP'); - elseif (($sort == 2) || ($sort == 3)) + elseif (($sort == 2) || ($sort == 3)) $msort = array_cleave ($msgs, 'FROM-SORT'); - elseif (($sort == 4) || ($sort == 5)) + elseif (($sort == 4) || ($sort == 5)) $msort = array_cleave ($msgs, 'SUBJECT-SORT'); - else // ($sort == 6) + else // ($sort == 6) $msort = $msgs; - if ($sort < 6) { + if ($sort < 6) { if ($sort % 2) { - asort($msort); + asort($msort); } else { - arsort($msort); + arsort($msort); } - } - session_register('msort'); - } - 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, $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; - - /* 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 ($start_msg + ($show_num - 1) < $num_msgs) { - $end_msg = $start_msg + ($show_num-1); - } else { - $end_msg = $num_msgs; - } - - if ($end_msg < $start_msg) { - $start_msg = $start_msg - $show_num; - if ($start_msg < 1) { $start_msg = 1; } - } - - $urlMailbox = urlencode($mailbox); - - do_hook('mailbox_index_before'); - - $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 (! isset($msg)) { - $msg = ''; - } - - 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 = $start_msg % ($show_num - 1); - $real_startMessage = $start_msg; - if ($sort == 6) { - if ($end_msg - $start_msg < $show_num - 1) { + } + session_register('msort'); + } + 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, $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; + + /* 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 ($start_msg + ($show_num - 1) < $num_msgs) { + $end_msg = $start_msg + ($show_num-1); + } else { + $end_msg = $num_msgs; + } + + if ($end_msg < $start_msg) { + $start_msg = $start_msg - $show_num; + if ($start_msg < 1) { $start_msg = 1; } + } + + $urlMailbox = urlencode($mailbox); + + do_hook('mailbox_index_before'); + + $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 (! isset($msg)) { + $msg = ''; + } + + 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 = $start_msg % ($show_num - 1); + $real_startMessage = $start_msg; + if ($sort == 6) { + if ($end_msg - $start_msg < $show_num - 1) { $end_msg = $end_msg - $start_msg + 1; $start_msg = 1; - } else if ($start_msg > $show_num) { + } else if ($start_msg > $show_num) { $end_msg = $show_num; $start_msg = 1; - } - } - $endVar = $end_msg + 1; - - /* Loop through and display the info for each message. */ - $t = 0; // $t is used for the checkbox number - if ($num_msgs == 0) { // if there's no messages in this folder - echo "\n". - "

". _("THIS FOLDER IS EMPTY") ."
 
\n". - ""; - } 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 = $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 ''. - "" . - "" . - "
". - "
$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 ""; - * - * $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 + } + } + $endVar = $end_msg + 1; + + /* Loop through and display the info for each message. */ + $t = 0; // $t is used for the checkbox number + if ($num_msgs == 0) { // if there's no messages in this folder + echo "\n". + "

". _("THIS FOLDER IS EMPTY") ."
 
\n". + ""; + } elseif ($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 = $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 ''. + "" . + "" . + "
". + "
$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 ""; + * + * $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, - $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 "\n". - "'. - "
". - "\n". - " \n". - ' \n". - " \n". - "
$paginator' . get_selectall_link($start_msg, $sort) . "$msg_cnt_str
\n". - '
\n". - "
\n". - "\n". - " \n" . - " \n" . - " \n" . - " \n" . - " \n" . - "
\n" . - '  ' . _("Move selected to:") . "\n" . - " \n" . - '  ' . _("Transform Selected Messages") . ":  
\n" . - "
\n" . - '  \n". + "'. + "'. - - "'. + + "
". + "\n". + " \n". + " \n". + "
$paginator"; + + if( $paginator <> ' ' ) { + echo ' | '; + } + + echo get_selectall_link($start_msg, $sort) . "$msg_cnt_str
\n". + '
\n". + "\n". + "\n". + " \n" . + " \n" . + " \n" . + " \n" . + " \n" . + " \n". - " \n". - " \n". - "
\n" . + '  ' . _("Move selected to:") . "\n" . + " \n" . + '  ' . _("Transform Selected Messages") . ":  
\n" . + "
\n" . + '  '. - "\n". - "    \n"; - if (!$auto_expunge) { - echo '  '. _("mailbox") ." \n"; - } - echo " \n". - " \n". - "  \n". - "
\n"; - do_hook('mailbox_form_before'); - echo '
". - "\n". + " \n". + " \n". + " \n". + "
   \n"; + if (!$auto_expunge) { + echo '  '. _("mailbox") ." \n"; + } + echo " \n". + " \n". + "  \n". + "
\n"; + do_hook('mailbox_form_before'); + echo '
". + "". - ""; - - /* Print the headers. */ - for ($i=1; $i <= count($index_order); $i++) { - switch ($index_order[$i]) { - case 1: /* checkbox */ - case 5: /* flags */ - echo ' '; - break; - - case 2: /* from */ - if (($mailbox == $sent_folder) - || ($mailbox == $draft_folder)) { - echo ' \n"; - break; - - case 3: /* date */ - echo ' \n"; - break; - - case 4: /* subject */ - echo ' \n"; - break; - - case 6: /* size */ - echo ' \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; - } else { - $img = 'down_pointer.gif'; - $which = 6; - } - - /* Now that we have everything figured out, show the actual button. */ - echo ' '; - } - - function get_selectall_link($start_msg, $sort) { - global $checkall, $PHP_SELF, $what, $where, $mailbox, $javascript_on; - - if ($javascript_on) { - $result = - ' ' . _("Toggle All") . "\n"; - } else { - $result .= "". + ""; + + /* Print the headers. */ + for ($i=1; $i <= count($index_order); $i++) { + switch ($index_order[$i]) { + case 1: /* checkbox */ + case 5: /* flags */ + echo ' '; + break; + + case 2: /* from */ + if (($mailbox == $sent_folder) + || ($mailbox == $draft_folder)) { + echo ' \n"; + break; + + case 3: /* date */ + echo ' \n"; + break; + + case 4: /* subject */ + echo ' \n"; + break; + + case 6: /* size */ + echo ' \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; + } else { + $img = 'down_pointer.gif'; + $which = 6; + } + + /* Now that we have everything figured out, show the actual button. */ + echo ' '; +} + +function get_selectall_link($start_msg, $sort) { + global $checkall, $PHP_SELF, $what, $where, $mailbox, $javascript_on; + + if ($javascript_on) { + $result = + '' . _("Toggle All") . "\n"; + } else { + $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); + if (isset($checkall) && $checkall == '1') { + $result .= '0'; + } else { + $result .= '1'; + } + + if (isset($where) && isset($what)) { + $result .= '&where=' . urlencode($where) + . '&what=' . urlencode($what); + } + + $result .= "\">"; + + if (isset($checkall) && ($checkall == '1')) { + $result .= _("Unselect All"); } else { - $result = '
'; + $result .= _("Select All"); } - /* Return our result string. */ - return ($result); + $result .= "\n"; } - /** - * 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, $color; + /* Return our final result. */ + return ($result); +} - $nextGroup = $start_msg + $show_num; - $prevGroup = $start_msg - $show_num; +/** +* This function computes the "Viewing Messages..." string. +*/ +function get_msgcnt_str($start_msg, $end_msg, $num_msgs) { + /* Compute the $msg_cnt_str. */ + $result = ''; + if ($start_msg < $end_msg) { + $result = sprintf(_("Viewing Messages: %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 = '
'; + } - if ($sort == 6) { - $use = 0; - } else { - $use = 1; + /* 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, $color; + + $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 .= ' | '; + } + if ($rMore <> '' || $lMore <> '' ) { + $rMore = "" . + _("All") . ' | ' . $rMore; + } + /* 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++; } - $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"; + $start_msg = min( $start_msg, $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; } - if ($lMore <> '') { - $lMore .= ' | '; + $mMore .= "$p "; + $i += $k; + while( $i <= $j ) { + $pg = intval( $i ); + $start = ( ($pg-1) * $show_num ) + 1; + $mMore .= "$pg "; + $i+=$k; } + $mMore .= ' | '; + } - /* 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_msg = min( $start_msg, $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. */ + if( $lMore . $mMore . $rMore == '' ) { + $lMore = ' '; + } + return ($lMore . $mMore . $rMore); +} + +function processSubject($subject) { + // Shouldn't ever happen -- caught too many times in the IMAP functions + if ($subject == '') + return _("(no subject)"); + + if (strlen($subject) <= 55) + return $subject; + + $ent_strlen=strlen($subject); + $trim_val=50; + $ent_offset=0; + // see if this is entities-encoded string + // If so, Iterate through the whole string, find out + // the real number of characters, and if more + // than 55, substr with an updated trim value. + while (($ent_loc = strpos($subject, '&', $ent_offset)) !== false && + ($ent_loc_end = strpos($subject, ';', $ent_loc)) !== false) + { + $trim_val += ($ent_loc_end-$ent_loc)+1; + $ent_strlen -= $ent_loc_end-$ent_loc; + $ent_offset = $ent_loc_end+1; + } - /* Return the resulting string. */ - if( $lMore . $mMore . $rMore == '' ) { - $lMore = ' '; - } - return ($lMore . $mMore . $rMore); - } - - function processSubject($subject) { - // Shouldn't ever happen -- caught too many times in the IMAP functions - if ($subject == '') - return _("(no subject)"); - - if (strlen($subject) <= 55) - return $subject; - - $ent_strlen=strlen($subject); - $trim_val=50; - $ent_offset=0; - // see if this is entities-encoded string - // If so, Iterate through the whole string, find out - // the real number of characters, and if more - // than 55, substr with an updated trim value. - while (($ent_loc = strpos($subject, '&', $ent_offset)) !== false && - ($ent_loc_end = strpos($subject, ';', $ent_loc)) !== false) - { - $trim_val += ($ent_loc_end-$ent_loc)+1; - $ent_strlen -= $ent_loc_end-$ent_loc; - $ent_offset = $ent_loc_end+1; - } - - if ($ent_strlen <= 55) - return $subject; - - return substr($subject, 0, $trim_val) . '...'; - } + if ($ent_strlen <= 55) + return $subject; + + return substr($subject, 0, $trim_val) . '...'; +} ?> diff --git a/src/right_main.php b/src/right_main.php index d4f64382..6e346257 100644 --- a/src/right_main.php +++ b/src/right_main.php @@ -36,6 +36,10 @@ require_once('../functions/display_messages.php'); /* Open a connection on the imap port (143) */ $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); +if( isset( $PG_SHOWNUM ) ) { + $show_num = $PG_SHOWNUM; +} + if (isset($newsort) && $newsort != $sort) { setPref($data_dir, $username, 'sort', $newsort); }
 '. _("To") .''; - } else { - echo ' '. _("From") .''; - } - - ShowSortButton($sort, $mailbox, 2, 3); - echo "'. _("Date") .''; - ShowSortButton($sort, $mailbox, 0, 1); - echo "'. _("Subject") .' '; - ShowSortButton($sort, $mailbox, 4, 5); - echo "' . _("Size")."
 '. _("To") .''; + } else { + echo ' '. _("From") .''; + } + + ShowSortButton($sort, $mailbox, 2, 3); + echo "'. _("Date") .''; + ShowSortButton($sort, $mailbox, 0, 1); + echo "'. _("Subject") .' '; + ShowSortButton($sort, $mailbox, 4, 5); + echo "' . _("Size")."