initial sabre upgrade (needs lots of work - to wit: authentication, redo the browser interface, and rework event export/import)

1 files changed, 36 insertions, 0 deletions

diff --git a/vendor/sabre/dav/lib/DAV/Exception/ConflictingLock.php b/vendor/sabre/dav/lib/DAV/Exception/ConflictingLock.php
new file mode 100644
index 000000000..b2d2746c5
--- /dev/null
+++ b/vendor/sabre/dav/lib/DAV/Exception/ConflictingLock.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Sabre\DAV\Exception;
+
+use Sabre\DAV;
+
+/**
+ * ConflictingLock
+ *
+ * Similar to  the Locked exception, this exception thrown when a LOCK request
+ * was made, on a resource which was already locked
+ *
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class ConflictingLock extends Locked {
+
+    /**
+     * This method allows the exception to include additional information into the WebDAV error response
+     *
+     * @param DAV\Server $server
+     * @param \DOMElement $errorNode
+     * @return void
+     */
+    function serialize(DAV\Server $server, \DOMElement $errorNode) {
+
+        if ($this->lock) {
+            $error = $errorNode->ownerDocument->createElementNS('DAV:', 'd:no-conflicting-lock');
+            $errorNode->appendChild($error);
+            $error->appendChild($errorNode->ownerDocument->createElementNS('DAV:', 'd:href', $this->lock->uri));
+        }
+
+    }
+
+}