thomas: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php.in, 1.10, 1.11

[cvs at kolab.org]

Author: thomas

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

Modified Files:
	resmgr.php.in 
Log Message:
kolab/issue1387 (resmgr replies to replies creating mail loop):
only send ACT_ALWAYS_REJECT replies if the itip method is REQUEST
(patch forward-ported from 2.0 branch)


Index: resmgr.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- resmgr.php.in	25 Oct 2006 02:28:57 -0000	1.10
+++ resmgr.php.in	9 Nov 2006 17:53:24 -0000	1.11
@@ -1180,9 +1180,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;