gunnar: server/php-kolab/Kolab_Freebusy issue3438.patch,1.1,1.1.2.1

cvs at kolab.org cvs at kolab.org
Fri Mar 20 08:57:24 CET 2009


Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv2319/php-kolab/Kolab_Freebusy

Modified Files:
      Tag: kolab_2_2_branch
	issue3438.patch 
Log Message:
kolab/issue3438 (kolabFreeBusyPast is not used)

Index: issue3438.patch
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/issue3438.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- issue3438.patch	26 Feb 2009 13:54:52 -0000	1.1
+++ issue3438.patch	20 Mar 2009 07:57:22 -0000	1.1.2.1
@@ -1,9 +1,20 @@
 diff --git a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Access.php b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Access.php
-index ed0853c..61b4c06 100644
+index cfd3096..856f54e 100644
 --- a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Access.php
 +++ b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Access.php
-@@ -319,7 +319,9 @@ class Horde_Kolab_FreeBusy_Access {
-         $db = &Horde_Kolab_Server::singleton();
+@@ -313,13 +313,19 @@ class Horde_Kolab_FreeBusy_Access {
+      */
+     function _process() 
+     {
++        global $conf;
++
+         require_once 'Horde/Kolab/Server.php';
+ 
+         /* Connect to the Kolab user database */
+-        $db = &Horde_Kolab_Server::singleton();
++        $db = &Horde_Kolab_Server::singleton(array('uid' => $conf['kolab']['ldap']['phpdn']));
++        // TODO: Remove once Kolab_Server has been fixed to always return the base dn
++        $db->fetch();
  
          /* Retrieve the server configuration */
 -        $server = $db->fetch('k=kolab', KOLAB_OBJECT_SERVER);





More information about the commits mailing list