gunnar: server/patches/horde-webmail/1.2.0/merges issue3439.patch, 1.1, 1.2

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/merges
In directory doto:/tmp/cvs-serv2605/patches/horde-webmail/1.2.0/merges

Modified Files:
	issue3439.patch 
Log Message:
 kolab/issue3439 (FreeBusy display in web client and fbview depends on kolabHomeServer in LDAP)

Index: issue3439.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/merges/issue3439.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- issue3439.patch	26 Feb 2009 14:52:05 -0000	1.1
+++ issue3439.patch	26 Feb 2009 16:47:48 -0000	1.2
@@ -1,31 +1,31 @@
 diff --git a/turba/config/sources.php b/turba/config/sources.php
 index bc0bf1d..3dea22b 100644
---- a/turba/config/sources.php
-+++ b/turba/config/sources.php
-@@ -827,7 +827,8 @@ if (!empty($GLOBALS['conf']['kolab']['enabled'])) {
+--- 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.ifb'),
-+                                             'format' => 'https://%s/freebusy/%s.ifb',
-+					     'defaults' => array('kolabHomeServer' => $_kolab_server)),
+-                                             '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/Driver.php
+diff --git a/turba/lib/Driver.php b/turba/lib/Object.php
 index 09a09a8..db746d2 100644
---- a/turba/lib/Driver.php
-+++ b/turba/lib/Driver.php
-@@ -218,7 +218,11 @@ class Turba_Driver {
-                         if (isset($hash[$mapfields])) {
-                             $fieldarray[] = $hash[$mapfields];
-                         } else {
--                            $fieldarray[] = '';
-+                            if (isset($this->map[$key]['defaults'][$mapfields])) {
-+                                $fieldarray[] = $this->map[$key]['defaults'][$mapfields];
-+                            } else {
-+                                $fieldarray[] = '';
-+                            }
-                         }
-                     }
-                     $fields[$this->map[$key]['attribute']] = trim(vsprintf($this->map[$key]['format'], $fieldarray), " \t\n\r\0\x0B,");
+--- 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])) {