Merge pull request #444 from git-marijus/dev

Merge branch sabre32 into dev

1 files changed, 159 insertions, 78 deletions

diff --git a/vendor/sabre/dav/lib/CalDAV/SharedCalendar.php b/vendor/sabre/dav/lib/CalDAV/SharedCalendar.php
index 7973eff9c..7a77616e3 100644
--- a/vendor/sabre/dav/lib/CalDAV/SharedCalendar.php
+++ b/vendor/sabre/dav/lib/CalDAV/SharedCalendar.php
@@ -2,6 +2,8 @@
 
 namespace Sabre\CalDAV;
 
+use Sabre\DAV\Sharing\Plugin as SPlugin;
+
 /**
  * This object represents a CalDAV calendar that is shared by a different user.
  *
@@ -12,50 +14,84 @@ namespace Sabre\CalDAV;
 class SharedCalendar extends Calendar implements ISharedCalendar {
 
     /**
-     * Constructor
+     * Returns the 'access level' for the instance of this shared resource.
+     *
+     * The value should be one of the Sabre\DAV\Sharing\Plugin::ACCESS_
+     * constants.
      *
-     * @param Backend\BackendInterface $caldavBackend
-     * @param array $calendarInfo
+     * @return int
      */
-    function __construct(Backend\BackendInterface $caldavBackend, $calendarInfo) {
-
-        $required = [
-            '{http://calendarserver.org/ns/}shared-url',
-            '{http://sabredav.org/ns}owner-principal',
-            '{http://sabredav.org/ns}read-only',
-        ];
-        foreach ($required as $r) {
-            if (!isset($calendarInfo[$r])) {
-                throw new \InvalidArgumentException('The ' . $r . ' property must be specified for SharedCalendar(s)');
-            }
-        }
+    function getShareAccess() {
 
-        parent::__construct($caldavBackend, $calendarInfo);
+        return isset($this->calendarInfo['share-access']) ? $this->calendarInfo['share-access'] : SPlugin::ACCESS_NOTSHARED;
 
     }
 
     /**
-     * This method should return the url of the owners' copy of the shared
-     * calendar.
+     * This function must return a URI that uniquely identifies the shared
+     * resource. This URI should be identical across instances, and is
+     * also used in several other XML bodies to connect invites to
+     * resources.
+     *
+     * This may simply be a relative reference to the original shared instance,
+     * but it could also be a urn. As long as it's a valid URI and unique.
      *
      * @return string
      */
-    function getSharedUrl() {
+    function getShareResourceUri() {
+
+        return $this->calendarInfo['share-resource-uri'];
+
+    }
+
+    /**
+     * Updates the list of sharees.
+     *
+     * Every item must be a Sharee object.
+     *
+     * @param \Sabre\DAV\Xml\Element\Sharee[] $sharees
+     * @return void
+     */
+    function updateInvites(array $sharees) {
 
-        return $this->calendarInfo['{http://calendarserver.org/ns/}shared-url'];
+        $this->caldavBackend->updateInvites($this->calendarInfo['id'], $sharees);
 
     }
 
     /**
-     * Returns the owner principal
+     * Returns the list of people whom this resource is shared with.
+     *
+     * Every item in the returned array must be a Sharee object with
+     * at least the following properties set:
+     *
+     * * $href
+     * * $shareAccess
+     * * $inviteStatus
      *
-     * This must be a url to a principal, or null if there's no owner
+     * and optionally:
      *
-     * @return string|null
+     * * $properties
+     *
+     * @return \Sabre\DAV\Xml\Element\Sharee[]
      */
-    function getOwner() {
+    function getInvites() {
 
-        return $this->calendarInfo['{http://sabredav.org/ns}owner-principal'];
+        return $this->caldavBackend->getInvites($this->calendarInfo['id']);
+
+    }
+
+    /**
+     * Marks this calendar as published.
+     *
+     * Publishing a calendar should automatically create a read-only, public,
+     * subscribable calendar.
+     *
+     * @param bool $value
+     * @return void
+     */
+    function setPublishStatus($value) {
+
+        $this->caldavBackend->setPublishStatus($this->calendarInfo['id'], $value);
 
     }
 
@@ -73,32 +109,72 @@ class SharedCalendar extends Calendar implements ISharedCalendar {
      */
     function getACL() {
 
-        // The top-level ACL only contains access information for the true
-        // owner of the calendar, so we need to add the information for the
-        // sharee.
-        $acl = parent::getACL();
-        $acl[] = [
-            'privilege' => '{DAV:}read',
-            'principal' => $this->calendarInfo['principaluri'],
-            'protected' => true,
-        ];
-        if ($this->calendarInfo['{http://sabredav.org/ns}read-only']) {
-            $acl[] = [
-                'privilege' => '{DAV:}write-properties',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ];
-        } else {
-            $acl[] = [
-                'privilege' => '{DAV:}write',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ];
+        $acl = [];
+
+        switch ($this->getShareAccess()) {
+            case SPlugin::ACCESS_NOTSHARED :
+            case SPlugin::ACCESS_SHAREDOWNER :
+                $acl[] = [
+                    'privilege' => '{DAV:}share',
+                    'principal' => $this->calendarInfo['principaluri'],
+                    'protected' => true,
+                ];
+                $acl[] = [
+                    'privilege' => '{DAV:}share',
+                    'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                    'protected' => true,
+                ];
+                // No break intentional!
+            case SPlugin::ACCESS_READWRITE :
+                $acl[] = [
+                    'privilege' => '{DAV:}write',
+                    'principal' => $this->calendarInfo['principaluri'],
+                    'protected' => true,
+                ];
+                $acl[] = [
+                    'privilege' => '{DAV:}write',
+                    'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                    'protected' => true,
+                ];
+                // No break intentional!
+            case SPlugin::ACCESS_READ :
+                $acl[] = [
+                    'privilege' => '{DAV:}write-properties',
+                    'principal' => $this->calendarInfo['principaluri'],
+                    'protected' => true,
+                ];
+                $acl[] = [
+                    'privilege' => '{DAV:}write-properties',
+                    'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                    'protected' => true,
+                ];
+                $acl[] = [
+                    'privilege' => '{DAV:}read',
+                    'principal' => $this->calendarInfo['principaluri'],
+                    'protected' => true,
+                ];
+                $acl[] = [
+                    'privilege' => '{DAV:}read',
+                    'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-read',
+                    'protected' => true,
+                ];
+                $acl[] = [
+                    'privilege' => '{DAV:}read',
+                    'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                    'protected' => true,
+                ];
+                $acl[] = [
+                    'privilege' => '{' . Plugin::NS_CALDAV . '}read-free-busy',
+                    'principal' => '{DAV:}authenticated',
+                    'protected' => true,
+                ];
+                break;
         }
         return $acl;
 
     }
 
+
     /**
      * This method returns the ACL's for calendar objects in this calendar.
      * The result of this method automatically gets passed to the
@@ -108,40 +184,45 @@ class SharedCalendar extends Calendar implements ISharedCalendar {
      */
     function getChildACL() {
 
-        $acl = parent::getChildACL();
-        $acl[] = [
-            'privilege' => '{DAV:}read',
-            'principal' => $this->calendarInfo['principaluri'],
-            'protected' => true,
-        ];
-
-        if (!$this->calendarInfo['{http://sabredav.org/ns}read-only']) {
-            $acl[] = [
-                'privilege' => '{DAV:}write',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ];
+        $acl = [];
+
+        switch ($this->getShareAccess()) {
+            case SPlugin::ACCESS_NOTSHARED :
+                // No break intentional
+            case SPlugin::ACCESS_SHAREDOWNER :
+                // No break intentional
+            case SPlugin::ACCESS_READWRITE:
+                $acl[] = [
+                    'privilege' => '{DAV:}write',
+                    'principal' => $this->calendarInfo['principaluri'],
+                    'protected' => true,
+                ];
+                $acl[] = [
+                    'privilege' => '{DAV:}write',
+                    'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                    'protected' => true,
+                ];
+                // No break intentional
+            case SPlugin::ACCESS_READ:
+                $acl[] = [
+                    'privilege' => '{DAV:}read',
+                    'principal' => $this->calendarInfo['principaluri'],
+                    'protected' => true,
+                ];
+                $acl[] = [
+                    'privilege' => '{DAV:}read',
+                    'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                    'protected' => true,
+                ];
+                $acl[] = [
+                    'privilege' => '{DAV:}read',
+                    'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-read',
+                    'protected' => true,
+                ];
+                break;
         }
-        return $acl;
-
-    }
 
-
-    /**
-     * Returns the list of people whom this calendar is shared with.
-     *
-     * Every element in this array should have the following properties:
-     *   * href - Often a mailto: address
-     *   * commonName - Optional, for example a first + last name
-     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-     *   * readOnly - boolean
-     *   * summary - Optional, a description for the share
-     *
-     * @return array
-     */
-    function getShares() {
-
-        return $this->caldavBackend->getShares($this->calendarInfo['id']);
+        return $acl;
 
     }