steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php, 1.62, 1.63

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv20404/kolab-resource-handlers/resmgr

Modified Files:
	resmgr.php 
Log Message:
recurrence exclusions (Issue243)

Index: resmgr.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- resmgr.php	11 Jan 2005 14:35:15 -0000	1.62
+++ resmgr.php	26 Jan 2005 07:32:31 -0000	1.63
@@ -69,7 +69,7 @@
     foreach ($this->busyperiods as $busyfrom => $busyto) {
       if ( in_array(base64_decode($this->extraparams[$busyfrom]['X-UID']), $this->ignore) ||
 	   in_array(base64_decode($this->extraparams[$busyfrom]['X-SID']), $this->ignore) ) {
-	myLog("Ignoring $uid in fb check", RM_LOG_DEBUG);
+	// Ignore
 	continue;
       }
       if (($busyfrom >= $start && $busyfrom < $end) || ($start >= $busyfrom && $start < $busyto)) {
@@ -967,11 +967,14 @@
 	$recurrence->setRangetype('none');
       }
       $exclusions = $itip->getAttribute('EXDATE');
+      myLog("exslusions=".print_r($exclusions,true), RM_LOG_DEBUG);
       if( !is_a( $exclusions, 'PEAR_Error' ) ) {
 	if( !is_array( $exclusions ) ) $exclusions = array( $exclusions );
 	foreach( $exclusions as $ex ) {
+	  myLog("ex=".print_r($ex[0],true).", ical=".iCalDate2Kolab($ex[0]), RM_LOG_DEBUG);
 	  $ex_node = $recur_node->append_child( $kolab_xml->create_element( 'exclusion' ) );
-	  $ex_node->append_child($kolab_xml->create_text_node( iCalDate2Kolab($ex) ));
+	  $kolab_date = $ex[0]['year'].'-'.$ex[0]['month'].'-'.$ex[0]['mday'];
+	  $ex_node->append_child($kolab_xml->create_text_node( $kolab_date ) );
 	}
       }
     }
@@ -1141,7 +1144,7 @@
 	  myLog('Busy period from ' . strftime('%a, %d %b %Y %H:%M:%S %z', $busyfrom) . ' to ' . strftime('%a, %d %b %Y %H:%M:%S %z', $busyto), RM_LOG_DEBUG);
 	  if ( in_array(base64_decode($extraparams[$busyfrom]['X-UID']), $ignore) ||
 	       in_array(base64_decode($extraparams[$busyfrom]['X-SID']), $ignore) ) {
-	    myLog("Ignoring $uid in fb check", RM_LOG_DEBUG);
+	    // Ignore
 	    continue;
 	  }
 	  if (($busyfrom >= $dtstart && $busyfrom < $dtend) || ($dtstart >= $busyfrom && $dtstart < $busyto)) {