steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusy.php, 1.21, 1.22

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	freebusy.php 
Log Message:
yet another bugfix

Index: freebusy.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- freebusy.php	9 Sep 2004 21:05:09 -0000	1.21
+++ freebusy.php	10 Sep 2004 10:13:31 -0000	1.22
@@ -368,7 +368,9 @@
 }
 
 $fbdir = $params['kolab_prefix'].'/var/kolab/www/freebusy/data/';
-$fbfilename = $fbdir.$user.($extended?'.xfb':'.ifb');
+$ifbfilename = $fbdir.$user.'.ifb';
+$xfbfilename = $fbdir.$user.'.xfb';
+$fbfilename = ($extended?$xfbfilename:$ifbfilename);
 
 // Handle the case of 'user' instead of 'user at domain'
 if (strstr($user, '@') === false) {
@@ -506,12 +508,13 @@
     }
 
     $vfb = file_get_contents($fbfilename);
+    $ts = filectime($fbfilename);
     if (!$vfb && $extended) {
         // Check if we have a plain fb list
-        $vfb = file_get_contents("$fbdir$user.ifb");
+        $vfb = file_get_contents($ifbfilename);
+	$ts = filectime($ifbfilename);
     }
     if (!$vfb) notFound("Unable to locate cached free/busy list");
-    $ts = filectime($fbfilename);
 }
 
 // And finally send it out, ensuring it doesn't get cached along the way