more fixes for prev/next, this should do it....

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2662 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/read_body.php b/src/read_body.php
index aec1291669fde3b82af6f69416ef4af1909b7114..2dd1901f3cf8f9bacbd9f7cb1776c35f1ed2cdf2 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -28,10 +28,10 @@ require_once('../functions/smtp.php');
 */
 function findNextMessage() {
     global $msort, $currentArrayIndex, $msgs, $sort, 
 */
 function findNextMessage() {
     global $msort, $currentArrayIndex, $msgs, $sort, 

-           $thread_sort_messages, $allow_server_sort,
+           $allow_thread_sort, $allow_server_sort,

            $server_sort_array;
     $result = -1;
            $server_sort_array;
     $result = -1;

-               if ($thread_sort_messages == 1 || $allow_server_sort == true) {
+               if ($allow_thread_sort == true || $allow_server_sort == true) {

         reset($server_sort_array);
         while(list($key, $value) = each ($server_sort_array)) {
             if ($currentArrayIndex == $value) {
         reset($server_sort_array);
         while(list($key, $value) = each ($server_sort_array)) {
             if ($currentArrayIndex == $value) {


@@ -41,16 +41,16 @@ function findNextMessage() {
                 }
                 $result = $server_sort_array[$key +1];
                 break; 
                 }
                 $result = $server_sort_array[$key +1];
                 break; 

-                                               }
+            }

         }
         }

-               }
+    }

     
     

-    elseif ($sort == 6 && $allow_server_sort != true && $thread_sort_messages != 1) {
+    elseif ($sort == 6 && $allow_server_sort != true && $allow_thread_sort != true) {

         if ($currentArrayIndex != 1) {
             $result = $currentArrayIndex - 1;
         }
     } 
         if ($currentArrayIndex != 1) {
             $result = $currentArrayIndex - 1;
         }
     } 

-    elseif ($allow_server_sort != true && $thread_sort_messages != 1) {
+    elseif ($allow_server_sort != true && $allow_thread_sort != true) {

         if (!is_array($msort)) {
             return -1;
         }
         if (!is_array($msort)) {
             return -1;
         }


@@ -79,10 +79,10 @@ function RemoveAddress(&$addr_list, $addr) {
 /** returns the index of the previous message from the array. */
 function findPreviousMessage() {
     global $msort, $currentArrayIndex, $sort, $msgs, $imapConnection,
 /** returns the index of the previous message from the array. */
 function findPreviousMessage() {
     global $msort, $currentArrayIndex, $sort, $msgs, $imapConnection,

-           $mailbox, $data_dir, $username, $thread_sort_messages,
+           $mailbox, $data_dir, $username, $allow_thread_sort,

            $allow_server_sort, $server_sort_array;
     $result = -1;
            $allow_server_sort, $server_sort_array;
     $result = -1;

-               if ($thread_sort_messages == 1 || $allow_server_sort == TRUE) {
+        if ($allow_thread_sort == true || $allow_server_sort == TRUE) {

         reset($server_sort_array);
         while(list($key, $value) = each ($server_sort_array)) {
             if ($currentArrayIndex == $value) {
         reset($server_sort_array);
         while(list($key, $value) = each ($server_sort_array)) {
             if ($currentArrayIndex == $value) {


@@ -92,19 +92,19 @@ function findPreviousMessage() {
                 }
                 $result = $server_sort_array[$key -1];
                 break;
                 }
                 $result = $server_sort_array[$key -1];
                 break;

-                                               }
+            }

         }
         }

-               }
-    elseif ($sort == 6 && $allow_server_sort != TRUE && $thread_sort_messages != 1) {
+    }
+    elseif ($sort == 6 && $allow_server_sort != TRUE && $allow_thread_sort != true) {

         $numMessages = sqimap_get_num_messages($imapConnection, $mailbox);
         if ($currentArrayIndex != $numMessages) {
             $result = $currentArrayIndex + 1;
         }
     } 
         $numMessages = sqimap_get_num_messages($imapConnection, $mailbox);
         if ($currentArrayIndex != $numMessages) {
             $result = $currentArrayIndex + 1;
         }
     } 

-    elseif ($thread_sort_messages != 1 && $allow_server_sort != TRUE) {
-             if (!is_array($msort)) {
+    elseif ($allow_thread_sort != true && $allow_server_sort != TRUE) {
+          if (!is_array($msort)) {

             return -1;
             return -1;

-             }
+          }

         for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) {
             if ($currentArrayIndex == $msgs[$key]['ID']) {
                 prev($msort);
         for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) {
             if ($currentArrayIndex == $msgs[$key]['ID']) {
                 prev($msort);