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

cvs at kolab.org cvs at kolab.org
Fri Mar 2 05:32:32 CET 2007


Author: steffen

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

Modified Files:
	freebusy.php.in freebusycache.class.php.in 
Log Message:
switch to db4

Index: freebusy.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- freebusy.php.in	22 Nov 2006 17:05:18 -0000	1.7
+++ freebusy.php.in	2 Mar 2007 04:32:29 -0000	1.8
@@ -92,6 +92,8 @@
   notFound($pfb->error);
 }
 
+//myLog("Found pfbs: ".join(",",$pfbs)." for $user",RM_LOG_DEBUG);
+
 if( $req_extended ) {
   // Get accessing users groups
   $imapgroups = $ldap->distlists( $ldap->dn( $imapuser ) );
@@ -138,4 +140,4 @@
 }
 
 echo $vfb;
-?>
\ No newline at end of file
+?>

Index: freebusycache.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusycache.class.php.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- freebusycache.class.php.in	22 Nov 2006 15:49:59 -0000	1.8
+++ freebusycache.class.php.in	2 Mar 2007 04:32:29 -0000	1.9
@@ -165,7 +165,10 @@
     } else {
       $db = dba_open( $this->basedir.'/pfbcache.db', 'cd' );
     }
-    if( $db === false ) return false;
+    if( $db === false ) {
+	myLog("dba_open(".$this->basedir.'/pfbcache.db'.") failed", RM_LOG_ERROR);
+	return false;
+    }
     for( $uid = dba_firstkey($db); $uid !== false; $uid = dba_nextkey($db)) {
       $lst = dba_fetch( $uid, $db );
       $lst = $this->decodeList( $lst );
@@ -184,7 +187,10 @@
     } else {
       $db = dba_open( $this->basedir.'/pfbcache.db', 'rd' );
     }
-    if( $db === false ) return false;
+    if( $db === false ) {
+	myLog("dba_open(".$this->basedir.'/pfbcache.db'.") failed", RM_LOG_ERROR);
+	return false;
+    }
     $uids = $groups;
     for( $i = 0; $i < count($uids); $i++ ) $uids[$i] = 'group:'.$uids[$i];
     $uids[] = $uid;
@@ -319,6 +325,7 @@
   }
 
   function decodeList( $str ) {
+    myLog("FreeBusyCache::decodeList($str)", RM_LOG_DEBUG);
     return split( ',', $str );
   }
   function encodeList( $lst ) {
@@ -348,4 +355,4 @@
   var $error;
 };
 
-?>
\ No newline at end of file
+?>





More information about the commits mailing list