Branch 'roundcubemail-plugins-kolab-3.0' - 2 commits - plugins/calendar plugins/kolab_addressbook

[Aleksander Machniak]

 plugins/calendar/drivers/kolab/kolab_driver.php |    2 ++
 plugins/kolab_addressbook/kolab_addressbook.php |    7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 279a4c52aa6cc96ffa3c95706bd65cac57633c7d
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Mon May 27 19:05:04 2013 +0200

    FIx so newly created addressbooks are subscribed (Bug #1766)

diff --git a/plugins/kolab_addressbook/kolab_addressbook.php b/plugins/kolab_addressbook/kolab_addressbook.php
index a85965e..82346f3 100644
--- a/plugins/kolab_addressbook/kolab_addressbook.php
+++ b/plugins/kolab_addressbook/kolab_addressbook.php
@@ -409,10 +409,11 @@ class kolab_addressbook extends rcube_plugin
     public function book_save()
     {
         $prop = array(
-            'name' => trim(get_input_value('_name', RCUBE_INPUT_POST)),
+            'name'    => trim(get_input_value('_name', RCUBE_INPUT_POST)),
             'oldname' => trim(get_input_value('_oldname', RCUBE_INPUT_POST, true)), // UTF7-IMAP
-            'parent' => trim(get_input_value('_parent', RCUBE_INPUT_POST, true)), // UTF7-IMAP
-            'type' => 'contact',
+            'parent'  => trim(get_input_value('_parent', RCUBE_INPUT_POST, true)), // UTF7-IMAP
+            'type'    => 'contact',
+            'subscribed' => true,
         );
 
         $result = $error = false;


commit c43e76182758da9268de05f220551f442c56f4cd
Author: Thomas Bruederli <thomas at roundcube.net>
Date:   Tue May 28 13:47:44 2013 +0200

    Subscribe and activate new calendar folders (#1900)

diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php
index 0d913a3..fcf05aa 100644
--- a/plugins/calendar/drivers/kolab/kolab_driver.php
+++ b/plugins/calendar/drivers/kolab/kolab_driver.php
@@ -187,6 +187,8 @@ class kolab_driver extends calendar_driver
   public function create_calendar($prop)
   {
     $prop['type'] = 'event';
+    $prop['active'] = true;
+    $prop['subscribed'] = true;
     $folder = kolab_storage::folder_update($prop);
 
     if ($folder === false) {