disable server sort/thread option

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

diff --git a/src/redirect.php b/src/redirect.php
index d2a6158776d531ded5452e912f7ed6f466d44ae9..1ac1bc02bb38e3f3b85ff34d1608e124b2911c38 100644 (file)
--- a/src/redirect.php
+++ b/src/redirect.php
@@ -85,6 +85,19 @@ if (!sqsession_is_registered('user_is_logged_in')) {
     $imapConnection = sqimap_login($login_username, $key, $imapServerAddress, $imapPort, 0);
 
     $sqimap_capabilities = sqimap_capability($imapConnection);
+
+    /* Server side sorting control */
+    if (isset($sqimap_capabilities['SORT']) && $sqimap_capabilities['SORT'] == true &&
+        isset($disable_server_sort) && $disable_server_sort) {
+        unset($sqimap_capabilities['SORT']);
+    }
+
+    /* Thread sort control */
+    if (isset($sqimap_capabilities['THREAD']) && $sqimap_capabilities['THREAD'] == true &&
+        isset($disable_thread_sort) && $disable_thread_sort) {
+        unset($sqimap_capabilities['THREAD']);
+    }
+
     sqsession_register($sqimap_capabilities, 'sqimap_capabilities');
     $delimiter = sqimap_get_delimiter ($imapConnection);
 

diff --git a/src/search.php b/src/search.php
index aa7ff0b367f70d0ca978f17c09f2384c9c117a6e..f6fb1f2a18f10e3f096edbd3ea0aecd66dcf7fda 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -1013,8 +1013,8 @@ $aMailboxGlobalPref = array(
  * system wide admin settings and incoming vars.
  */
 $aConfig = array(
-                'allow_thread_sort' => $allow_thread_sort,
-                'allow_server_sort' => $allow_server_sort,
+//                'allow_thread_sort' => $allow_thread_sort,
+//                'allow_server_sort' => $allow_server_sort,
                 'user'              => $username,
                 'setindex'          => 1
                 );