gunnar: server/kolab-resource-handlers/kolab-resource-handlers/freebusy pfb.php.in, 1.7, 1.8 freebusyldap_dummy.class.php, 1.1, 1.2

cvs at kolab.org cvs at kolab.org
Wed Nov 22 12:25:06 CET 2006


Author: gunnar

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy
In directory doto:/tmp/cvs-serv26501/freebusy

Modified Files:
	pfb.php.in freebusyldap_dummy.class.php 
Log Message:
	* freebusy/pfb.php.in: 

	Fixed cache dir path problem described in

	https://intevation.de/roundup/kolab/issue1490

	and introduced with

	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolabd/kolabd/templates/freebusy.conf.template.in.diff?r1=1.3&r2=1.4

	The use of $params['kolab_prefix'] originated from the original
	caching patch but should not be used as introduced with

	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/pfb.php.in.diff?r1=1.5&r2=1.6

	since this breaks compatibility with running kolab on other
	distros.
	
	* freebusy/freebusyldap_dummy.class.php: 

	Trailing newline introduced in
	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusyldap_dummy.class.php?rev=1.1&content-type=text/vnd.viewcvs-markup
	may trigger php warnings depending on php verbosity


Index: pfb.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/pfb.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pfb.php.in	31 Oct 2006 04:14:55 -0000	1.7
+++ pfb.php.in	22 Nov 2006 11:25:03 -0000	1.8
@@ -118,10 +118,8 @@
   exit;
 }
 
-$full_cache_dir = $params['kolab_prefix'] . $params['cache_dir'];
-
-$cache =& new FreeBusyCache( $full_cache_dir, $params['pfb_dbformat'], false );
-$xcache =& new FreeBusyCache( $full_cache_dir, $params['pfb_dbformat'], true );
+$cache =& new FreeBusyCache( $params['cache_dir'], $params['pfb_dbformat'], false );
+$xcache =& new FreeBusyCache( $params['cache_dir'], $params['pfb_dbformat'], true );
 
 
 if( $req_cache ) {

Index: freebusyldap_dummy.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusyldap_dummy.class.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- freebusyldap_dummy.class.php	25 Oct 2006 02:28:57 -0000	1.1
+++ freebusyldap_dummy.class.php	22 Nov 2006 11:25:03 -0000	1.2
@@ -69,5 +69,4 @@
   }
 };
 
-?>
-
+?>
\ No newline at end of file





More information about the commits mailing list