Changeset 4968 in subversion

Timestamp:

Jul 26, 2011 9:22:11 AM (22 months ago)

Author:

alec

Message:

• Unsubscribe from non-existing folders automaticly on folders listing

File:

• trunk/roundcubemail/program/steps/settings/folders.inc (modified) (3 diffs)

trunk/roundcubemail/program/steps/settings/folders.inc

@@ -268 +268 @@
     foreach ($list_folders as $i => $folder) {
         $idx        = $i + 1;
-        $subscribed = in_array($folder['id'], $a_subscribed);
+        $sub_key    = array_search($folder['id'], $a_subscribed);
+        $subscribed = $sub_key !== false;
         $protected  = ($CONFIG['protect_default_folders'] == true && in_array($folder['id'], $CONFIG['default_imap_folders']));
         $noselect   = false;
@@ -277 +278 @@
         $display_folder = str_repeat('    ', $folder['level'])
             . Q($protected ? rcmail_localize_foldername($folder['id']) : $folder['name']);
+
+        if ($sub_key !== false)
+            unset($a_subscribed[$sub_key]);
 
         if ($folder['virtual']) {
@@ -326 +330 @@
     }
 
+    // Unsubscribe from non-existing folders
+    foreach ($a_subscribed as $folder) {
+        $IMAP->unsubscribe($folder);
+    }
+
     $RCMAIL->plugins->exec_hook('folders_list', array('table' => $table));