$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\"";
$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);
}
}
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')) {
$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;
$urlMailbox = urlencode($mailbox);
/*
. "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>'
. '<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";
}
. '&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