Merge branch '1.7' into 1.8

Conflicts: lib/Sabre/CalDAV/SharingPlugin.php lib/Sabre/CalDAV/Version.php lib/Sabre/DAVACL/Plugin.php
gobb · Nov 19, 2012 · 9ea5c15 · 9ea5c15
2 parents 1d5588a + 1e66b44
commit 9ea5c15
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -25,6 +25,8 @@
 	* Fixed: Removing double slashes from getPropertiesForPath.
 	* Change: Marked a few more properties in the CardDAV as protected,
 	  instead of private.
+	* Fixed: SharingPlugin now place nicer with other plugins with similar
+	  functionality.
 
 1.7.2-stable (2012-11-08)
     * The zip release ships with sabre/vobject 2.0.5.

diff --git a/lib/Sabre/CalDAV/SharingPlugin.php b/lib/Sabre/CalDAV/SharingPlugin.php
@@ -236,7 +236,7 @@ public function updateProperties(array &$mutations, array &$result, DAV\INode $n
         }
 
         // Only doing something if shared-owner is indeed not in the list.
-        if($mutations['{DAV:}resourcetype']->is('{' . Plugin::NS_CALENDARSERVER . '}shared-owner')) return; 
+        if($mutations['{DAV:}resourcetype']->is('{' . Plugin::NS_CALENDARSERVER . '}shared-owner')) return;
 
         $shares = $node->getShares();
         $remove = array();
@@ -281,8 +281,18 @@ public function unknownMethod($method, $uri) {
             return;
         }
 
+        $requestBody = $this->server->httpRequest->getBody(true);
 
-        $dom = DAV\XMLUtil::loadDOMDocument($this->server->httpRequest->getBody(true));
+        // If this request handler could not deal with this POST request, it
+        // will return 'null' and other plugins get a chance to handle the
+        // request.
+        //
+        // However, we already requested the full body. This is a problem,
+        // because a body can only be read once. This is why we preemptively
+        // re-populated the request body with the existing data.
+        $this->server->httpRequest->setBody($requestBody);
+
+        $dom = DAV\XMLUtil::loadDOMDocument($requestBody);
 
         $documentType = DAV\XMLUtil::toClarkNotation($dom->firstChild);
 
@@ -426,6 +436,7 @@ public function unknownMethod($method, $uri) {
         }
 
 
+
     }
 
     /**

diff --git a/lib/Sabre/CalDAV/Version.php b/lib/Sabre/CalDAV/Version.php
@@ -14,7 +14,7 @@ class Version {
     /**
      * Full version number
      */
-    const VERSION = '1.8.0';
+    const VERSION = '1.8.1';
 
     /**
      * Stability : alpha, beta, stable

diff --git a/lib/Sabre/DAVACL/Plugin.php b/lib/Sabre/DAVACL/Plugin.php
@@ -181,7 +181,7 @@ public function getSupportedReportSet($uri) {
      * @param string $uri
      * @param array|string $privileges
      * @param int $recursion
-     * @param bool $throwExceptions if set to false, this method won't through exceptions.
+     * @param bool $throwExceptions if set to false, this method won't throw exceptions.
      * @throws Sabre\DAVACL\Exception\NeedPrivileges
      * @return bool
      */
@@ -559,7 +559,6 @@ public function getCurrentUserPrivilegeSet($node) {
             }
 
 
-
         }
 
         // Now we deduct all aggregated privileges.

diff --git a/tests/Sabre/CalDAV/SharingPluginTest.php b/tests/Sabre/CalDAV/SharingPluginTest.php
@@ -289,6 +289,10 @@ function testInviteWrongUrl() {
         $response = $this->request($request);
         $this->assertEquals('HTTP/1.1 501 Not Implemented', $response->status, $response->body);
 
+        // If the plugin did not handle this request, it must ensure that the
+        // body is still accessible by other plugins.
+        $this->assertEquals($xml, $request->getBody(true));
+
     }
 
     function testPublish() {