steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusy.php, 1.7, 1.8

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	freebusy.php 
Log Message:
fb and resources

Index: freebusy.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- freebusy.php	13 Jul 2004 01:15:14 -0000	1.7
+++ freebusy.php	13 Jul 2004 03:28:27 -0000	1.8
@@ -190,6 +190,9 @@
         }
 
         $uid = $event->getAttributeDefault('UID', 0);
+	$summary = $event->getAttributeDefault('SUMMARY', 0);
+
+	trigger_error("Looking at message with uid=$uid and summary=$summary", E_USER_NOTICE);
 
         // Get the events initial start
         $initial_start = $event->getAttributeDefault('DTSTART', 0);
@@ -202,7 +205,8 @@
 
         if ($extended) {
             //error_log("adding event uid $uid");
-            $vFb->addBusyPeriod('BUSY', $initial_start, $initial_end, null, array('X-UID' => base64_encode($uid)));
+            $vFb->addBusyPeriod('BUSY', $initial_start, $initial_end, null, array('X-UID' => base64_encode($uid),
+										  'X-SUMMARY' => $summary ));
         } else {
             $vFb->addBusyPeriod('BUSY', $initial_start, $initial_end);
         }
@@ -349,10 +353,11 @@
     @imap_reopen( $imap, $fullmbox );
     if ( imap_last_error() ) {
       // Login error, check the cache
-      trigger_error( "IMAP Error trying to open $mailbox: ".imap_last_error(), E_USER_WARNING );
+      trigger_error( "IMAP Error trying to open $fullmbox: ".imap_last_error(), E_USER_WARNING );
     } else {    
       // Enumerate our calendar events
       $messages = @imap_sort($imap, SORTDATE, 0, SE_UID);
+      trigger_error("Got ".count($messages)." messages in calendar folder...", E_USER_NOTICE);
       testIMAPError();
       
       // Generate the VFB file
@@ -370,7 +375,7 @@
 }
 
 if( !$vfb ) {
-  if( !file_exists( $fbfilename ) || $imapuser == $user ) {
+  if( !file_exists( $fbfilename ) && $imapuser == $user ) {
     unauthorized("Failed to create freebusy list");
     exit;
   }