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 e6fbb511cbcafc39adfb56c2591b893a393be8ee..409fee65db3b4494c9ef2fab4455fa03b08f768c 100644 (file)
--- a/plugins/delete_move_next/setup.php
+++ b/plugins/delete_move_next/setup.php
@@ -32,15 +32,20 @@ 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) {
-        $mbxresponse = sqimap_mailbox_select($imapConnection, $mailbox);
-        $server_sort_array = sqimap_get_sort_order($imapConnection, $sort, $mbxresponse);
-    }
-    $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);
-    }
+    $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;
+    }    
 }
 
 /*
@@ -77,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']--;
+           }
         }
     }
     
@@ -140,14 +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;
+           $imapConnection, $auto_expunge, $move_to_trash, $mbx_response,
+          $uid_support;
 
     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--;
             }
@@ -159,21 +166,20 @@ function delete_move_next_read($currloc) {
        /* Base is illegal within documents 
         * $location = get_location();
         * echo "<base href=\"$location/\">" . */
-        echo html_tag( 'table', '', '', '', 'cellspacing="0" width="100%" border="0" cellpadding="2"' ) .
-             html_tag( 'tr' ) .
-             html_tag( 'td', '', 'center', $color[9], 'width="100%"' ) .
-                 '<small>';
+        echo '<table cellspacing=0 width="100%" border=0 cellpadding=2>'.
+             '<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";
         }
@@ -230,8 +236,8 @@ function delete_move_next_moveNextForm($next) {
            $urlMailbox, $sort, $startMessage, $delete_id, $move_id,
            $imapConnection;
 
-    echo html_tag( 'tr' ) .
-         html_tag( 'td', '', 'center', $color[9], 'width="100%"' ) .
+    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=\"".urldecode($urlMailbox)."\">".
@@ -256,8 +262,8 @@ function delete_move_next_moveRightMainForm() {
            $urlMailbox, $sort, $startMessage, $delete_id, $move_id,
            $imapConnection;
 
-    echo html_tag( 'tr' ) .
-         html_tag( 'td', '', 'center', $color[9], 'width="100%"' ) .
+    echo '<tr>' .      
+            "<td bgcolor=\"$color[9]\" width=\"100%\" align=\"center\">".
             '<form action="right_main.php" method="post"><small>' .
             "<input type=\"hidden\" name=\"mailbox\" value=\"".urldecode($urlMailbox)."\">".
             "<input type=\"hidden\" name=\"sort\" value=\"$sort\">".
@@ -303,10 +309,9 @@ function delete_move_next_display_inside() {
         $delete_move_next_t, $delete_move_next_formATtop,
         $delete_move_next_b, $delete_move_next_formATbottom;
     
-    echo html_tag( 'tr' ) .
-         html_tag( 'td', _("Delete/Move/Next Buttons:"), 'right', '', 'valign="top"' ) . "\n" .
-         html_tag( 'td', '', 'left' ) .
-         '<input type=checkbox name=delete_move_next_ti';
+    echo "<tr><td align=right valign=top>\n".
+         _("Delete/Move/Next Buttons:") . "</td>\n".
+         "<td><input type=checkbox name=delete_move_next_ti";
          
     if ($delete_move_next_t == 'on') {
         echo " checked";