Imported Upstream version 0.6+dfsg

[roundcube.git] / plugins / subscriptions_option / subscriptions_option.php

diff --git a/plugins/subscriptions_option/subscriptions_option.php b/plugins/subscriptions_option/subscriptions_option.php
index 09ee6e3df09ccf84522f695241c678d15dd223c9..c0eb90c225d91ff9574198ec1521405563fa4a9f 100644 (file)
--- a/plugins/subscriptions_option/subscriptions_option.php
+++ b/plugins/subscriptions_option/subscriptions_option.php
@@ -19,7 +19,7 @@
  * 'dont_override' list and the global option has changed, don't expect
  * to see the change until the folder list cache is refreshed.
  *
- * @version 1.0
+ * @version 1.1
  * @author Ziba Scott
  */
 class subscriptions_option extends rcube_plugin
@@ -31,11 +31,11 @@ class subscriptions_option extends rcube_plugin
         $this->add_texts('localization/', false);
         $dont_override = rcmail::get_instance()->config->get('dont_override', array());
         if (!in_array('use_subscriptions', $dont_override)) {
-            $this->add_hook('user_preferences', array($this, 'settings_blocks'));
-            $this->add_hook('save_preferences', array($this, 'save_prefs'));
+            $this->add_hook('preferences_list', array($this, 'settings_blocks'));
+            $this->add_hook('preferences_save', array($this, 'save_prefs'));
         }
-        $this->add_hook('list_mailboxes', array($this, 'list_mailboxes'));
-        $this->add_hook('manage_folders', array($this, 'manage_folders'));
+        $this->add_hook('mailboxes_list', array($this, 'mailboxes_list'));
+        $this->add_hook('folders_list', array($this, 'folders_list'));
     }
 
     function settings_blocks($args)
@@ -46,9 +46,9 @@ class subscriptions_option extends rcube_plugin
             $checkbox = new html_checkbox(array('name' => '_use_subscriptions', 'id' => $field_id, 'value' => 1));
 
             $args['blocks']['main']['options']['use_subscriptions'] = array(
-               'title' => html::label($field_id, Q($this->gettext('useimapsubscriptions'))),
+                'title' => html::label($field_id, Q($this->gettext('useimapsubscriptions'))),
                 'content' => $checkbox->show($use_subscriptions?1:0),
-           );
+            );
         }
 
         return $args;
@@ -57,31 +57,31 @@ class subscriptions_option extends rcube_plugin
     function save_prefs($args)
     {
         if ($args['section'] == 'server') {
-           $rcmail = rcmail::get_instance();
+            $rcmail = rcmail::get_instance();
             $use_subscriptions = $rcmail->config->get('use_subscriptions');
 
-           $args['prefs']['use_subscriptions'] = isset($_POST['_use_subscriptions']) ? true : false;
+            $args['prefs']['use_subscriptions'] = isset($_POST['_use_subscriptions']) ? true : false;
 
-           // if the use_subscriptions preference changes, flush the folder cache
-           if (($use_subscriptions && !isset($_POST['_use_subscriptions'])) ||
-               (!$use_subscriptions && isset($_POST['_use_subscriptions']))) {
-                   $rcmail->imap_init(true);
-                   $rcmail->imap->clear_cache('mailboxes');
-           }
-       }
+            // if the use_subscriptions preference changes, flush the folder cache
+            if (($use_subscriptions && !isset($_POST['_use_subscriptions'])) ||
+                (!$use_subscriptions && isset($_POST['_use_subscriptions']))) {
+                    $rcmail->imap_connect();
+                    $rcmail->imap->clear_cache('mailboxes');
+            }
+        }
         return $args;
     }
 
-    function list_mailboxes($args)
+    function mailboxes_list($args)
     {
         $rcmail = rcmail::get_instance();
         if (!$rcmail->config->get('use_subscriptions', true)) {
-            $args['folders'] = iil_C_ListMailboxes($rcmail->imap->conn, $rcmail->imap->mod_mailbox($args['root']), $args['filter']);
+            $args['folders'] = $rcmail->imap->conn->listMailboxes($args['root'], $args['name']);
         }
         return $args;
     }
 
-    function manage_folders($args)
+    function folders_list($args)
     {
         $rcmail = rcmail::get_instance();
         if (!$rcmail->config->get('use_subscriptions', true)) {