richard: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusy.php.in, 1.1, 1.2 pfb.php.in, 1.1, 1.2

cvs at intevation.de cvs at intevation.de
Sat Dec 17 12:05:58 CET 2005


Author: richard

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

Modified Files:
	freebusy.php.in pfb.php.in 
Log Message:
* ../Makefile: the rpm could not be build, fixed by copying the
  kolabd Makefile and some little adaptions to it
* kolab-resource-handlers.spec.in: simplified the %setup tag and
  the configure command
* Makefile.am: group resmgr/kolabfilter.php and
  resmgr/kolabmailboxfilter.php into the conffile_FILES
  Create the directories $(resmgr_filterdir) and $(freebusy_cachedir)
  during installation
* freebusy/pfb.php.in,
  freebusy/freebusy.php.in: @freebusy_cachefile@ replaced by
  @freebusy_cachedir@
* resmgr/kolabfilter.php.in,
  resmgr/kolabmailboxfilter.php.in: @resmgr_filter@ replaced by
  @resmgr_filterdir@



Index: freebusy.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- freebusy.php.in	5 Dec 2005 14:13:42 -0000	1.1
+++ freebusy.php.in	17 Dec 2005 11:05:56 -0000	1.2
@@ -68,7 +68,7 @@
 }
 
 $user = strtolower($user);
-$cache =& new FreeBusyCache( '@freebusy_cachefile@', $req_extended );
+$cache =& new FreeBusyCache( '@freebusy_cachedir@', $req_extended );
 $collector =& new FreeBusyCollector( $user );
 
 $groups = $ldap->distlists( $ldap->dn( $user ) );

Index: pfb.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/pfb.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pfb.php.in	5 Dec 2005 14:13:42 -0000	1.1
+++ pfb.php.in	17 Dec 2005 11:05:56 -0000	1.2
@@ -101,9 +101,9 @@
   exit;
 }
 
-$cache =& new FreeBusyCache( '@freebusy_cachefile@',
+$cache =& new FreeBusyCache( '@freebusy_cachedir@',
 			     false );
-$xcache =& new FreeBusyCache( '@freebusy_cachefile@',
+$xcache =& new FreeBusyCache( '@freebusy_cachedir@',
 			     true );
 
 if( $req_cache ) {





More information about the commits mailing list