steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php, 1.33, 1.34

cvs at intevation.de cvs at intevation.de
Tue Oct 19 02:55:44 CEST 2004


Author: steffen

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

Modified Files:
	resmgr.php 
Log Message:
fix for issue381 (Ressource declines changes to an appointment)

Index: resmgr.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- resmgr.php	12 Oct 2004 09:56:30 -0000	1.33
+++ resmgr.php	19 Oct 2004 00:55:42 -0000	1.34
@@ -485,12 +485,12 @@
 
 function &getFreeBusy() {
   global $params;
-  return internalGetFreeBusy( $params['freebusy_url']);
+  return internalGetFreeBusy( $params['ext_freebusy_url']);
 }
 
 function &triggerFreeBusy() {
   global $params;
-  return internalGetFreeBusy( $params['pfb_trigger_url']) && internalGetFreeBusy( $params['xpfb_trigger_url']);  
+  return internalGetFreeBusy( $params['xpfb_trigger_url']);
 }
 
 function &internalGetFreeBusy($url)
@@ -1001,12 +1001,17 @@
             $busyperiods = $vfb->getBusyPeriods();
             $conflict = false;
 
+	    $extraparams = $vfb->getExtraParams();
             foreach ($busyperiods as $busyfrom => $busyto) {
                 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) ) {
+		  myLog("Ignoring $uid in fb check", RM_LOG_DEBUG);
+		  continue;
+		}
                 if (($busyfrom >= $dtstart && $busyfrom < $dtend) || ($dtstart >= $busyfrom && $dtstart < $busyto)) {
                     myLog('Request overlaps', RM_LOG_DEBUG);
                     $conflict = true;
+		    break;
                 }
             }
 
@@ -1097,7 +1102,7 @@
         foreach ($updated_messages as $mid) {
             @imap_delete($imap, $mid, FT_UID);
         }
-
+	@imap_expunge($imap);
         shutdown(0);
 
     case 'CANCEL':
@@ -1171,7 +1176,7 @@
         foreach ($deleted_messages as $mid) {
             @imap_delete($imap, $mid, FT_UID);
         }
-
+	@imap_expunge($imap);
         shutdown(0);
 
     default:





More information about the commits mailing list