bh: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php, 1.69.2.6, 1.69.2.7

cvs at kolab.org cvs at kolab.org
Thu Sep 14 20:34:16 CEST 2006


Author: bh

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

Modified Files:
      Tag: kolab_2_0_branch
	resmgr.php 
Log Message:
Fix for kolab issue1387: when the policy is ACT_ALWAYS_REJECT, only send
replies if the itip method is REQUEST


Index: resmgr.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/resmgr.php,v
retrieving revision 1.69.2.6
retrieving revision 1.69.2.7
diff -u -d -r1.69.2.6 -r1.69.2.7
--- resmgr.php	11 Aug 2006 16:01:53 -0000	1.69.2.6
+++ resmgr.php	14 Sep 2006 18:34:14 -0000	1.69.2.7
@@ -1153,9 +1153,14 @@
 	" and ends on <$dtend> " . iCalDate2Kolab($dtend), RM_LOG_DEBUG);
 
   if ($params['action'] == RM_ACT_ALWAYS_REJECT) {
-    myLog("Rejecting $method method");
-    sendITipReply($cn,$resource,$itip,RM_ITIP_DECLINE);
-    return false;//shutdown(0);
+    if ($method == 'REQUEST') {
+      myLog("Rejecting $method method");
+      sendITipReply($cn,$resource,$itip,RM_ITIP_DECLINE);
+      return false;//shutdown(0);
+    } else {
+      myLog("Passing through $method method for ACT_ALWAYS_REJECT policy");
+      return true;
+    }
   }
 
   $is_update = false;





More information about the commits mailing list