make del_move_next work again

[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 293cd35b440b1f8e17a84b494756f582ec8c59b7..d0a5957fc2d31f5747dedfc906f3d9efd89bbff7 100644 (file)
--- a/plugins/delete_move_next/setup.php
+++ b/plugins/delete_move_next/setup.php
@@ -32,14 +32,21 @@ function squirrelmail_plugin_init_delete_move_next() {
 
 function fix_sort_array () {
     global $username, $data_dir, $allow_server_sort, $allow_thread_sort,
-    $mailbox, $imapConnection, $sort;
-    if ($allow_server_sort == true) {
-        $server_sort_array = sqimap_get_sort_order($imapConnection, $sort);
-    }
-    $thread_sort_messages = getPref($username, $data_dir, "thread_$mailbox");
-    if ($allow_thread_sort == true && $thread_sort_messages == 1) {
-        $server_sort_array = get_thread_sort($imapConnection);
-    }
+    $thread_sort_messages, 
+    $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;
+    }    
 }
 
 /*
@@ -53,19 +60,18 @@ function fix_sort_array () {
 
 function delete_move_del_arr_elem($arr, $index) {
     $tmp = array();
-    $lim = count($arr);
     $j = 0;
-    for ($i = 0; $i < $lim; $i++) {
-        if ($i != $index) {
-            $tmp[$j++] = $arr[$i];
-        }
+    foreach ($arr as $v) {
+        if ($j != $index) {
+          $tmp[] = $v;
+        }
+        $j++;
     }
     return $tmp;
 }
 
 function delete_move_show_msg_array() {
     global $msort, $msgs;
-    
     $keys = array_keys($msort);
     for ($i = 0; $i < count($keys); $i++) {
         echo '<p>key ' . $keys[$i] . ' msgid ' . $msgs[$keys[$i]]['ID'] . '</p>';
@@ -74,22 +80,20 @@ function delete_move_show_msg_array() {
 
 
 function delete_move_expunge_from_all($id) {
-    global $msgs, $msort, $sort, $imapConnection, $mailbox;
-    
-    // delete_move_show_msg_array();
-    
+    global $msgs, $msort, $sort, $imapConnection, $mailbox, $uid_support;
     $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']--;
+           }
         }
     }
     
     $msgs = delete_move_del_arr_elem($msgs, $delAt);
     $msort = delete_move_del_arr_elem($msort, $delAt);
-    
     if ($sort < 6) {
         if ($sort % 2) {
             asort($msort);
@@ -97,6 +101,8 @@ function delete_move_expunge_from_all($id) {
             arsort($msort);
         }
     }
+    session_register('msgs');
+    session_register('msort');
     
     sqimap_mailbox_expunge($imapConnection, $mailbox, true);
 }
@@ -138,15 +144,18 @@ function delete_move_next_read_b() {
 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;
+           $mailbox, $sort, $startMessage, $delete_id, $move_id,
+           $imapConnection, $auto_expunge, $move_to_trash, $mbx_response,
+          $uid_support;
+
+    $urlMailbox = urlencode($mailbox);
 
     if (!(($where && $what) || ($currentArrayIndex == -1))) {
-        $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--;
             }
@@ -162,16 +171,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";
         }
@@ -225,14 +234,14 @@ function get_move_target_list() {
 function delete_move_next_moveNextForm($next) {
 
     global $color, $where, $what, $currentArrayIndex, $passed_id,
-           $urlMailbox, $sort, $startMessage, $delete_id, $move_id,
+           $mailbox, $sort, $startMessage, $delete_id, $move_id,
            $imapConnection;
 
     echo '<tr>'.
          "<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=\"".$mailbox."\">".
             "<input type=\"hidden\" name=\"sort\" value=\"$sort\">".
             "<input type=\"hidden\" name=\"startMessage\" value=\"$startMessage\">".
             "<input type=\"hidden\" name=\"show_more\" value=\"0\">".
@@ -251,13 +260,13 @@ function delete_move_next_moveNextForm($next) {
 function delete_move_next_moveRightMainForm() {
 
     global $color, $where, $what, $currentArrayIndex, $passed_id,
-           $urlMailbox, $sort, $startMessage, $delete_id, $move_id,
+           $mailbox, $sort, $startMessage, $delete_id, $move_id,
            $imapConnection;
 
     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=\"".$mailbox."\">".
             "<input type=\"hidden\" name=\"sort\" value=\"$sort\">".
             "<input type=\"hidden\" name=\"startMessage\" value=\"$startMessage\">".
             "<input type=\"hidden\" name=\"move_id\" value=\"$passed_id\">".
@@ -278,7 +287,7 @@ function delete_move_next_delete() {
     global $imapConnection, $delete_id, $mailbox, $auto_expunge;
     
     sqimap_messages_delete($imapConnection, $delete_id, $delete_id, $mailbox);
-    if ($auto_expunge){
+    if ($auto_expunge) {
         delete_move_expunge_from_all($delete_id);
         // sqimap_mailbox_expunge($imapConnection, $mailbox, true);    
     }
@@ -289,7 +298,7 @@ function delete_move_next_move() {
     
     // Move message
     sqimap_messages_copy($imapConnection, $move_id, $move_id, $targetMailbox);
-    sqimap_messages_flag($imapConnection, $move_id, $move_id, 'Deleted');
+    sqimap_messages_flag($imapConnection, $move_id, $move_id, 'Deleted', true);
     if ($auto_expunge) {
         delete_move_expunge_from_all($move_id);
         // sqimap_mailbox_expunge($imapConnection, $mailbox, true);