From 046accbdf856b6bba5f4736e50b216078cde78ba Mon Sep 17 00:00:00 2001
From: "Aleksander Machniak (Kolab Systems)" <machniak@kolabsys.com>
Date: Wed, 6 Jul 2011 13:32:19 +0200
Subject: [PATCH] For settings task load driver only when it's needed (in
 calendar section)

---
 plugins/calendar/calendar.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index fd9a342f..9879aadb 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -111,14 +111,12 @@ class calendar extends rcube_plugin
       $this->register_action('randomdata', array($this, 'generate_randomdata'));
     } 
     else if ($this->rc->task == 'settings') {
-      $this->load_driver();
-
       // add hooks for Calendar settings
       $this->add_hook('preferences_sections_list', array($this, 'preferences_sections_list'));
       $this->add_hook('preferences_list', array($this, 'preferences_list'));
       $this->add_hook('preferences_save', array($this, 'preferences_save')); 
     }
-    
+
     // add hook to display alarms
     $this->add_hook('keep_alive', array($this, 'keep_alive'));
   }
@@ -205,8 +203,10 @@ class calendar extends rcube_plugin
   function preferences_list($p)
   {
     if ($p['section'] == 'calendar') {
+      $this->load_driver();
+
       $p['blocks']['view']['name'] = $this->gettext('mainoptions');
- 
+
       $field_id = 'rcmfd_default_view';
       $select = new html_select(array('name' => '_default_view', 'id' => $field_id));
       $select->add($this->gettext('day'), "agendaDay");
@@ -340,6 +340,8 @@ class calendar extends rcube_plugin
   function preferences_save($p)
   {
     if ($p['section'] == 'calendar') {
+      $this->load_driver();
+
       // compose default alarm preset value
       $alarm_offset = get_input_value('_alarm_offset', RCUBE_INPUT_POST);
       $default_alam = $alarm_offset[0] . intval(get_input_value('_alarm_value', RCUBE_INPUT_POST)) . $alarm_offset[1];