Branch '2.3-stable' - pear/Kolab_Freebusy
Christoph Wickert
wickert at kolabsys.com
Tue May 24 11:38:19 CEST 2011
pear/Kolab_Freebusy/ChangeLog | 6
pear/Kolab_Freebusy/Kolab_FreeBusy.spec | 2
pear/Kolab_Freebusy/package.info | 2
pear/Kolab_Freebusy/patches/Kolab_FreeBusy-0.5.1/Kolab_FreeBusy_0.5.1_p3.patch | 99 ++++++++++
4 files changed, 107 insertions(+), 2 deletions(-)
New commits:
commit 5e34ccc194b496468c6de0e79ec5556554ce0197
Author: Gunnar Wrobel <wrobel at pardus.de>
Date: Fri May 20 11:54:01 2011 +0000
kolab/issue4730 (generating free/busy cache broken in server 2.3.0)
diff --git a/pear/Kolab_Freebusy/ChangeLog b/pear/Kolab_Freebusy/ChangeLog
index 0352e0b..4596464 100644
--- a/pear/Kolab_Freebusy/ChangeLog
+++ b/pear/Kolab_Freebusy/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-20 Gunnar Wrobel <p at rdus.de>
+
+ * patches/Kolab_FreeBusy-0.5.1/Kolab_FreeBusy_0.5.1_p3.patch:
+
+ kolab/issue4730 (generating free/busy cache broken in server 2.3.0)
+
2011-05-18 Gunnar Wrobel <p at rdus.de>
* patches/Kolab_FreeBusy-0.5.1/Kolab_FreeBusy_0.5.1_p1.patch:
diff --git a/pear/Kolab_Freebusy/Kolab_FreeBusy.spec b/pear/Kolab_Freebusy/Kolab_FreeBusy.spec
index 7f1d1d4..8c9b75f 100644
--- a/pear/Kolab_Freebusy/Kolab_FreeBusy.spec
+++ b/pear/Kolab_Freebusy/Kolab_FreeBusy.spec
@@ -7,7 +7,7 @@
%define V_repo_commit
%define V_repo_release
%define V_version 0.5.1
-%define V_release 20110518
+%define V_release 20110520
%define V_sourceurl http://pear.horde.org/get
%define V_php_lib_loc php
%define V_www_loc freebusy
diff --git a/pear/Kolab_Freebusy/package.info b/pear/Kolab_Freebusy/package.info
index 8957ec9..690cb16 100644
--- a/pear/Kolab_Freebusy/package.info
+++ b/pear/Kolab_Freebusy/package.info
@@ -16,7 +16,7 @@ package_origin='WGET'
version='0.5.1'
# Package release number
-release='20110518'
+release='20110520'
# Source URL to download from
sourceurl='http://files.kolab.org/server/development-2.3/externals'
diff --git a/pear/Kolab_Freebusy/patches/Kolab_FreeBusy-0.5.1/Kolab_FreeBusy_0.5.1_p3.patch b/pear/Kolab_Freebusy/patches/Kolab_FreeBusy-0.5.1/Kolab_FreeBusy_0.5.1_p3.patch
new file mode 100644
index 0000000..513d01e
--- /dev/null
+++ b/pear/Kolab_Freebusy/patches/Kolab_FreeBusy-0.5.1/Kolab_FreeBusy_0.5.1_p3.patch
@@ -0,0 +1,99 @@
+From: Gunnar Wrobel <wrobel at pardus.de>
+Subject: [PATCH] Kolab_FreeBusy_0.5.1_p3.patch
+
+kolab/issue4730 (generating free/busy cache broken in server 2.3.0)
+
+STATUS: MERGED
+
+Signed-off-by: Gunnar Wrobel <wrobel at pardus.de>
+
+--- a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy.php 19 May 2011 05:37:50 -0000 1.10.2.7
++++ b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy.php 20 May 2011 11:24:41 -0000
+@@ -331,9 +331,9 @@
+ $trigger
+ );
+ if (empty($vCal)) {
+- $result = $this->_getCache()->deletePartial($this->_getDbUser(), $folder);
++ $result = $this->_getCache($owner)->deletePartial($this->_getDbUser(), $folder);
+ } else {
+- $result = $this->_getCache()->storePartial($this->_getDbUser(), $folder, $this->_getResource($trigger, $owner), $vCal);
++ $result = $this->_getCache($owner)->storePartial($this->_getDbUser(), $folder, $this->_getResource($trigger, $owner), $vCal);
+ }
+ if (is_a($result, 'PEAR_Error')) {
+ $reporter->failure($calendar->name, $result->getMessage());
+@@ -574,7 +574,7 @@
+ $owner_name
+ );
+ }
+- if ($this->_db_owner === null) {
++ if ($this->_db_owner === null || !empty($owner_name)) {
+ require_once 'Horde/Kolab/FreeBusy/UserDb.php';
+ require_once 'Horde/Kolab/FreeBusy/UserDb/Kolab.php';
+ require_once 'Horde/Kolab/FreeBusy/UserDb/User.php';
+@@ -618,7 +618,7 @@
+ return $this->_db_user;
+ }
+
+- public function _getCache()
++ public function _getCache($owner_name = null)
+ {
+ global $conf;
+
+@@ -650,7 +650,7 @@
+ ),
+ new Horde_Kolab_FreeBusy_Logger()
+ ),
+- $this->_getDbOwner()
++ $this->_getDbOwner($owner_name)
+ );
+ }
+ }
+--- a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache/Combined/Freebusy.php 10 Oct 2010 16:26:43 -0000 1.1.2.1
++++ b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache/Combined/Freebusy.php 20 May 2011 11:24:41 -0000
+@@ -136,7 +136,11 @@
+
+ public function getFreeBusy($partial, $extended)
+ {
+- $vcal = $partial->load($extended);
++ if ($extended) {
++ $vcal = $partial->load();
++ } else {
++ $vcal = $partial->loadSimple();
++ }
+ $freebusy = $vcal->findComponent('vfreebusy');
+ if (is_a($freebusy, 'PEAR_Error')) {
+ throw new Horde_Kolab_FreeBusy_Exception(
+--- a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache/File/Vcal.php 10 Oct 2010 16:26:44 -0000 1.1.2.1
++++ b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache/File/Vcal.php 20 May 2011 11:24:41 -0000
+@@ -137,7 +137,7 @@
+ $extended
+ ) {
+ try {
+- $this->load();
++ $this->loadVcal();
+ } catch (Horde_Kolab_FreeBusy_Exception $e) {
+ return true;
+ }
+@@ -147,9 +147,7 @@
+ return true;
+ }
+
+- if (isset($result['vcal']) && $result instanceOf Horde_iCalendar) {
+- $this->_data = $result['vcal'];
+- } else {
++ if (!$this->_data instanceOf Horde_iCalendar) {
+ return true;
+ }
+
+--- a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache/Structure/Base.php 9 May 2011 08:35:48 -0000 1.1.2.3
++++ b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache/Structure/Base.php 20 May 2011 11:24:41 -0000
+@@ -71,9 +71,7 @@
+ Horde_Kolab_FreeBusy_Owner $owner
+ ) {
+ return $this->_encodeId(
+- $this->_parseOwnerId(
+- $owner->getPrimaryId() . '/' . $folder->getFolder()
+- )
++ $this->_parseOwnerId($owner->getPrimaryId()) . '/' . $folder->getFolder()
+ );
+ }
More information about the commits
mailing list