Changeset 2329 in subversion

Timestamp:

Mar 5, 2009 1:48:56 PM (4 years ago)

Author:

thomasb

Message:

Use simpler field names + don't use rcube_config::all() too much + some minor codestyle changes

Location:

branches/devel-api

Files:

• plugins/subscriptions_option/subscriptions_option.php (modified) (5 diffs)
• program/include/rcube_imap.php (modified) (1 diff)
• program/steps/settings/save_prefs.inc (modified) (1 diff)

branches/devel-api/plugins/subscriptions_option/subscriptions_option.php

@@ -29 +29 @@
     {
         $this->add_texts('localization/', false);
-        $config = rcmail::get_instance()->config->all();
-        if (!in_array('use_subscriptions',$config['dont_override'])){
+        $dont_override = rcmail::get_instance()->config->get('dont_override', array());
+        if (!in_array('use_subscriptions', $dont_override)){
             $this->add_hook('user_preferences_server_settings', array($this, 'settings_table'));
             $this->add_hook('save_preferences', array($this, 'save_prefs'));
@@ -40 +40 @@
     function settings_table($args)
     {
-        $config = rcmail::get_instance()->config->all();
+        $use_subscriptions = rcmail::get_instance()->config->get('use_subscriptions');
         $field_id = 'rcmfd_use_subscriptions';
         $use_subscriptions = new html_checkbox(array('name' => '_use_subscriptions', 'id' => $field_id, 'value' => 1));
 
         $args['table']->add('title', html::label($field_id, Q($this->gettext('useimapsubscriptions'))));
-        $args['table']->add(null, $use_subscriptions->show($config['use_subscriptions']?1:0));
+        $args['table']->add(null, $use_subscriptions->show($use_subscriptions?1:0));
 
         return $args;
@@ -52 +52 @@
     function save_prefs($args){
         $rcmail = rcmail::get_instance();
-        $config = $rcmail->config->all();
+        $use_subscriptions = $rcmail->config->get('use_subscriptions');
 
-        $args['a_user_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 (($config['use_subscriptions'] && !isset($_POST['_use_subscriptions'])) ||
-            (!$config['use_subscriptions'] && isset($_POST['_use_subscriptions']))) {
+        if (($use_subscriptions && !isset($_POST['_use_subscriptions'])) ||
+            (!$use_subscriptions && isset($_POST['_use_subscriptions']))) {
                 $rcmail->imap_init(true);
                 $rcmail->imap->clear_cache('mailboxes');
@@ -67 +67 @@
     function list_mailboxes($args){
         $rcmail = rcmail::get_instance();
-        if ($rcmail->config->get('use_subscriptions', TRUE) == FALSE) {
-            $args['a_folders'] = iil_C_ListMailboxes($rcmail->imap->conn, $rcmail->imap->_mod_mailbox($args['root']), $args['filter']);
+        if (!$rcmail->config->get('use_subscriptions', true)) {
+            $args['folders'] = iil_C_ListMailboxes($rcmail->imap->conn, $rcmail->imap->_mod_mailbox($args['root']), $args['filter']);
         }
         return $args;
@@ -74 +74 @@
 
     function manage_folders($args){
-        $rcmail =rcmail::get_instance();
-        if ($rcmail->config->get('use_subscriptions', TRUE) == FALSE) {
+        $rcmail = rcmail::get_instance();
+        if (!$rcmail->config->get('use_subscriptions', true)) {
             $args['table']->remove_column('subscribed');
         }

branches/devel-api/program/include/rcube_imap.php

@@ -429 +429 @@
     // Give plugins a chance to provide a list of mailboxes
     $data = rcmail::get_instance()->plugins->exec_hook('list_mailboxes',array('root'=>$root,'filter'=>$filter));
-    if(isset($data['a_folders'])){
-        $a_folders = $data['a_folders'];
+    if (isset($data['folders'])) {
+        $a_folders = $data['folders'];
     }
     else{

branches/devel-api/program/steps/settings/save_prefs.inc

@@ -49 +49 @@
   );
 
-$data  =  rcmail::get_instance()->plugins->exec_hook('save_preferences', array('a_user_prefs'=>$a_user_prefs));
-$a_user_prefs = $data['a_user_prefs'];
+$data  =  rcmail::get_instance()->plugins->exec_hook('save_preferences', array('prefs' => $a_user_prefs));
+$a_user_prefs = $data['prefs'];
 
 // don't override these parameters