[Pkg-owncloud-commits] [php-sabredav] 23/148: Moved LockDiscovery.

[David Prévot]

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

taffit pushed a commit to branch master
in repository php-sabredav.

commit 830b2d0b409506255b90379ab374f2702cb02c8a
Author: Evert Pot <me at evertpot.com>
Date:   Fri Feb 6 21:34:19 2015 -0500

    Moved LockDiscovery.
---
 lib/DAV/Locks/Plugin.php               | 19 +++----
 lib/DAV/Property/LockDiscovery.php     | 94 ----------------------------------
 lib/DAV/Xml/Property/LockDiscovery.php | 20 ++------
 3 files changed, 10 insertions(+), 123 deletions(-)

diff --git a/lib/DAV/Locks/Plugin.php b/lib/DAV/Locks/Plugin.php
index 44a119e..f3f0709 100644
--- a/lib/DAV/Locks/Plugin.php
+++ b/lib/DAV/Locks/Plugin.php
@@ -401,19 +401,12 @@ class Plugin extends DAV\ServerPlugin {
      */
     protected function generateLockResponse(LockInfo $lockInfo) {
 
-        $dom = new \DOMDocument('1.0','utf-8');
-        $dom->formatOutput = true;
-
-        $prop = $dom->createElementNS('DAV:','d:prop');
-        $dom->appendChild($prop);
-
-        $lockDiscovery = $dom->createElementNS('DAV:','d:lockdiscovery');
-        $prop->appendChild($lockDiscovery);
-
-        $lockObj = new DAV\Property\LockDiscovery([$lockInfo]);
-        $lockObj->serialize($this->server,$lockDiscovery);
-
-        return $dom->saveXML();
+        return $this->server->xml->write([
+            '{DAV:}prop' => [
+                '{DAV:}lockdiscovery' =>
+                    new DAV\Xml\Property\LockDiscovery([$lockInfo])
+             ]
+        ]);
 
     }
 
diff --git a/lib/DAV/Property/LockDiscovery.php b/lib/DAV/Property/LockDiscovery.php
deleted file mode 100644
index 4858cf4..0000000
--- a/lib/DAV/Property/LockDiscovery.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Property;
-
-use Sabre\DAV;
-
-/**
- * Represents {DAV:}lockdiscovery property
- *
- * This property contains all the open locks on a given resource
- *
- * @copyright Copyright (C) 2007-2015 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class LockDiscovery extends DAV\Property {
-
-    /**
-     * locks
-     *
-     * @var array
-     */
-    public $locks;
-
-    /**
-     * Hides the {DAV:}lockroot element from the response.
-     *
-     * It was reported that showing the lockroot in the response can break
-     * Office 2000 compatibility.
-     */
-    static public $hideLockRoot = false;
-
-    /**
-     * __construct
-     *
-     * @param array $locks
-     * @param bool $revealLockToken
-     */
-    function __construct($locks) {
-
-        $this->locks = $locks;
-
-    }
-
-    /**
-     * serialize
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $prop
-     * @return void
-     */
-    function serialize(DAV\Server $server, \DOMElement $prop) {
-
-        $doc = $prop->ownerDocument;
-
-        foreach($this->locks as $lock) {
-
-            $activeLock = $doc->createElementNS('DAV:','d:activelock');
-            $prop->appendChild($activeLock);
-
-            $lockScope = $doc->createElementNS('DAV:','d:lockscope');
-            $activeLock->appendChild($lockScope);
-
-            $lockScope->appendChild($doc->createElementNS('DAV:','d:' . ($lock->scope==DAV\Locks\LockInfo::EXCLUSIVE?'exclusive':'shared')));
-
-            $lockType = $doc->createElementNS('DAV:','d:locktype');
-            $activeLock->appendChild($lockType);
-
-            $lockType->appendChild($doc->createElementNS('DAV:','d:write'));
-
-            /* {DAV:}lockroot */
-            if (!self::$hideLockRoot) {
-                $lockRoot = $doc->createElementNS('DAV:','d:lockroot');
-                $activeLock->appendChild($lockRoot);
-                $href = $doc->createElementNS('DAV:','d:href');
-                $href->appendChild($doc->createTextNode($server->getBaseUri() . $lock->uri));
-                $lockRoot->appendChild($href);
-            }
-
-            $activeLock->appendChild($doc->createElementNS('DAV:','d:depth',($lock->depth == DAV\Server::DEPTH_INFINITY?'infinity':$lock->depth)));
-            $activeLock->appendChild($doc->createElementNS('DAV:','d:timeout','Second-' . $lock->timeout));
-
-            $lockToken = $doc->createElementNS('DAV:','d:locktoken');
-            $activeLock->appendChild($lockToken);
-            $lockToken->appendChild($doc->createElementNS('DAV:','d:href','opaquelocktoken:' . $lock->token));
-
-            $activeLock->appendChild($doc->createElementNS('DAV:','d:owner',$lock->owner));
-
-        }
-
-    }
-
-}
-
diff --git a/lib/DAV/Xml/Property/LockDiscovery.php b/lib/DAV/Xml/Property/LockDiscovery.php
index 7082c67..8ec0bf8 100644
--- a/lib/DAV/Xml/Property/LockDiscovery.php
+++ b/lib/DAV/Xml/Property/LockDiscovery.php
@@ -30,13 +30,6 @@ class LockDiscovery implements Element {
     public $locks;
 
     /**
-     * Should we show the locktoken as well?
-     *
-     * @var bool
-     */
-    public $revealLockToken;
-
-    /**
      * Hides the {DAV:}lockroot element from the response.
      *
      * It was reported that showing the lockroot in the response can break
@@ -50,12 +43,10 @@ class LockDiscovery implements Element {
      * __construct
      *
      * @param \Sabre\DAV\Locks\LockInfo[] $locks
-     * @param bool $revealLockToken
      */
-    function __construct($locks, $revealLockToken = false) {
+    function __construct($locks) {
 
         $this->locks = $locks;
-        $this->revealLockToken = $revealLockToken;
 
     }
 
@@ -101,12 +92,9 @@ class LockDiscovery implements Element {
             $writer->writeElement('{DAV:}depth', ($lock->depth == DAV\Server::DEPTH_INFINITY?'infinity':$lock->depth));
             $writer->writeElement('{DAV:}timeout','Second-' . $lock->timeout);
 
-            if ($this->revealLockToken) {
-                $writer->startElement('{DAV:}locktoken');
-                $writer->writeElement('{DAV:}href', 'opaquelocktoken:' . $lock->token);
-                $writer->endElement(); // {DAV:}locktoken
-
-            }
+            $writer->startElement('{DAV:}locktoken');
+            $writer->writeElement('{DAV:}href', 'opaquelocktoken:' . $lock->token);
+            $writer->endElement(); // {DAV:}locktoken
 
             $writer->writeElement('{DAV:}owner', $lock->owner);
             $writer->endElement(); // {DAV:}activelock

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