thread sort view is now saved per folder thanks Robert Packard

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

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index ed38a964f356f4aae3cd6184cdb713ddd2a79a26..46873d12d74693a789a386dfcaea6d3296a39667 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -174,10 +174,12 @@ function sqimap_unsubscribe ($imap_stream, $mailbox) {
 
 /* Deletes the given folder */
 function sqimap_mailbox_delete ($imap_stream, $mailbox) {
+    global $data_dir, $username;
     $read_ary = sqimap_run_command($imap_stream, "DELETE \"$mailbox\"",
                                    true, $response, $message);
     sqimap_unsubscribe ($imap_stream, $mailbox);
     do_hook_function("rename_or_delete_folder", $args = array($mailbox, 'delete', ''));
+    removePref($data_dir, $username, "thread_$mailbox");
 }
 
 /* Determines if the user is subscribed to the folder or not */
@@ -194,7 +196,7 @@ function sqimap_mailbox_is_subscribed($imap_stream, $folder) {
 /* Renames a mailbox */
 function sqimap_mailbox_rename( $imap_stream, $old_name, $new_name ) {
     if ( $old_name != $new_name ) {
-        global $delimiter, $imap_server_type;
+        global $delimiter, $imap_server_type, $data_dir, $username;
         if ( substr( $old_name, -1 ) == $delimiter  ) {
             $old_name = substr( $old_name, 0, strlen( $old_name ) - 1 );
             $new_name = substr( $new_name, 0, strlen( $new_name ) - 1 );
@@ -206,7 +208,10 @@ function sqimap_mailbox_rename( $imap_stream, $old_name, $new_name ) {
         $cmd = 'RENAME "' . quoteIMAP($old_name) . '" "' .  quoteIMAP($new_name) . '"';
         $data = sqimap_run_command($imap_stream, $cmd, true, $response, $message);
         sqimap_unsubscribe($imap_stream, $old_name.$postfix);
+        $oldpref = getPref($data_dir, $username, "thread_".$old_name.$postfix);
+        removePref($data_dir, $username, "thread_".$old_name.$postfix);
         sqimap_subscribe($imap_stream, $new_name.$postfix);
+        setPref($data_dir, $username, "thread_".$new_name.$postfix, $oldpref);
         do_hook_function("rename_or_delete_folder",$args = array($old_name, 'rename', $new_name));
         $l = strlen( $old_name ) + 1;
         $p = 'unformatted';
@@ -219,7 +224,10 @@ function sqimap_mailbox_rename( $imap_stream, $old_name, $new_name ) {
                                                $response, $message);
                 }
                 sqimap_unsubscribe($imap_stream, $box[$p]);
+                $oldpref = getPref($data_dir, $username, "thread_".$box[$p]);
+                removePref($data_dir, $username, "thread_".$box[$p]);
                 sqimap_subscribe($imap_stream, $new_sub);
+                setPref($data_dir, $username, "thread_".$new_sub, $oldpref);
                 do_hook_function("rename_or_delete_folder",
                                  $args = array($box[$p], 'rename', $new_sub));
             }

diff --git a/src/load_prefs.php b/src/load_prefs.php
index c0a7a913a8cfed12e7666b0dbf629b5ed2d082b6..e83e711848c7a5b67f25a36d09209ec682d4b84f 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -218,7 +218,7 @@ $sig_first = getPref($data_dir, $username, 'sig_first', 0);
 $internal_date_sort = getPref($data_dir, $username, 'internal_date_sort', SMPREF_ON);
 
 /* if thread sorting is enabled/disabled */
-$thread_sort_messages = getPref($data_dir, $username, 'thread_sort_messages', 0);
+$thread_sort_messages = getPref($data_dir, $username, "thread_$mailbox", 0);
 $sort_by_ref = getPref($data_dir, $username, 'sort_by_ref', 1);
 
 /* Load the javascript settings. */

diff --git a/src/right_main.php b/src/right_main.php
index 11268479f4b9e8bd22bf239a9ebf856867c58f7b..fb7b809fb71d143d37ed8bc55f968eb65ed87040 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -52,16 +52,16 @@ global $allow_thread_sort;
 if ($allow_thread_sort == TRUE) {
     if (isset($set_thread)) {
         if ($set_thread == 1) {
-            setPref($data_dir, $username, 'thread_sort_messages', 1);
+            setPref($data_dir, $username, "thread_$mailbox", 1);
             $thread_sort_messages = '1';    
         }
         elseif ($set_thread == 2)  {
-            setPref($data_dir, $username, 'thread_sort_messages', 0);
+            setPref($data_dir, $username, "thread_$mailbox", 0);
             $thread_sort_messages = '0';    
         }
     }
     else {
-        $thread_sort_messages = getPref($data_dir, $username, 'thread_sort_messages');
+        $thread_sort_messages = getPref($data_dir, $username, "thread_$mailbox");
     }
 }
 else {