steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusycache.class.php, 1.12, 1.13 freebusyldap.class.php, 1.6, 1.7 pfb.php, 1.13, 1.14 recurrence.class.php, 1.6, 1.7

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	freebusycache.class.php freebusyldap.class.php pfb.php 
	recurrence.class.php 
Log Message:
Fix for issue243 (recurence) + some better debug logging

Index: freebusycache.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusycache.class.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- freebusycache.class.php	8 Jan 2005 11:51:30 -0000	1.12
+++ freebusycache.class.php	13 Jan 2005 02:41:31 -0000	1.13
@@ -33,6 +33,9 @@
     }
 
     $fbfilename = $this->mkfbfilename($filename);
+    myLog("FreeBusyCache::store( file=$fbfilename, acl=[ "
+	  .str_replace("\n",", ",$this->aclToString($acl))
+	  ."], relevance=$relevance )", RM_LOG_DEBUG);
     if( $fbdata === false ) {
       // false data means delete the pfb
       unlink($fbfilename);
@@ -85,7 +88,11 @@
       }
 
       $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', 'gdbm' );
-      if( $db === false ) return false;
+      if( $db === false ) {
+	myLog('Unable to open freebusy cache db '.$this->basedir.'/pfbcache.db',
+	      RM_LOG_ERROR );
+	return false;
+      }
       foreach( $acl as $ac ) {
 	$uid = $ac['USER'];
 	if( dba_exists( $uid, $db ) ) {
@@ -115,10 +122,12 @@
   }
 
   function load( $filename, &$ts, &$acl ) {
+    myLog("FreeBusyCache::load( $filename )", RM_LOG_DEBUG);
     $fbfilename = $this->mkfbfilename($filename);
     if( file_exists($fbfilename) ) {
       if( !is_null($ts)) $ts = filectime($fbfilename);
       $acl = $this->loadACL($filename);
+      myLog("FreeBusyCache::load(), ts=$ts, acl=".print_r($acl,true), RM_LOG_DEBUG);
       return file_get_contents($fbfilename);
     }
     return false;

Index: freebusyldap.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusyldap.class.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- freebusyldap.class.php	16 Dec 2004 20:54:46 -0000	1.6
+++ freebusyldap.class.php	13 Jan 2005 02:41:31 -0000	1.7
@@ -114,20 +114,21 @@
     return false;    
   }
   function distlists( $dn ) {
-    myLog( "FreeBusyLDAP::distlists( $dn )", RM_LOG_DEBUG );
     $result = ldap_search( $this->connection, $this->base, 
 			   '(&(objectClass=kolabGroupOfNames)(member='.FreeBusyLDAP::escape($dn).'))',
 			   array( 'cn' ) );
     if( $result ) {
       $entries = ldap_get_entries( $this->connection, $result );
       $lst = array();
-      myLog( 'FreeBusyLDAP::distlists found '.$entries['count'].' entries', RM_LOG_DEBUG );
       for( $i = 0; $i < $entries['count']; $i++ ) {
-	myLog( "FreeBusyLDAP::distlists found ".$entries[$i]['cn'][0], RM_LOG_DEBUG );
 	$lst[] = $entries[$i]['cn'][0];
       }
+      myLog( "FreeBusyLDAP::distlists( $dn ) found ".count($lst)." entries", 
+	     RM_LOG_DEBUG );
       return $lst;
     }
+    myLog( "FreeBusyLDAP::distlists( $dn ) found nothing", 
+	   RM_LOG_DEBUG );
     return false;
   }
 

Index: pfb.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/pfb.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- pfb.php	11 Jan 2005 14:35:15 -0000	1.13
+++ pfb.php	13 Jan 2005 02:41:31 -0000	1.14
@@ -34,6 +34,9 @@
 $req_folder   = $_REQUEST['folder'];
 $req_extended = (bool)$_REQUEST['extended'];
 
+myLog("pfb.php starting up: user=$imapuser, folder=$req_folder, extended=$req_extended", 
+      RM_LOG_DEBUG);
+
 $ldap =& new FreeBusyLDAP( $params['ldap_uri'], $params['base_dn'] );
 if( !$ldap->bind( $params['bind_dn'], $params['bind_pw'] ) ) {
   notFound( "Bind failed: ".$ldap->error() );
@@ -48,6 +51,7 @@
 
 if( $homeserver && $homeserver != $params['server'] ) {
   $redirect = 'https://'.$homeserver . $_SERVER['REQUEST_URI'];
+  myLog("Found remote user, redirecting to $homeserver", RM_LOG_DEBUG);
   if ($params['redirect']) {
     header("Location: $redirect");
   } else {
@@ -172,5 +176,6 @@
 #print_r($acl);
 
 // Finish up
+myLog("pfb.php complete", RM_LOG_DEBUG);
 shutdown();
 ?>

Index: recurrence.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/recurrence.class.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- recurrence.class.php	12 Jan 2005 02:51:04 -0000	1.6
+++ recurrence.class.php	13 Jan 2005 02:41:31 -0000	1.7
@@ -91,7 +91,7 @@
 	  $count = 0;
 	  $delta_days = getdate($this->initial_start);
 	  $delta_days = $delta_days['mday'];
-	  for( $t = strtotime( "-$delta_days", $this->initial_start ); $t < $endstamp; $t = strtotime( "+$interval months", $t) ) {
+	  for( $t = strtotime( "-$delta_days days", $this->initial_start ); $t < $endstamp; $t = strtotime( "+$interval months", $t) ) {
 	    if( $this->type == 'daynumber') {
 	      // On numbered days
 	      foreach( $this->daynumber as $dayno ) {
@@ -130,7 +130,7 @@
 	  $count = 0;
 	  $delta_days = getdate($this->initial_start);
 	  $delta_days = $delta_days['yday'];
-	  for( $t = strtotime( "-$delta_days", $this->initial_start ); $t < $endstamp; $t = strtotime( "+$interval years", $t) ) {
+	  for( $t = strtotime( "-$delta_days days", $this->initial_start ); $t < $endstamp; $t = strtotime( "+$interval years", $t) ) {
 	    if( $this->type == 'yearday') {
 	      foreach( $this->daynumber as $dayno ) {
 		$tmp = strtotime( '+'.($dayno-1).' days', $t);