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

[cvs at kolab.org]

Author: gunnar

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

Added Files:
	issue3439.patch 
Log Message:
Potential patch for kolab/issue3439 (FreeBusy display in web client and fbview depends on kolabHomeServer in LDAP) - not yet tested.

--- NEW FILE: issue3439.patch ---
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'])) {
                 '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)),
             ),
             'search' => array(
                 'name',
diff --git a/turba/lib/Driver.php b/turba/lib/Driver.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,");