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 f73b5d22b5eea42b657f2cbc189eaa7091a2d0b1..d0a5957fc2d31f5747dedfc906f3d9efd89bbff7 100644 (file)
--- a/plugins/delete_move_next/setup.php
+++ b/plugins/delete_move_next/setup.php
@@ -26,6 +26,29 @@ 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,
+    $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;
+    }    
+}
+
 /*
  * Warning: this function relies on the internal representation of
  * of the message cache for the current mailbox. As such, it is fragile
@@ -34,21 +57,21 @@ 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);
     $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>';
@@ -57,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);
@@ -80,6 +101,8 @@ function delete_move_expunge_from_all($id) {
             arsort($msort);
         }
     }
+    session_register('msgs');
+    session_register('msort');
     
     sqimap_mailbox_expunge($imapConnection, $mailbox, true);
 }
@@ -91,8 +114,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();
     }
 
 }
@@ -119,16 +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--;
             }
@@ -137,30 +164,31 @@ function delete_move_next_read($currloc) {
             }
         }    
         
-        $location = get_location();
-        echo "<base href=\"$location/\">" .
-             '<table cols=1 cellspacing=0 width=100% border=0 cellpadding=2>'.
+       /* Base is illegal within documents 
+        * $location = get_location();
+        * echo "<base href=\"$location/\">" . */
+        echo '<table cellspacing=0 width="100%" border=0 cellpadding=2>'.
              '<tr>'.
-                 "<td bgcolor=\"$color[9]\" width=100% align=center><small>";
+                 "<td bgcolor=\"$color[9]\" width=\"100%\" align=center><small>";
     
-        if ($prev > 0) {
-            echo "<a href=\"read_body.php?passed_id=$prev&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0\">" . _("Previous") . "</A>&nbsp;|&nbsp;";
-        } else {
-            echo _("Previous") . "&nbsp;|&nbsp;";
-        }
-        if ($next > 0) {
-            echo "<a href=\"read_body.php?passed_id=$next&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0\">" . _("Next") . "</A>&nbsp;|&nbsp;";
-        } 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&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0&delete_id=$passed_id\">" . _("Delete & Prev") . "</a>" . "&nbsp;|&nbsp;";
+            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";
         }
         else {
             echo _("Delete & Prev") . "&nbsp;|&nbsp;";
         }
         if ($next > 0){
-            echo "<a href=\"read_body.php?passed_id=$next_if_del&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0&delete_id=$passed_id\">" . _("Delete & Next") . "</a>";
+            echo "<a href=\"read_body.php?passed_id=$next_if_del&amp;mailbox=$urlMailbox&amp;sort=$sort&amp;startMessage=$startMessage&amp;show_more=0&amp;delete_id=$passed_id\">" . _("Delete & Next") . "</a>\n";
         } else {
             echo _("Delete & Next");
         }
@@ -206,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 '<form action="read_body.php" method="post">'.
-         '<tr>'.
-         "<td bgcolor=\"$color[9]\" width=\"100%\" align=\"center\"><small>".
+    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\">".
@@ -224,21 +252,21 @@ function delete_move_next_moveNextForm($next) {
     echo    '</select> '.
             '<input type="submit" value="' . _("Move") . '">'.
             '</small>'.
+           '</form>'.
          '</td>'.
-         '</tr>' .
-         '</form>';
+         '</tr>';
 
 }
 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 '<form action="right_main.php" method="post">' .
-         '<tr>' .      
-            "<td bgcolor=\"$color[9]\" width=\"100%\" align=\"center\"><small>".
-            "<input type=\"hidden\" name=\"mailbox\" value=\"$urlMailbox\">".
+    echo '<tr>' .      
+            "<td bgcolor=\"$color[9]\" width=\"100%\" align=\"center\">".
+            '<form action="right_main.php" method="post"><small>' .
+            "<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\">".
@@ -248,9 +276,9 @@ function delete_move_next_moveRightMainForm() {
     echo    ' </select>' .
             '<input type=submit value="' . _("Move") . '">'.
             '</small>'.
+         '</form>' .
          '</td>'.
-         '</tr>' .
-         '</form>';
+         '</tr>';
 
 }
 
@@ -259,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);    
     }
@@ -270,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);
@@ -283,31 +311,31 @@ function delete_move_next_display_inside() {
         $delete_move_next_b, $delete_move_next_formATbottom;
     
     echo "<tr><td align=right valign=top>\n".
-         _("delete_move_next:") . "</td>\n".
+         _("Delete/Move/Next Buttons:") . "</td>\n".
          "<td><input type=checkbox name=delete_move_next_ti";
          
     if ($delete_move_next_t == 'on') {
         echo " checked";
     }
-    echo '> <- ' . _("display at top").
+    echo '> ' . _("Display at top").
          " <input type=checkbox name=delete_move_next_formATtopi";
          
     if ($delete_move_next_formATtop == 'on') {
         echo ' checked';
     }
-    echo '> <- ' . _("with move option") . '<br>';    
+    echo '> ' . _("with move option") . '<br>';    
     
     echo '<input type=checkbox name=delete_move_next_bi';
     if($delete_move_next_b != 'off') {
         echo ' checked';
     }
-    echo '> <- ' . _("display at bottom") .
+    echo '> ' . _("Display at bottom") .
          '<input type=checkbox name=delete_move_next_formATbottomi';
          
     if ($delete_move_next_formATbottom != 'off') {
         echo ' checked';
     }
-    echo '> <- ' . _("with move option") . '<br>'.
+    echo '> ' . _("with move option") . '<br>'.
          "</td></tr>\n";
 }
 
@@ -357,4 +385,4 @@ function delete_move_next_loading_prefs() {
 
 }
 
-?>
\ No newline at end of file
+?>