Changeset 2387 in subversion

Timestamp:

Apr 13, 2009 12:27:12 PM (4 years ago)

Author:

thomasb

Message:

Create one hook 'user_preferences' for all parts of the prefs page

Location:

branches/devel-api

Files:

• plugins/subscriptions_option/subscriptions_option.php (modified) (2 diffs)
• program/steps/settings/func.inc (modified) (6 diffs)
• skins/default/templates/settings.html (modified) (2 diffs)

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

@@ -31 +31 @@
         $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('user_preferences', array($this, 'settings_table'));
             $this->add_hook('save_preferences', array($this, 'save_prefs'));
         }
@@ -40 +40 @@
     function settings_table($args)
     {
-        $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));
+        if ($args['section'] == 'server') {
+            $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($use_subscriptions?1:0));
+            $args['table']->add('title', html::label($field_id, Q($this->gettext('useimapsubscriptions'))));
+            $args['table']->add(null, $use_subscriptions->show($use_subscriptions?1:0));
+        }
 
         return $args;

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

@@ -160 +160 @@
     }
     
+    $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table));
+    
     if ($table->size())
       $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('uisettings'))) . $table->show($attrib));
@@ -217 +219 @@
     }
 
+    $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table));
+
     if ($table->size())
       $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('mailboxview'))) . $table->show($attrib));
@@ -255 +259 @@
     }
 
+    $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table));
+
     if ($table->size())
       $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('messagesdisplaying'))) . $table->show($attrib));
@@ -296 +302 @@
     }
 
+    $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table));
+
     if ($table->size())
       $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('messagescomposition'))) . $table->show($attrib));
@@ -330 +338 @@
       }
 
+      $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table));
+
       $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('specialfolders'))) . $table->show($attrib));
     }
@@ -382 +392 @@
     }
 
-    rcmail::get_instance()->plugins->exec_hook('user_preferences_server_settings', array('table'=>$table));
+    $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table));
 
     if ($table->size())

branches/devel-api/skins/default/templates/settings.html

@@ -18 +18 @@
 <div id="userprefs-title"><roundcube:label name="userpreferences" /></div>
 
-<div style="padding:15px 0 15px 15px">
+<div id="userprefscontainer" style="padding:15px 0 15px 15px">
 <div class="userprefs-block">
   <roundcube:object name="userprefs" form="form" parts="general,mailbox,mailview" />
@@ -26 +26 @@
 </div>
 <div style="clear:left"></div>
+
+<roundcube:container name="userprefs" id="userprefscontainer" />
 </div>
 </div>