gunnar: server/kolab-webclient/turba/configuration/turba-2.3.3 10-kolab_sources_base.php, 1.1, 1.2

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/turba/configuration/turba-2.3.3
In directory doto:/tmp/cvs-serv22877/kolab-webclient/turba/configuration/turba-2.3.3

Modified Files:
	10-kolab_sources_base.php 
Log Message:
Merge patches into the turba package and remove the obsolete ones.

Index: 10-kolab_sources_base.php
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/turba/configuration/turba-2.3.3/10-kolab_sources_base.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 10-kolab_sources_base.php	19 Jan 2010 13:17:11 -0000	1.1
+++ 10-kolab_sources_base.php	22 Jan 2010 22:08:36 -0000	1.2
@@ -54,7 +54,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',