steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusycache.class.php, 1.7, 1.8

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	freebusycache.class.php 
Log Message:
install pear classes into private directory to avoid conflicts with the webclient

Index: freebusycache.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusycache.class.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- freebusycache.class.php	20 Oct 2004 12:31:33 -0000	1.7
+++ freebusycache.class.php	22 Oct 2004 08:55:49 -0000	1.8
@@ -89,7 +89,6 @@
 
   function load( $filename, &$ts, &$acl ) {
     $fbfilename = $this->mkfbfilename($filename);
-    if( $fbfilename != realpath( $fbfilename )) return false;    
     if( file_exists($fbfilename) ) {
       if( !is_null($ts)) $ts = filectime($fbfilename);
       $acl = $this->loadACL($filename);
@@ -100,7 +99,6 @@
 
   function delete( $filename ) {
     $fbfilename = $this->mkfbfilename($filename);
-    if( $fbfilename != realpath( $fbfilename )) return false;    
     unlink($fbfilename);
     unlink($this->mkaclfilename($filename));    
     $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', 'gdbm' );
@@ -149,10 +147,14 @@
   }
 
   function mkfbfilename( $fbfilename ) {
+    $fbfilename = str_replace( '..', '', $fbfilename );
+    $fbfilename = str_replace( "\0", '', $fbfilename );    
     return $this->basedir.'/'.$fbfilename.($this->extended?'.xpfb':'.pfb');
   }
 
   function mkaclfilename( $fbfilename ) {
+    $fbfilename = str_replace( '..', '', $fbfilename );
+    $fbfilename = str_replace( "\0", '', $fbfilename );    
     return $this->basedir.'/'.$fbfilename.($this->extended?'.xpfb':'.pfb').'.acl';
   }