steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php, 1.56, 1.57

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	resmgr.php 
Log Message:
Fix for Issue514 (pfb not up to date)

Index: resmgr.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- resmgr.php	26 Nov 2004 22:36:18 -0000	1.56
+++ resmgr.php	26 Nov 2004 22:57:12 -0000	1.57
@@ -1151,13 +1151,6 @@
 	} else if ($params['action'] == RM_ACT_REJECT_IF_CONFLICTS) {
 	  myLog("Conflict detected; rejecting");
 	  sendITipReply($cn,$resource,$itip,RM_ITIP_DECLINE);
-	  // Get the resource's free/busy list
-	  // once more so it is up to date
-	  if( $updatefb ) {
-	    if( !triggerFreeBusy($resource,false) ) {
-	      myLog("Error updating fblist", RM_LOG_SUPER );
-	    }
-	  }
 	  shutdown(0);
 	}
       }
@@ -1203,7 +1196,6 @@
       myLog("Error appending message: ".$rc->getMessage(), RM_LOG_ERROR);
     }
 
-
     // Update our status within the iTip request and send the reply
     $itip->setAttribute('STATUS', 'CONFIRMED', array(), false);
     $attendees = $itip->getAttribute('ATTENDEE');
@@ -1241,10 +1233,10 @@
     }
     // Get the resource's free/busy list
     // once more so it is up to date
-    if( $updatefb ) {
-      if( !triggerFreeBusy($resource,false) ) {
-	myLog("Error updating fblist", RM_LOG_SUPER );
-      }
+    $imap->disconnect();
+    unset($imap);
+    if( !triggerFreeBusy($resource,false) ) {
+      myLog("Error updating fblist", RM_LOG_SUPER );
     }
     shutdown(0);
 
@@ -1323,12 +1315,12 @@
       $imap->deleteMessages( $deleted_messages );
       $imap->expunge();
     }
+    $imap->disconnect();
+    unset($imap);
     // Get the resource's free/busy list
     // once more so it is up to date
-    if( $updatefb ) {
-      if( !triggerFreeBusy($resource,false) ) {
-	myLog("Error updating fblist", RM_LOG_SUPER );
-      }
+    if( !triggerFreeBusy($resource,false) ) {
+      myLog("Error updating fblist", RM_LOG_SUPER );
     }
     shutdown(0);