steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusy.class.php.in, 1.2, 1.3 freebusycache.class.php.in, 1.2, 1.3

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	freebusy.class.php.in freebusycache.class.php.in 
Log Message:
Make freebusy work again -- the dbtype param broke it

Index: freebusy.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.class.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- freebusy.class.php.in	5 Feb 2006 20:15:10 -0000	1.2
+++ freebusy.class.php.in	2 Mar 2006 12:51:12 -0000	1.3
@@ -139,13 +139,13 @@
     }
 	myLog("Reading messagelist", RM_LOG_DEBUG);
 	$getMessages_start = microtime_float();
-	$msglist = &$this->imap->getMessagesList();
+	$msglist = $this->imap->getMessagesList();
 	//$msglist = &$this->imap->getMessages();
 	myLog("FreeBusy::imap->getMessagesList() took ".(microtime_float()-$getMessages_start)." secs.", RM_LOG_DEBUG);
     if( PEAR::isError( $msglist ) ) return array( $msglist, null);
 	foreach ($msglist as $msginfo) {
 	  //myLog("Reading message ".$msginfo['msg_id'], RM_LOG_DEBUG);
-	  $textmsg = &$this->imap->getMsg($msginfo['msg_id']);
+	  $textmsg = $this->imap->getMsg($msginfo['msg_id']);
       $mimemsg = &MIME_Structure::parseTextMIMEMessage($textmsg);
     
       // Read in a Kolab event object, if one exists
@@ -243,7 +243,8 @@
     $vCal->addComponent($this->clearExtra($vFb));
   
     // Generate the vCal file.
-    return array( $vCal->exportvCalendar(), $xvCal->exportvCalendar() );
+    $result = array( $vCal->exportvCalendar(), $xvCal->exportvCalendar() );
+    return $result;
   }
 
   /********************** Private API below this line ********************/

Index: freebusycache.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusycache.class.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- freebusycache.class.php.in	5 Feb 2006 20:15:10 -0000	1.2
+++ freebusycache.class.php.in	2 Mar 2006 12:51:12 -0000	1.3
@@ -45,7 +45,11 @@
       // false data means delete the pfb
       unlink($fbfilename);
       $oldacl = $this->loadACL( $filename );
-      $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', $params['dbtype'] );
+      if( isset($params['dbtype']) ) {
+	$db = dba_open( $this->basedir.'/pfbcache.db', 'cd', $params['dbtype'] );
+      } else {
+	$db = dba_open( $this->basedir.'/pfbcache.db', 'cd' );
+      }
       if( $db === false ) return false;
       foreach( $oldacl as $ac ) {
 	  if( dba_exists( $ac['USER'], $db ) ) {
@@ -92,7 +96,11 @@
       default: $perm = 'a';
       }
 
-      $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', $params['dbtype'] );
+      if( isset($params['dbtype']) ) {
+	$db = dba_open( $this->basedir.'/pfbcache.db', 'cd', $params['dbtype'] );
+      } else {
+	$db = dba_open( $this->basedir.'/pfbcache.db', 'cd' );
+      }
       if( $db === false ) {
 	myLog('Unable to open freebusy cache db '.$this->basedir.'/pfbcache.db',
 	      RM_LOG_ERROR );
@@ -145,7 +153,11 @@
     $fbfilename = $this->mkfbfilename($filename);
     unlink($fbfilename);
     unlink($this->mkaclfilename($filename));    
-    $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', $params['dbtype'] );
+    if( isset($params['dbtype']) ) {
+      $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', $params['dbtype'] );
+    } else {
+      $db = dba_open( $this->basedir.'/pfbcache.db', 'cd' );
+    }
     if( $db === false ) return false;
     for( $uid = dba_firstkey($db); $uid !== false; $uid = dba_nextkey($db)) {
       $lst = dba_fetch( $uid, $db );
@@ -160,7 +172,11 @@
   function findAll( $uid, $groups ) {
     global $params;
     $lst = array();
-    $db = dba_open( $this->basedir.'/pfbcache.db', 'rd', $params['dbtype'] );
+    if( isset($params['dbtype']) ) {
+      $db = dba_open( $this->basedir.'/pfbcache.db', 'rd', $params['dbtype'] );
+    } else {
+      $db = dba_open( $this->basedir.'/pfbcache.db', 'rd' );
+    }
     if( $db === false ) return false;
     $uids = $groups;
     for( $i = 0; $i < count($uids); $i++ ) $uids[$i] = 'group:'.$uids[$i];