plugins/calendar
Thomas Brüderli
bruederli at kolabsys.com
Thu Oct 4 14:46:47 CEST 2012
plugins/calendar/drivers/kolab/kolab_driver.php | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit 66bb3b665d487d255115981a9872a6ac97a9d645
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Thu Oct 4 14:46:27 2012 +0200
Treat 'dummy' free busy lists as 'unknown' (#1070)
diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php
index 18e5194..609d81b 100644
--- a/plugins/calendar/drivers/kolab/kolab_driver.php
+++ b/plugins/calendar/drivers/kolab/kolab_driver.php
@@ -890,6 +890,10 @@ class kolab_driver extends calendar_driver
$result[] = array($from, $to, isset($fbtypemap[$type]) ? $fbtypemap[$type] : calendar::FREEBUSY_BUSY);
}
+ // we take 'dummy' free-busy lists as "unknown"
+ if (empty($result) && ($comment = $fb->getAttribute('COMMENT')) && stripos($comment, 'dummy'))
+ return false;
+
// 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));
@@ -898,6 +902,7 @@ class kolab_driver extends calendar_driver
if (($fbend = $fb->getEnd()) && $fbend < $end) {
$result[] = array($fbend, $end, calendar::FREEBUSY_UNKNOWN);
}
+
return $result;
}
}
More information about the commits
mailing list