2 commits - plugins/calendar plugins/kolab_folders

[Thomas Brüderli]

 plugins/calendar/config.inc.php.dist                   |    6 ++++++
 plugins/calendar/drivers/kolab/kolab_user_calendar.php |   13 ++++++-------
 plugins/calendar/skins/larry/calendar.css              |   13 +++++++------
 plugins/kolab_folders/kolab_folders.php                |    3 +--
 4 files changed, 20 insertions(+), 15 deletions(-)

New commits:
commit f5dc95c3dfba290fa13818bd78cefb16218fc522
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Sep 24 17:10:38 2014 +0200

    Add config option to control free-busy data integration in calendar views; render free-busy blocks in the calendar color, too

diff --git a/plugins/calendar/config.inc.php.dist b/plugins/calendar/config.inc.php.dist
index 32e1c74..e906776 100644
--- a/plugins/calendar/config.inc.php.dist
+++ b/plugins/calendar/config.inc.php.dist
@@ -131,6 +131,12 @@ $config['calendar_itip_after_action'] = 0;
 // enable asynchronous free-busy triggering after data changed
 $config['calendar_freebusy_trigger'] = false;
 
+// free-busy information will be displayed for user calendars if available
+// 0 - no free-busy information
+// 1 - enabled in all views
+// 2 - only in quickview
+$config['calendar_include_freebusy_data'] = 1;
+
 // SMTP server host used to send (anonymous) itip messages.
 // Set to '' in order to use PHP's mail() function for email delivery.
 // To override the SMTP port or connection method, provide a full URL like 'tls://somehost:587'
diff --git a/plugins/calendar/drivers/kolab/kolab_user_calendar.php b/plugins/calendar/drivers/kolab/kolab_user_calendar.php
index 2cb8962..93bcc0b 100644
--- a/plugins/calendar/drivers/kolab/kolab_user_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_user_calendar.php
@@ -211,17 +211,16 @@ class kolab_user_calendar extends kolab_calendar
 
     // aggregate all calendar folders the user shares (but are not subscribed)
     foreach (kolab_storage::list_user_folders($this->userdata, 'event', false) as $foldername) {
-      if (!empty($_REQUEST['_quickview']) || !kolab_storage::folder_is_active($foldername)) {
-        $cal = new kolab_calendar($foldername, $this->cal);
-        foreach ($cal->list_events($start, $end, $search, 1) as $event) {
-          $this->events[$event['id']] = $event;
-          $this->timeindex[$this->time_key($event)] = $event['id'];
-        }
+      $cal = new kolab_calendar($foldername, $this->cal);
+      foreach ($cal->list_events($start, $end, $search, 1) as $event) {
+        $this->events[$event['id']] = $event;
+        $this->timeindex[$this->time_key($event)] = $event['id'];
       }
     }
 
     // get events from the user's free/busy feed (for quickview only)
-    if (!empty($_REQUEST['_quickview']) && empty($search)) {
+    $fbview = $this->cal->rc->config->get('calendar_include_freebusy_data', 1);
+    if ($fbview && ($fbview == 1 || !empty($_REQUEST['_quickview'])) && empty($search)) {
       $this->fetch_freebusy($limit_changed);
     }
 
diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
index bd31247..36b374b 100644
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -1763,9 +1763,9 @@ a.dropdown-link:after {
 
 .fc-event-hori.fc-type-freebusy,
 .fc-event-vert.fc-type-freebusy {
-	opacity: 0.55;
+	opacity: 0.60;
+/*
 	color: #fff !important;
-
 	background: rgba(80,80,80,0.85) !important;
 	background: -moz-linear-gradient(top, rgba(80,80,80,0.85) 0%, rgba(48,48,48,0.9) 100%) !important;
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(80,80,80,0.85)), color-stop(100%,rgba(48,48,48,0.9))) !important;
@@ -1773,14 +1773,13 @@ a.dropdown-link:after {
 	background: -o-linear-gradient(top, rgba(80,80,80,0.85) 0%, rgba(48,48,48,0.85) 100%) !important;
 	background: -ms-linear-gradient(top, rgba(80,80,80,0.85) 0%, rgba(48,48,48,0.85) 100%) !important;
 	background: linear-gradient(to bottom, rgba(80,80,80,0.85) 0%, rgba(48,48,48,0.85) 100%) !important;
-
+	border-color: #444 !important;
+	cursor: default !important;
+*/
 	-moz-box-shadow: inset 0px 1px 0 0px #888;
 	-webkit-box-shadow: inset 0px 1px 0 0px #888;
 	-o-box-shadow: inset 0px 1px 0 0px #888;
 	box-shadow: inset 0px 1px 0 0px #888;
-
-	border-color: #444 !important;
-	cursor: default !important;
 }
 
 .fc-event-row.fc-type-freebusy td {
@@ -1791,10 +1790,12 @@ a.dropdown-link:after {
 .fc-event-hori.fc-type-freebusy .fc-event-inner,
 .fc-event-vert.fc-type-freebusy .fc-event-skin,
 .fc-event-vert.fc-type-freebusy .fc-event-inner {
+/*
 	background-color: transparent !important;
 	border-color: #444 !important;
 	color: #fff !important;
 	text-shadow: 0 1px 1px #000;
+*/
 }
 
 .fc-event-hori.fc-type-freebusy .fc-event-title,


commit 6308592b5c51a828a1c2d5715726e60e62843103
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Sep 24 17:08:29 2014 +0200

    Fix subtype iteration after changes in f0b205cb

diff --git a/plugins/kolab_folders/kolab_folders.php b/plugins/kolab_folders/kolab_folders.php
index fbffa34..2acf5c5 100644
--- a/plugins/kolab_folders/kolab_folders.php
+++ b/plugins/kolab_folders/kolab_folders.php
@@ -540,8 +540,7 @@ class kolab_folders extends rcube_plugin
 
         // get configured defaults
         foreach ($this->types as $type) {
-            $subtypes = $type == 'mail' ? $this->mail_types : array('default');
-            foreach ($subtypes as $subtype) {
+            foreach ((array)$this->subtypes[$type] as $subtype) {
                 $opt_name = 'kolab_folders_' . $type . '_' . $subtype;
                 if ($folder = $this->rc->config->get($opt_name)) {
                     // convert configuration value to UTF7-IMAP charset