Fix the system address book

c23a66cda46d9a1f0ce8dc60a6c160809c87d9f6 broke the system address book.
We now move the ACL rules for this special case up and all is good in
the world again.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

diff --git a/apps/dav/lib/CardDAV/AddressBook.php b/apps/dav/lib/CardDAV/AddressBook.php
index 30ce0a3253ca897c67420f842a0810c845e435f9..096f5c8b2a9a0c632ed8f29aa4eedc30404c28b6 100644 (file)
--- a/apps/dav/lib/CardDAV/AddressBook.php
+++ b/apps/dav/lib/CardDAV/AddressBook.php
@@ -112,6 +112,14 @@ class AddressBook extends \Sabre\CardDAV\AddressBook implements IShareable {
                        ]
                ];
 
+               if ($this->getOwner() === 'principals/system/system') {
+                       $acl[] = [
+                               'privilege' => '{DAV:}read',
+                               'principal' => '{DAV:}authenticated',
+                               'protected' => true,
+                       ];
+               }
+
                if (!$this->isShared()) {
                        return $acl;
                }
@@ -130,13 +138,6 @@ class AddressBook extends \Sabre\CardDAV\AddressBook implements IShareable {
                                ];
                        }
                }
-               if ($this->getOwner() === 'principals/system/system') {
-                       $acl[] = [
-                                       'privilege' => '{DAV:}read',
-                                       'principal' => '{DAV:}authenticated',
-                                       'protected' => true,
-                       ];
-               }
 
                $acl = $this->carddavBackend->applyShareAcl($this->getResourceId(), $acl);
                $allowedPrincipals = [$this->getOwner(), parent::getOwner(), 'principals/system/system'];