Merged branch devel-api (from r2208 to r2387) back into trunk (omitting some sample plugins)

3 files changed, 16 insertions, 0 deletions

diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 3f0357717..6eda4dba3 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -159,6 +159,8 @@ function rcmail_user_prefs_block($part, $no_override, $attrib)
       }
     }
     
+    $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));
     break;
@@ -216,6 +218,8 @@ function rcmail_user_prefs_block($part, $no_override, $attrib)
       $table->add(null, $input_check_all->show($config['check_all_folders']?1:0));
     }
 
+    $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));
     break;
@@ -254,6 +258,8 @@ function rcmail_user_prefs_block($part, $no_override, $attrib)
       $table->add(null, $input_inline_images->show($config['inline_images']?1:0));
     }
 
+    $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));
     break;
@@ -295,6 +301,8 @@ function rcmail_user_prefs_block($part, $no_override, $attrib)
       $table->add(null, $select_param_folding->show($config['mime_param_folding']));
     }
 
+    $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));
     break;
@@ -329,6 +337,8 @@ function rcmail_user_prefs_block($part, $no_override, $attrib)
         $table->add(null, $select->show($config['trash_mbox'], array('name' => "_trash_mbox")));
       }
 
+      $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));
     }
     break;
@@ -381,6 +391,8 @@ function rcmail_user_prefs_block($part, $no_override, $attrib)
       $table->add(null, $input_expunge->show($config['logout_expunge']?1:0));
     }
 
+    $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('serversettings'))) . $table->show($attrib));
     break;
diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
index 9affded98..79d313c37 100644
--- a/program/steps/settings/manage_folders.inc
+++ b/program/steps/settings/manage_folders.inc
@@ -256,6 +256,7 @@ function rcube_subscription_form($attrib)
     $a_js_folders['rcmrow'.$idx] = array($folder_utf8, $display_folder, $protected || $folder['virtual']);
   }
 
+  rcmail::get_instance()->plugins->exec_hook('manage_folders', array('table'=>$table));
 
   $OUTPUT->add_gui_object('subscriptionlist', $attrib['id']);
   $OUTPUT->set_env('subscriptionrows', $a_js_folders);
diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
index 09cf63d6f..c5afd5b0c 100644
--- a/program/steps/settings/save_prefs.inc
+++ b/program/steps/settings/save_prefs.inc
@@ -48,6 +48,9 @@ $a_user_prefs = array(
   'trash_mbox' => get_input_value('_trash_mbox', RCUBE_INPUT_POST),
   );
 
+$data  =  rcmail::get_instance()->plugins->exec_hook('save_preferences', array('prefs' => $a_user_prefs));
+$a_user_prefs = $data['prefs'];
+
 // don't override these parameters
 foreach ((array)$CONFIG['dont_override'] as $p)
   $a_user_prefs[$p] = $CONFIG[$p];