[Pkg-owncloud-commits] [php-sabredav] 32/34: Fixed more prefer-related checks.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag 3.0.0-beta1
in repository php-sabredav.

commit 0d6e7f1752561c71739d1406318374247c1008b5
Author: Evert Pot <me at evertpot.com>
Date:   Mon May 25 20:24:18 2015 -0400

    Fixed more prefer-related checks.
    
    Related to #656
---
 lib/CalDAV/Plugin.php  | 8 ++++----
 lib/CardDAV/Plugin.php | 8 ++++----
 lib/DAVACL/Plugin.php  | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/CalDAV/Plugin.php b/lib/CalDAV/Plugin.php
index b3b9c70..6e9ddb9 100644
--- a/lib/CalDAV/Plugin.php
+++ b/lib/CalDAV/Plugin.php
@@ -462,12 +462,12 @@ class Plugin extends DAV\ServerPlugin {
 
         }
 
-        $prefer = $this->server->getHTTPPRefer();
+        $prefer = $this->server->getHTTPPrefer();
 
         $this->server->httpResponse->setStatus(207);
         $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
         $this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
-        $this->server->httpResponse->setBody($this->server->generateMultiStatus($propertyList, $prefer['return-minimal']));
+        $this->server->httpResponse->setBody($this->server->generateMultiStatus($propertyList, $prefer['return'] === 'minimal'));
 
     }
 
@@ -601,12 +601,12 @@ class Plugin extends DAV\ServerPlugin {
 
         }
 
-        $prefer = $this->server->getHTTPPRefer();
+        $prefer = $this->server->getHTTPPrefer();
 
         $this->server->httpResponse->setStatus(207);
         $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
         $this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
-        $this->server->httpResponse->setBody($this->server->generateMultiStatus($result, $prefer['return-minimal']));
+        $this->server->httpResponse->setBody($this->server->generateMultiStatus($result, $prefer['return']==='minimal'));
 
     }
 
diff --git a/lib/CardDAV/Plugin.php b/lib/CardDAV/Plugin.php
index 7cde013..827cbb6 100644
--- a/lib/CardDAV/Plugin.php
+++ b/lib/CardDAV/Plugin.php
@@ -259,12 +259,12 @@ class Plugin extends DAV\ServerPlugin {
 
         }
 
-        $prefer = $this->server->getHTTPPRefer();
+        $prefer = $this->server->getHTTPPrefer();
 
         $this->server->httpResponse->setStatus(207);
         $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
         $this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
-        $this->server->httpResponse->setBody($this->server->generateMultiStatus($propertyList, $prefer['return-minimal']));
+        $this->server->httpResponse->setBody($this->server->generateMultiStatus($propertyList, $prefer['return']==='minimal'));
 
     }
 
@@ -451,12 +451,12 @@ class Plugin extends DAV\ServerPlugin {
 
         }
 
-        $prefer = $this->server->getHTTPPRefer();
+        $prefer = $this->server->getHTTPPrefer();
 
         $this->server->httpResponse->setStatus(207);
         $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
         $this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
-        $this->server->httpResponse->setBody($this->server->generateMultiStatus($result, $prefer['return-minimal']));
+        $this->server->httpResponse->setBody($this->server->generateMultiStatus($result, $prefer['return']==='minimal'));
 
     }
 
diff --git a/lib/DAVACL/Plugin.php b/lib/DAVACL/Plugin.php
index b237512..335b367 100644
--- a/lib/DAVACL/Plugin.php
+++ b/lib/DAVACL/Plugin.php
@@ -1259,12 +1259,12 @@ class Plugin extends DAV\ServerPlugin {
             $report->test
         );
 
-        $prefer = $this->server->getHTTPPRefer();
+        $prefer = $this->server->getHTTPPrefer();
 
         $this->server->httpResponse->setStatus(207);
         $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
         $this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
-        $this->server->httpResponse->setBody($this->server->generateMultiStatus($result, $prefer['return-minimal']));
+        $this->server->httpResponse->setBody($this->server->generateMultiStatus($result, $prefer['return'] === 'minimal'));
 
     }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git