*/
require_once('../functions/strings.php');
+require_once('../functions/imap_utf7_decode_local.php');
+require_once('../functions/html.php');
/* Default value for page_selector_max. */
define('PG_SEL_MAX', 10);
$indent_array, /* indent subject by */
$pos, /* Search postion (if any) */
$thread_sort_messages, /* thread sorting on/off */
- $row_count;
+ $server_sort_order, /* sort value when using server-sorting */
+ $row_count,
+ $allow_server_sort; /* enable/disable server-side sorting */
$color_string = $color[4];
if ($GLOBALS['alt_index_colors']) {
case 4: /* subject */
echo " <td bgcolor=\"$hlt_color\">$bold";
if ($thread_sort_messages == 1) {
- echo str_repeat(" ",$indent_array[$msg["ID"]]);
- }
+ if (isset($indent_array[$msg["ID"]])) {
+ echo str_repeat(" ",$indent_array[$msg["ID"]]);
+ }
+ }
echo "<a href=\"read_body.php?mailbox=$urlMailbox&passed_id="
. $msg["ID"]
. "&startMessage=$start_msg&show_more=0$search_stuff\"";
$stuff = true;
}
if ($default_use_priority) {
- if ( ($msg['PRIORITY'][0] == 1) || ($msg['PRIORITY'][0] == 2) ) {
+ if ( ($msg['PRIORITY'] == 1) || ($msg['PRIORITY'] == 2) ) {
echo "<font color=\"$color[1]\">!</font>\n";
$stuff = true;
}
- if ($msg['PRIORITY'][0] == 5) {
+ if ($msg['PRIORITY'] == 5) {
echo "<font color=\"$color[8]\">?</font>\n";
$stuff = true;
}
$use_cache) {
global $msgs, $msort,
$sent_folder, $draft_folder,
- $message_highlight_list,
- $auto_expunge, $thread_sort_messages,
- $data_dir, $username;
- /* If autoexpunge is turned on, then do it now. */
-
+ $message_highlight_list,
+ $auto_expunge, $thread_sort_messages, $allow_server_sort,
+ $data_dir, $username, $server_sort_order;
+
+ /* if $start_msg is lower than $num_msgs, we probably deleted all messages
+ * in the last page. We need to re-adjust the start_msg
+ */
+
+ if($start_msg > $num_msgs) {
+ $start_msg -= $show_num;
+ if($start_msg < 1) {
+ $start_msg = 1;
+ }
+ }
+
+ /* This code and the next if() block check for
+ * server-side sorting methods. The $id array is
+ * formatted and $sort is set to 6 to disable
+ * SM internal sorting
+ */
if ($thread_sort_messages == 1) {
$id = get_thread_sort($imapConnection);
- $sort = 6;
- if ($start_msg + ($show_num - 1) < $num_msgs) {
- $end_msg = $start_msg + ($show_num-1);
- } else {
- $end_msg = $num_msgs;
- }
- $id = array_slice($id, ($start_msg-1), ($end_msg));
+ if ($id == 'no') {
+ echo '<b><small><center><font color=red>Thread sorting is not'.
+ ' supported by your IMAP server.<br>Please report this'.
+ ' to the system administrator.</center></small></b>';
+ $thread_sort_messages = 0;
+ $id = array();
}
+ else {
+ $sort = 6;
+ if ($start_msg + ($show_num - 1) < $num_msgs) {
+ $end_msg = $start_msg + ($show_num-1);
+ }
+ else {
+ $end_msg = $num_msgs;
+ }
+ $id = array_slice($id, ($start_msg-1), ($end_msg));
+ }
+ }
+
+ if ($allow_server_sort == TRUE && $thread_sort_messages != 1) {
+ $server_sort_order = $sort;
+ $id = sqimap_get_sort_order($imapConnection, $server_sort_order);
+ if ($id == 'no') {
+ echo '<b><small><center><font color=red>Server-side sorting'.
+ ' is not supported by your IMAP server.<br>Please report this'.
+ ' to the system administrator.</center></small></b>';
+ $sort = $server_sort_order;
+ $allow_server_sort = FALSE;
+ $id = array();
+ }
+ else {
+ $sort = 6;
+ if ($start_msg + ($show_num - 1) < $num_msgs) {
+ $end_msg = $start_msg + ($show_num-1);
+ }
+ else {
+ $end_msg = $num_msgs;
+ }
+ $id = array_slice($id, ($start_msg-1), ($end_msg));
+ }
+ }
+
+ /* If autoexpunge is turned on, then do it now. */
if ($auto_expunge == true) {
sqimap_mailbox_expunge($imapConnection, $mailbox, false);
}
if ($sort < 6 ) {
$id = range(1, $num_msgs);
}
- elseif ($thread_sort_messages != 1) {
+ elseif ($thread_sort_messages != 1 && $allow_server_sort != TRUE && $sort == 6) {
/* if it's not sorted */
if ($start_msg + ($show_num - 1) < $num_msgs){
$end_msg = $start_msg + ($show_num - 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);
+// $flags = sqimap_get_flags_list($imapConnection, $id, $issent);
if (sizeof($msgs_list)){
foreach ($msgs_list as $hdr) {
$from[] = $hdr->from;
$cc[] = $hdr->cc;
$size[] = $hdr->size;
$type[] = $hdr->type0;
+ $flag_deleted[] = $hdr->flag_deleted;
+ $flag_answered[] = $hdr->flag_answered;
+ $flag_seen[] = $hdr->flag_seen;
+ $flag_flagged[] = $hdr->flag_flagged;
}
}
}
$messages[$j]['CC'] = $cc[$j];
$messages[$j]['SIZE'] = $size[$j];
$messages[$j]['TYPE0'] = $type[$j];
+ $messages[$j]['FLAG_DELETED'] = $flag_deleted[$j];
+ $messages[$j]['FLAG_ANSWERED'] = $flag_answered[$j];
+ $messages[$j]['FLAG_SEEN'] = $flag_seen[$j];
+ $messages[$j]['FLAG_FLAGGED'] = $flag_flagged[$j];
+
/*
* fix SUBJECT-SORT to remove Re:
$messages[$j]['SUBJECT-SORT'], $matches)){
$messages[$j]['SUBJECT-SORT'] = $matches[2];
}
-
+/*
$num = 0;
while ($num < count($flags[$j])) {
if ($flags[$j][$num] == 'Deleted') {
}
$num++;
}
+*/
$j++;
+
}
/*
}
}
session_register('msort');
- } elseif ($thread_sort_messages == 1 ) {
+ } elseif ($thread_sort_messages == 1 || $allow_server_sort == TRUE) {
$msort = $msgs;
session_unregister('msgs');
session_register('msort');
global $folder_prefix, $sent_folder,
$imapServerAddress, $data_dir, $username, $use_mailbox_cache,
$index_order, $real_endMessage, $real_startMessage, $checkall,
- $indent_array, $thread_sort_messages;
+ $indent_array, $thread_sort_messages, $allow_server_sort, $server_sort_order;
/* If cache isn't already set, do it now. */
if (!session_is_registered('msgs')) {
}
echo '</table>'
- . "<table bgcolor=\"$color[9]\" width=\"100%\" border=0 cellpadding=1 "
- . "cellspacing=1><tr BGCOLOR=\"$color[4]\"><td>"
+ . html_tag( 'table', '',
+ "bgcolor=\"$color[9]\" width=\"100%\" border=0 cellpadding=1 cellspacing=1" )
+ . "<tr BGCOLOR=\"$color[4]\"><td>"
. "<table width=\"100%\" BGCOLOR=\"$color[4]\" border=0 cellpadding=1 "
. "cellspacing=0><tr><td>$paginator_str</td>"
- . "<td align=right>$msg_cnt_str</td></tr></table>"
+ . html_tag( 'td', 'right' ) . "$msg_cnt_str</td></tr></table>"
. "</td></tr></table>";
/* End of message-list table */
* $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 = '',
$start_msg = 1) {
global $color, $index_order, $auto_expunge, $move_to_trash, $base_uri,
$checkall, $sent_folder, $draft_folder, $thread_sort_messages,
- $allow_thread_sort;
+ $allow_thread_sort, $allow_server_sort, $server_sort_order,
+ $lastTargetMailbox;
+
$urlMailbox = urlencode($mailbox);
/*
* This is the beginning of the message list table.
* It wraps around all messages
*/
- echo "<FORM name=messageList method=post action=\"$moveURL\">\n"
+ echo "<FORM name=\"messageList\" method=post action=\"$moveURL\">\n"
. "<TABLE WIDTH=\"100%\" BORDER=\"0\" CELLPADDING=\"1\" "
. "CELLSPACING=\"0\">\n<TR BGCOLOR=\"$color[0]\"><TD>"
. " <TABLE BGCOLOR=\"$color[4]\" width=\"100%\" CELLPADDING=\"2\" "
. "CELLSPACING=\"0\" BORDER=\"0\"><TR>\n"
. " <TD ALIGN=LEFT>$paginator\n";
- if ($allow_thread_sort == TRUE) {
- if ($thread_sort_messages == 1 ) {
- $set_thread = 2;
- $thread_name = 'Unthread View';
- } elseif ($thread_sort_messages == 0) {
- $set_thread = 1;
- $thread_name = 'Thread View';
- }
- echo '| <a href=' . "$base_uri" . 'src/right_main.php?sort='
- . "$sort" . '&start_messages=1&set_thread=' . "$set_thread"
- . '&mailbox=' . urlencode($mailbox) . '>' . _("$thread_name")
- . '</a> ';
- }
-
echo " <TD ALIGN=RIGHT>$msg_cnt_str</TD>\n"
. " </TR></TABLE>\n"
. '</TD></TR>'
. "<TR><TD BGCOLOR=\"$color[0]\">\n"
- . "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0 cellpadding=0"
+ . "<TABLE BGCOLOR=\"$color[0]\" BORDER=0 cellpadding=0 "
. "cellspacing=0 width=\"100%\">\n"
. " <TR>\n"
. " <TD ALIGN=LEFT VALIGN=MIDDLE NOWRAP>\n"
foreach ($boxes as $boxes_part) {
if (!in_array('noselect', $boxes_part['flags'])) {
$box = $boxes_part['unformatted'];
- $box2 = str_replace(' ', ' ', $boxes_part['unformatted-disp']);
+ $box2 = str_replace(' ', ' ', imap_utf7_decode_local($boxes_part['unformatted-disp']));
if( $box2 == 'INBOX' ) {
$box2 = _("INBOX");
}
- echo " <OPTION VALUE=\"$box\">$box2</option>\n";
+ if ($lastTargetMailbox == $box) {
+ echo " <OPTION VALUE=\"$box\" SELECTED>$box2</OPTION>\n";
+ }
+ else {
+ echo " <OPTION VALUE=\"$box\">$box2</OPTION>\n";
+ }
}
}
echo ' </SELECT></TT> '
. '<INPUT TYPE="SUBMIT" NAME="markUnread" VALUE="' . _("Unread") . '">'
. '<INPUT TYPE="SUBMIT" VALUE="' . _("Delete") . '"> '
. "</TD>\n"
- . " </TR>\n"
- . "</TABLE>\n";
+ . " </TR>\n";
+
+ /* draws thread sorting links */
+ if ($allow_thread_sort == TRUE) {
+ if ($thread_sort_messages == 1 ) {
+ $set_thread = 2;
+ $thread_name = _("Unthread View");
+ }
+ elseif ($thread_sort_messages == 0) {
+ $set_thread = 1;
+ $thread_name = _("Thread View");
+ }
+ echo '<tr><td> <a href=' . "$base_uri" . 'src/right_main.php?sort='
+ . "$sort" . '&start_messages=1&set_thread=' . "$set_thread"
+ . '&mailbox=' . urlencode($mailbox) . '><small>' . $thread_name
+ . '</a></small> </td></tr>';
+ }
+
+ echo "</TABLE>\n";
do_hook('mailbox_form_before');
echo '</TD></TR>'
. "<TR><TD BGCOLOR=\"$color[0]\">"
}
echo " BGCOLOR=\"$color[0]\">"
. "<TR BGCOLOR=\"$color[5]\" ALIGN=\"center\">";
-
+ /* if using server sort we highjack the
+ * the $sort var and use $server_sort_order
+ * instead. but here we reset sort for a bit
+ * since its easy
+ */
+ if ($allow_server_sort == TRUE) {
+ $sort = $server_sort_order;
+ }
/* Print the headers. */
for ($i=1; $i <= count($index_order); $i++) {
switch ($index_order[$i]) {
} else {
echo ' <TD WIDTH="25%"><B>' . _("From") . '</B>';
}
- if ($thread_sort_messages != 1) {
+ if ($allow_thread_sort != TRUE || $thread_sort_messages != 1) {
ShowSortButton($sort, $mailbox, 2, 3);
}
echo "</TD>\n";
break;
case 3: /* date */
echo ' <TD NOWRAP WIDTH="5%"><B>' . _("Date") . '</B>';
- if ($thread_sort_messages != 1) {
+ if ($allow_thread_sort != TRUE || $thread_sort_messages != 1) {
ShowSortButton($sort, $mailbox, 0, 1);
}
echo "</TD>\n";
break;
case 4: /* subject */
echo ' <TD><B>' . _("Subject") . '</B> ';
- if ($thread_sort_messages != 1) {
+ if ($allow_thread_sort != TRUE || $thread_sort_messages != 1) {
ShowSortButton($sort, $mailbox, 4, 5);
}
echo "</TD>\n";
break;
}
}
+ /* if using server-sorting,
+ * send sort back to 6
+ */
+ if ($allow_server_sort == TRUE) {
+ $sort = 6;
+ }
echo "</TR>\n";
}
echo ' <a href="right_main.php?newsort=' . $which
. '&startMessage=1&mailbox=' . urlencode($mailbox)
. '"><IMG SRC="../images/' . $img
- . '" BORDER=0 WIDTH=12 HEIGHT=10></a>';
+ . '" BORDER=0 WIDTH=12 HEIGHT=10 ALT="sort"></a>';
}
function get_selectall_link($start_msg, $sort) {
. '&what=' . urlencode($what);
}
- if ($PG_SHOWNUM == 999999) {
- $result .= '&PG_SHOWNUM=999999';
- }
-
$result .= "\">";
if (isset($checkall) && ($checkall == '1')) {
}
}
} else if ($PG_SHOWNUM == 999999) {
- $pg_str = "<A HREF=\"right_main.php?use_mailbox_cache=$use"
- . "&startMessage=1&mailbox=$box\" TARGET=\"right\">"
- . _("Paginate") . '</A>' . $spc;
+ $pg_str = "<A HREF=\"right_main.php?PG_SHOWALL=0"
+ . "&use_mailbox_cache=$use&startMessage=1&mailbox=$box\" "
+ . "TARGET=\"right\">" ._("Paginate") . '</A>' . $spc;
}
/* If necessary, compute the 'show all' string. */
if (($prv_str != '') || ($nxt_str != '')) {
- $all_str = "<A HREF=\"right_main.php?PG_SHOWNUM=999999"
+ $all_str = "<A HREF=\"right_main.php?PG_SHOWALL=1"
. "&use_mailbox_cache=$use&startMessage=1&mailbox=$box\" "
. "TARGET=\"right\">" . _("Show All") . '</A>';
}
projects / squirrelmail.git / blobdiff