gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.31, 1.32
cvs at kolab.org
cvs at kolab.org
Thu Feb 26 17:47:50 CET 2009
Author: gunnar
Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv2605/patches/horde-webmail/1.2.0
Modified Files:
horde-webmail-1.2.0_kolab_openpkg.patch
Log Message:
kolab/issue3439 (FreeBusy display in web client and fbview depends on kolabHomeServer in LDAP)
Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- horde-webmail-1.2.0_kolab_openpkg.patch 20 Feb 2009 14:54:49 -0000 1.31
+++ horde-webmail-1.2.0_kolab_openpkg.patch 26 Feb 2009 16:47:48 -0000 1.32
@@ -19000,3 +19000,34 @@
}
Diff finished. Wed Feb 18 17:55:20 2009
+diff --git a/turba/config/sources.php b/turba/config/sources.php
+index bc0bf1d..3dea22b 100644
+--- a/horde-webmail/turba/config/sources.php
++++ b/horde-webmail/turba/config/sources.php
+@@ -332,7 +332,8 @@
+ 'notes' => 'description',
+ 'kolabHomeServer' => 'kolabHomeServer',
+ 'freebusyUrl' => array('fields' => array('kolabHomeServer', 'email'),
+- 'format' => 'https://%s/freebusy/%s.xfb'),
++ 'format' => 'https://%s/freebusy/%s.xfb',
++ 'defaults' => array('kolabHomeServer' => $GLOBALS['conf']['kolab']['imap']['server'])),
+ ),
+ 'search' => array(
+ 'name',
+diff --git a/turba/lib/Driver.php b/turba/lib/Object.php
+index 09a09a8..db746d2 100644
+--- a/horde-webmail/turba/lib/Object.php
++++ b/horde-webmail/turba/lib/Object.php
+@@ -115,7 +115,11 @@
+ is_array($this->driver->map[$attribute])) {
+ $args = array();
+ foreach ($this->driver->map[$attribute]['fields'] as $field) {
+- $args[] = $this->getValue($field);
++ $value = $this->getValue($field);
++ if (empty($value) && isset($this->driver->map[$attribute]['defaults'][$field])) {
++ $value = $this->driver->map[$attribute]['defaults'][$field];
++ }
++ $args[] = $value;
+ }
+ return trim(vsprintf($this->driver->map[$attribute]['format'], $args), " \t\n\r\0\x0B,");
+ } elseif (!isset($this->attributes[$attribute])) {
More information about the commits
mailing list