3 commits - composer.json lib/Kolab web/index.php
Thomas Brüderli
bruederli at kolabsys.com
Thu Apr 25 09:16:49 CEST 2013
composer.json | 2 +-
lib/Kolab/FreeBusy/FormatExchange2010.php | 8 +++++---
lib/Kolab/FreeBusy/SourceURL.php | 2 +-
web/index.php | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 7e528b1816e96db6aff9d5397a1127d920e7655b
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Thu Apr 25 09:11:25 2013 +0200
Bump version to 0.1.1
diff --git a/composer.json b/composer.json
index 3dae001..910564b 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"name": "kolab/free-busy",
"description": "Kolab Free/Busy Service",
"license": "AGPL-3.0",
- "version": "0.1-alpha",
+ "version": "0.1.1",
"repositories": [
{
"type": "pear",
diff --git a/web/index.php b/web/index.php
index f62c420..93a998a 100644
--- a/web/index.php
+++ b/web/index.php
@@ -5,7 +5,7 @@
*
* This is the public API to provide Free/Busy information for Kolab users.
*
- * @version 0.1.0
+ * @version 0.1.1
* @author Thomas Bruederli <bruederli at kolabsys.com>
*
* Copyright (C) 2013, Kolab Systems AG <contact at kolabsys.com>
commit 4ef39fbdc17aca11852661592f3070cbbd5282b2
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Thu Apr 25 09:10:53 2013 +0200
Suppress PHP warnings when file_get_contents failed. The result is logged further below
diff --git a/lib/Kolab/FreeBusy/SourceURL.php b/lib/Kolab/FreeBusy/SourceURL.php
index e838640..d62a520 100644
--- a/lib/Kolab/FreeBusy/SourceURL.php
+++ b/lib/Kolab/FreeBusy/SourceURL.php
@@ -32,7 +32,7 @@ class SourceURL extends Source
$config['url'] = self::composeUrl($config); // re-compose url without user:pass
}
- $data = file_get_contents($config['url'], false, $context);
+ $data = @file_get_contents($config['url'], false, $context);
// log this...
Logger::get('url')->addInfo("Fetching data from " . $config['url'] . ": " . ($data ? 'OK' : 'FAILED'));
commit 5dee600ef7f60eae11c06b3c04e88a4582bcfdd6
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Thu Apr 25 09:10:05 2013 +0200
Improve Exchange 2010 format converter output
diff --git a/lib/Kolab/FreeBusy/FormatExchange2010.php b/lib/Kolab/FreeBusy/FormatExchange2010.php
index 8aec7e4..8534df2 100644
--- a/lib/Kolab/FreeBusy/FormatExchange2010.php
+++ b/lib/Kolab/FreeBusy/FormatExchange2010.php
@@ -39,15 +39,17 @@ class FormatExchange2010 extends Format
// feed the calendar object into the free/busy generator
// we must specify a start and end date, because recurring events are expanded. nice!
+ $utc = new \DateTimezone('UTC');
$fbgen = new FreeBusyGenerator(
- new \DateTime('now - 8 weeks'),
- new \DateTime('now + 16 weeks'),
+ new \DateTime('now - 8 weeks 00:00:00', $utc),
+ new \DateTime('now + 16 weeks 00:00:00', $utc),
$calendar
);
// get the freebusy report
$freebusy = $fbgen->getResult();
- $freebusy->PRODID->value = '-//kolab.org//NONSGML Kolab Server 3//EN';
+ $freebusy->PRODID = '-//kolab.org//NONSGML Kolab Server 3//EN';
+ $freebusy->METHOD = 'PUBLISH';
// serialize to VCALENDAR format
return $freebusy->serialize();
More information about the commits
mailing list