From f027a8827fabca634602f1404eb48b29afc7f195 Mon Sep 17 00:00:00 2001 From: stekkel Date: Wed, 8 Feb 2006 07:58:18 +0000 Subject: [PATCH] disable server sort/thread option git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10657 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/redirect.php | 13 +++++++++++++ src/search.php | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/redirect.php b/src/redirect.php index d2a61587..1ac1bc02 100644 --- 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 aa7ff0b3..f6fb1f2a 100644 --- 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 ); -- 2.25.1