From a40f98f433ed324b7fc3992f2c59d37d11c4cd73 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Wed, 27 Jul 2011 10:48:40 +0200 Subject: [PATCH] Enable free-busy UI for Kolab; show passed free-busy slots as 'unknown' --- plugins/calendar/calendar_ui.js | 2 +- plugins/calendar/drivers/kolab/kolab_driver.php | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js index 59fa93a7..938f6932 100644 --- a/plugins/calendar/calendar_ui.js +++ b/plugins/calendar/calendar_ui.js @@ -462,7 +462,7 @@ function rcube_calendar_ui(settings) for (var j=0; j < event.attendees.length; j++) add_attendee(event.attendees[j], true); } -// $('#edit-attendee-schedule')[(calendar.freebusy?'show':'hide')](); + $('#edit-attendee-schedule')[(calendar.freebusy?'show':'hide')](); // attachments if (calendar.attachments) { diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php index 20329332..7b97afa1 100644 --- a/plugins/calendar/drivers/kolab/kolab_driver.php +++ b/plugins/calendar/drivers/kolab/kolab_driver.php @@ -26,6 +26,7 @@ class kolab_driver extends calendar_driver // features this backend supports public $alarms = true; public $attendees = true; + public $freebusy = true; public $attachments = true; public $undelete = true; public $categoriesimmutable = true; @@ -786,7 +787,11 @@ class kolab_driver extends calendar_driver $type = $params[$from]['FBTYPE']; $result[] = array($from, $to, isset($fbtypemap[$type]) ? $fbtypemap[$type] : calendar::FREEBUSY_BUSY); } - + + // set period from $start till the begin of the free-busy information as 'unknown' + if (($fbstart = $fb->getStart()) && $start < $fbstart) { + array_unshift($result, array($start, $fbstart, calendar::FREEBUSY_UNKNOWN)); + } return $result; } }