modified needed parameters for findPrevMessage and findNextMessage

[squirrelmail.git] / plugins / delete_move_next / setup.php

diff --git a/plugins/delete_move_next/setup.php b/plugins/delete_move_next/setup.php
index 01cb56a2f9ac8225d9a78c0b66fba5bf7c92acb2..409fee65db3b4494c9ef2fab4455fa03b08f768c 100644 (file)
--- a/plugins/delete_move_next/setup.php
+++ b/plugins/delete_move_next/setup.php
@@ -26,6 +26,28 @@ function squirrelmail_plugin_init_delete_move_next() {
 }
 
 
+/* fixes the sort_array for the prev_del/next_del links when 
+ * using server side sorting or thread sorting 
+ */
+
+function fix_sort_array () {
+    global $username, $data_dir, $allow_server_sort, $allow_thread_sort,
+    $mailbox, $imapConnection, $sort, $uid_support, $mbx_response;
+    switch (true) {
+      case ($allow_thread_sort && $thread_sort_messages):
+          $server_sort_array = get_thread_sort($imapConnection);
+         break;
+      case ($allow_server_sort):
+          $server_sort_array = sqimap_get_sort_order($imapConnection, $sort, $mbx_response);
+         break;
+      case ($uid_support):
+          $server_sort_array = sqimap_get_php_sort_order($imapConnecion, $mbx_response);
+         break;
+      default:
+          break;
+    }    
+}
+
 /*
  * Warning: this function relies on the internal representation of
  * of the message cache for the current mailbox. As such, it is fragile
@@ -34,6 +56,7 @@ function squirrelmail_plugin_init_delete_move_next() {
  * perhaps even as inline code to sqimap_mailbox_expunge(). In the 
  * meantime, you have been warned. [alane@geeksrus.net 2001/05/06]
  */
+
 function delete_move_del_arr_elem($arr, $index) {
     $tmp = array();
     $lim = count($arr);
@@ -59,14 +82,15 @@ function delete_move_show_msg_array() {
 function delete_move_expunge_from_all($id) {
     global $msgs, $msort, $sort, $imapConnection, $mailbox;
     
-    // delete_move_show_msg_array();
-    
+//    delete_move_show_msg_array();
     $delAt = -1;
     for ($i = 0; $i < count($msort); $i++) {
         if ($msgs[$i]['ID'] == $id) {
             $delAt = $i;
         } elseif ($msgs[$i]['ID'] > $id) {
-            $msgs[$i]['ID']--;
+           if (!$uid_support) {
+               $msgs[$i]['ID']--;
+           }
         }
     }
     
@@ -91,8 +115,10 @@ function delete_move_next_action() {
 
     if ($delete_id) {
         delete_move_next_delete();
+        fix_sort_array();
     } elseif ($move_id) {
         delete_move_next_move();
+        fix_sort_array();
     }
 
 }
@@ -120,21 +146,15 @@ function delete_move_next_read($currloc) {
     global $delete_move_next_formATtop, $delete_move_next_formATbottom,
            $color, $where, $what, $currentArrayIndex, $passed_id,
            $urlMailbox, $sort, $startMessage, $delete_id, $move_id,
-           $imapConnection, $auto_expunge, $move_to_trash, $server_sort_array,
-           $allow_thread_sort, $allow_server_sort, $thread_sort_messages;
+           $imapConnection, $auto_expunge, $move_to_trash, $mbx_response,
+          $uid_support;
 
     if (!(($where && $what) || ($currentArrayIndex == -1))) {
-        if ($allow_server_sort == true) {
-            $server_sort_array = sqimap_get_sort_order($imapConnection, $sort);
-        }
-        if ($allow_thread_sort == true && $thread_sort_messages == 1) {
-            $server_sort_array = get_thread_sort($imapConnection);
-        }
-        $next = findNextMessage();
-        $prev = findPreviousMessage();
+        $next = findNextMessage($passed_id);
+        $prev = findPreviousMessage($mbx_response['EXISTS'], $passed_id);
         $prev_if_del = $prev;
         $next_if_del = $next;
-        if ($auto_expunge || $move_to_trash) {
+        if (!$uid_support && ($auto_expunge || $move_to_trash)) {
             if ($prev_if_del > $passed_id) {
                 $prev_if_del--;
             }
@@ -150,16 +170,16 @@ function delete_move_next_read($currloc) {
              '<tr>'.
                  "<td bgcolor=\"$color[9]\" width=\"100%\" align=center><small>";
     
-        if ($prev > 0) {
-            echo "<a href=\"read_body.php?passed_id=$prev&amp;mailbox=$urlMailbox&amp;sort=$sort&amp;startMessage=$startMessage&amp;show_more=0\">" . _("Previous") . "</A>&nbsp;|&nbsp;\n";
-        } else {
-            echo _("Previous") . "&nbsp;|&nbsp;";
-        }
-        if ($next > 0) {
-            echo "<a href=\"read_body.php?passed_id=$next&amp;mailbox=$urlMailbox&amp;sort=$sort&amp;startMessage=$startMessage&amp;show_more=0\">" . _("Next") . "</A>&nbsp;|&nbsp;\n";
-        } else {
-            echo _("Next") . "&nbsp;|&nbsp;";
-        }
+//        if ($prev > 0) {
+//            echo "<a href=\"read_body.php?passed_id=$prev&amp;mailbox=$urlMailbox&amp;sort=$sort&amp;startMessage=$startMessage&amp;show_more=0\">" . _("Previous") . "</A>&nbsp;|&nbsp;\n";
+//        } else {
+//            echo _("Previous") . "&nbsp;|&nbsp;";
+//        }
+//        if ($next > 0) {
+//            echo "<a href=\"read_body.php?passed_id=$next&amp;mailbox=$urlMailbox&amp;sort=$sort&amp;startMessage=$startMessage&amp;show_more=0\">" . _("Next") . "</A>&nbsp;|&nbsp;\n";
+//        } else {
+//            echo _("Next") . "&nbsp;|&nbsp;";
+//        }
         if ($prev > 0){
             echo "<a href=\"read_body.php?passed_id=$prev_if_del&amp;mailbox=$urlMailbox&amp;sort=$sort&amp;startMessage=$startMessage&amp;show_more=0&amp;delete_id=$passed_id\">" . _("Delete & Prev") . "</a>" . "&nbsp;|&nbsp;\n";
         }
@@ -220,7 +240,7 @@ function delete_move_next_moveNextForm($next) {
          "<td bgcolor=\"$color[9]\" width=\"100%\" align=\"center\">".
            '<form action="read_body.php" method="post"><small>'.
             "<input type=\"hidden\" name=\"passed_id\" value=\"$next\">".
-            "<input type=\"hidden\" name=\"mailbox\" value=\"$urlMailbox\">".
+            "<input type=\"hidden\" name=\"mailbox\" value=\"".urldecode($urlMailbox)."\">".
             "<input type=\"hidden\" name=\"sort\" value=\"$sort\">".
             "<input type=\"hidden\" name=\"startMessage\" value=\"$startMessage\">".
             "<input type=\"hidden\" name=\"show_more\" value=\"0\">".
@@ -245,7 +265,7 @@ function delete_move_next_moveRightMainForm() {
     echo '<tr>' .      
             "<td bgcolor=\"$color[9]\" width=\"100%\" align=\"center\">".
             '<form action="right_main.php" method="post"><small>' .
-            "<input type=\"hidden\" name=\"mailbox\" value=\"$urlMailbox\">".
+            "<input type=\"hidden\" name=\"mailbox\" value=\"".urldecode($urlMailbox)."\">".
             "<input type=\"hidden\" name=\"sort\" value=\"$sort\">".
             "<input type=\"hidden\" name=\"startMessage\" value=\"$startMessage\">".
             "<input type=\"hidden\" name=\"move_id\" value=\"$passed_id\">".