nextcloud / server

apps/dav/appinfo/v1/caldav.php

Indentation +15 added lines, -15 removed lines

@@ -34,19 +34,19 @@ 
 use OCA\DAV\Connector\Sabre\Principal;
 
 $authBackend = new Auth(
-	\OC::$server->getSession(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getRequest(),
-	\OC::$server->getTwoFactorAuthManager(),
-	\OC::$server->getBruteForceThrottler(),
-	'principals/'
+    \OC::$server->getSession(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getRequest(),
+    \OC::$server->getTwoFactorAuthManager(),
+    \OC::$server->getBruteForceThrottler(),
+    'principals/'
 );
 $principalBackend = new Principal(
-	\OC::$server->getUserManager(),
-	\OC::$server->getGroupManager(),
-	\OC::$server->getShareManager(),
-	\OC::$server->getUserSession(),
-	'principals/'
+    \OC::$server->getUserManager(),
+    \OC::$server->getGroupManager(),
+    \OC::$server->getShareManager(),
+    \OC::$server->getUserSession(),
+    'principals/'
 );
 $db = \OC::$server->getDatabaseConnection();
 $userManager = \OC::$server->getUserManager();
@@ -66,8 +66,8 @@ 
 $addressBookRoot->disableListing = !$debugging; // Disable listing
 
 $nodes = array(
-	$principalCollection,
-	$addressBookRoot,
+    $principalCollection,
+    $addressBookRoot,
 );
 
 // Fire up server
@@ -83,7 +83,7 @@ 
 
 $server->addPlugin(new LegacyDAVACL());
 if ($debugging) {
-	$server->addPlugin(new Sabre\DAV\Browser\Plugin());
+    $server->addPlugin(new Sabre\DAV\Browser\Plugin());
 }
 
 $server->addPlugin(new \Sabre\DAV\Sync\Plugin());
@@ -91,7 +91,7 @@ 
 $server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin($principalBackend));
 
 if ($sendInvitations) {
-	$server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));
+    $server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));
 }
 $server->addPlugin(new ExceptionLoggerPlugin('caldav', \OC::$server->getLogger()));
 

apps/dav/lib/Connector/Sabre/Principal.php

Indentation +347 added lines, -347 removed lines

@@ -42,352 +42,352 @@
 
 class Principal implements BackendInterface {
 
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var IShareManager */
-	private $shareManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var string */
-	private $principalPrefix;
-
-	/** @var string */
-	private $groupPrincipalPrefix;
-
-	/** @var bool */
-	private $hasGroups;
-
-	/**
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param IShareManager $shareManager
-	 * @param IUserSession $userSession
-	 * @param string $principalPrefix
-	 * @param string $groupPrincipalPrefix
-	 */
-	public function __construct(IUserManager $userManager,
-								IGroupManager $groupManager,
-								IShareManager $shareManager,
-								IUserSession $userSession,
-								$principalPrefix = 'principals/users/',
-								$groupPrincipalPrefix = 'principals/groups/') {
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->shareManager = $shareManager;
-		$this->userSession = $userSession;
-		$this->principalPrefix = trim($principalPrefix, '/');
-		$this->groupPrincipalPrefix = trim($groupPrincipalPrefix, '/');
-		$this->hasGroups = ($principalPrefix === 'principals/users/');
-	}
-
-	/**
-	 * Returns a list of principals based on a prefix.
-	 *
-	 * This prefix will often contain something like 'principals'. You are only
-	 * expected to return principals that are in this base path.
-	 *
-	 * You are expected to return at least a 'uri' for every user, you can
-	 * return any additional properties if you wish so. Common properties are:
-	 *   {DAV:}displayname
-	 *
-	 * @param string $prefixPath
-	 * @return string[]
-	 */
-	public function getPrincipalsByPrefix($prefixPath) {
-		$principals = [];
-
-		if ($prefixPath === $this->principalPrefix) {
-			foreach($this->userManager->search('') as $user) {
-				$principals[] = $this->userToPrincipal($user);
-			}
-		}
-
-		return $principals;
-	}
-
-	/**
-	 * Returns a specific principal, specified by it's path.
-	 * The returned structure should be the exact same as from
-	 * getPrincipalsByPrefix.
-	 *
-	 * @param string $path
-	 * @return array
-	 */
-	public function getPrincipalByPath($path) {
-		list($prefix, $name) = \Sabre\Uri\split($path);
-
-		if ($prefix === $this->principalPrefix) {
-			$user = $this->userManager->get($name);
-
-			if ($user !== null) {
-				return $this->userToPrincipal($user);
-			}
-		} elseif ($prefix === $this->groupPrincipalPrefix) {
-			$group = $this->groupManager->get($name);
-
-			if ($group !== null) {
-				return $this->groupToPrincipal($group);
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Returns the list of members for a group-principal
-	 *
-	 * @param string $principal
-	 * @return string[]
-	 * @throws Exception
-	 */
-	public function getGroupMemberSet($principal) {
-		$principal = $this->getPrincipalByPath($principal);
-		if (!$principal) {
-			throw new Exception('Principal not found');
-		}
-
-		list($prefix, $gid) = \Sabre\Uri\split($principal['uri']);
-		if ($prefix !== $this->groupPrincipalPrefix) {
-			throw new Exception('Requested members for principal that\'s not a group');
-		}
-
-		$group = $this->groupManager->get($gid);
-		$users = $group->getUsers();
-		$members = [];
-		foreach($users as $user) {
-			$members[] = $this->userToPrincipal($user)['uri'];
-		}
-
-		return $members;
-	}
-
-	/**
-	 * Returns the list of groups a principal is a member of
-	 *
-	 * @param string $principal
-	 * @param bool $needGroups
-	 * @return array
-	 * @throws Exception
-	 */
-	public function getGroupMembership($principal, $needGroups = false) {
-		list($prefix, $name) = \Sabre\Uri\split($principal);
-
-		if ($prefix === $this->principalPrefix) {
-			$user = $this->userManager->get($name);
-			if (!$user) {
-				throw new Exception('Principal not found');
-			}
-
-			if ($this->hasGroups || $needGroups) {
-				$groups = $this->groupManager->getUserGroups($user);
-				$groups = array_map(function($group) {
-					/** @var IGroup $group */
-					return 'principals/groups/' . urlencode($group->getGID());
-				}, $groups);
-
-				return $groups;
-			}
-		}
-		return [];
-	}
-
-	/**
-	 * Updates the list of group members for a group principal.
-	 *
-	 * The principals should be passed as a list of uri's.
-	 *
-	 * @param string $principal
-	 * @param string[] $members
-	 * @throws Exception
-	 */
-	public function setGroupMemberSet($principal, array $members) {
-		throw new Exception('Setting members of the group is not supported yet');
-	}
-
-	/**
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 * @return int
-	 */
-	function updatePrincipal($path, PropPatch $propPatch) {
-		return 0;
-	}
-
-	/**
-	 * Search user principals
-	 *
-	 * @param array $searchProperties
-	 * @param string $test
-	 * @return array
-	 */
-	protected function searchUserPrincipals(array $searchProperties, $test = 'allof') {
-		$results = [];
-
-		// If sharing is disabled, return the empty array
-		if (!$this->shareManager->shareApiEnabled()) {
-			return [];
-		}
-
-		// If sharing is restricted to group members only,
-		// return only members that have groups in common
-		$restrictGroups = false;
-		if ($this->shareManager->shareWithGroupMembersOnly()) {
-			$user = $this->userSession->getUser();
-			if (!$user) {
-				return [];
-			}
-
-			$restrictGroups = $this->groupManager->getUserGroupIds($user);
-		}
-
-		foreach ($searchProperties as $prop => $value) {
-			switch ($prop) {
-				case '{http://sabredav.org/ns}email-address':
-					$users = $this->userManager->getByEmail($value);
-
-					$results[] = array_reduce($users, function(array $carry, IUser $user) use ($restrictGroups) {
-						// is sharing restricted to groups only?
-						if ($restrictGroups !== false) {
-							$userGroups = $this->groupManager->getUserGroupIds($user);
-							if (count(array_intersect($userGroups, $restrictGroups)) === 0) {
-								return $carry;
-							}
-						}
-
-						$carry[] = $this->principalPrefix . '/' . $user->getUID();
-						return $carry;
-					}, []);
-					break;
-
-				default:
-					$results[] = [];
-					break;
-			}
-		}
-
-		// results is an array of arrays, so this is not the first search result
-		// but the results of the first searchProperty
-		if (count($results) === 1) {
-			return $results[0];
-		}
-
-		switch ($test) {
-			case 'anyof':
-				return array_unique(array_merge(...$results));
-
-			case 'allof':
-			default:
-				return array_intersect(...$results);
-		}
-	}
-
-	/**
-	 * @param string $prefixPath
-	 * @param array $searchProperties
-	 * @param string $test
-	 * @return array
-	 */
-	function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
-		if (count($searchProperties) === 0) {
-			return [];
-		}
-
-		switch ($prefixPath) {
-			case 'principals/users':
-				return $this->searchUserPrincipals($searchProperties, $test);
-
-			default:
-				return [];
-		}
-	}
-
-	/**
-	 * @param string $uri
-	 * @param string $principalPrefix
-	 * @return string
-	 */
-	function findByUri($uri, $principalPrefix) {
-		// If sharing is disabled, return null as in user not found
-		if (!$this->shareManager->shareApiEnabled()) {
-			return null;
-		}
-
-		// If sharing is restricted to group members only,
-		// return only members that have groups in common
-		$restrictGroups = false;
-		if ($this->shareManager->shareWithGroupMembersOnly()) {
-			$user = $this->userSession->getUser();
-			if (!$user) {
-				return null;
-			}
-
-			$restrictGroups = $this->groupManager->getUserGroupIds($user);
-		}
-
-		if (strpos($uri, 'mailto:') === 0) {
-			if ($principalPrefix === 'principals/users') {
-				$users = $this->userManager->getByEmail(substr($uri, 7));
-				if (count($users) !== 1) {
-					return null;
-				}
-				$user = $users[0];
-
-				if ($restrictGroups !== false) {
-					$userGroups = $this->groupManager->getUserGroupIds($user);
-					if (count(array_intersect($userGroups, $restrictGroups)) === 0) {
-						return null;
-					}
-				}
-
-				return $this->principalPrefix . '/' . $user->getUID();
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return array
-	 */
-	protected function userToPrincipal(IUser $user) {
-		$userId = $user->getUID();
-		$displayName = $user->getDisplayName();
-		$principal = [
-				'uri' => $this->principalPrefix . '/' . $userId,
-				'{DAV:}displayname' => is_null($displayName) ? $userId : $displayName,
-		];
-
-		$email = $user->getEMailAddress();
-		if (!empty($email)) {
-			$principal['{http://sabredav.org/ns}email-address'] = $email;
-		}
-
-		return $principal;
-	}
-
-	/**
-	 * @param IGroup $group
-	 * @return array
-	 */
-	protected function groupToPrincipal(IGroup $group) {
-		$groupId = $group->getGID();
-		$displayName = $group->getDisplayName();
-
-		return [
-			'uri' => $this->groupPrincipalPrefix . '/' . $groupId,
-			'{DAV:}displayname' => is_null($displayName) ? $groupId : $displayName,
-		];
-	}
-
-	public function getPrincipalPrefix() {
-		return $this->principalPrefix;
-	}
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /** @var IShareManager */
+    private $shareManager;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var string */
+    private $principalPrefix;
+
+    /** @var string */
+    private $groupPrincipalPrefix;
+
+    /** @var bool */
+    private $hasGroups;
+
+    /**
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param IShareManager $shareManager
+     * @param IUserSession $userSession
+     * @param string $principalPrefix
+     * @param string $groupPrincipalPrefix
+     */
+    public function __construct(IUserManager $userManager,
+                                IGroupManager $groupManager,
+                                IShareManager $shareManager,
+                                IUserSession $userSession,
+                                $principalPrefix = 'principals/users/',
+                                $groupPrincipalPrefix = 'principals/groups/') {
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->shareManager = $shareManager;
+        $this->userSession = $userSession;
+        $this->principalPrefix = trim($principalPrefix, '/');
+        $this->groupPrincipalPrefix = trim($groupPrincipalPrefix, '/');
+        $this->hasGroups = ($principalPrefix === 'principals/users/');
+    }
+
+    /**
+     * Returns a list of principals based on a prefix.
+     *
+     * This prefix will often contain something like 'principals'. You are only
+     * expected to return principals that are in this base path.
+     *
+     * You are expected to return at least a 'uri' for every user, you can
+     * return any additional properties if you wish so. Common properties are:
+     *   {DAV:}displayname
+     *
+     * @param string $prefixPath
+     * @return string[]
+     */
+    public function getPrincipalsByPrefix($prefixPath) {
+        $principals = [];
+
+        if ($prefixPath === $this->principalPrefix) {
+            foreach($this->userManager->search('') as $user) {
+                $principals[] = $this->userToPrincipal($user);
+            }
+        }
+
+        return $principals;
+    }
+
+    /**
+     * Returns a specific principal, specified by it's path.
+     * The returned structure should be the exact same as from
+     * getPrincipalsByPrefix.
+     *
+     * @param string $path
+     * @return array
+     */
+    public function getPrincipalByPath($path) {
+        list($prefix, $name) = \Sabre\Uri\split($path);
+
+        if ($prefix === $this->principalPrefix) {
+            $user = $this->userManager->get($name);
+
+            if ($user !== null) {
+                return $this->userToPrincipal($user);
+            }
+        } elseif ($prefix === $this->groupPrincipalPrefix) {
+            $group = $this->groupManager->get($name);
+
+            if ($group !== null) {
+                return $this->groupToPrincipal($group);
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns the list of members for a group-principal
+     *
+     * @param string $principal
+     * @return string[]
+     * @throws Exception
+     */
+    public function getGroupMemberSet($principal) {
+        $principal = $this->getPrincipalByPath($principal);
+        if (!$principal) {
+            throw new Exception('Principal not found');
+        }
+
+        list($prefix, $gid) = \Sabre\Uri\split($principal['uri']);
+        if ($prefix !== $this->groupPrincipalPrefix) {
+            throw new Exception('Requested members for principal that\'s not a group');
+        }
+
+        $group = $this->groupManager->get($gid);
+        $users = $group->getUsers();
+        $members = [];
+        foreach($users as $user) {
+            $members[] = $this->userToPrincipal($user)['uri'];
+        }
+
+        return $members;
+    }
+
+    /**
+     * Returns the list of groups a principal is a member of
+     *
+     * @param string $principal
+     * @param bool $needGroups
+     * @return array
+     * @throws Exception
+     */
+    public function getGroupMembership($principal, $needGroups = false) {
+        list($prefix, $name) = \Sabre\Uri\split($principal);
+
+        if ($prefix === $this->principalPrefix) {
+            $user = $this->userManager->get($name);
+            if (!$user) {
+                throw new Exception('Principal not found');
+            }
+
+            if ($this->hasGroups || $needGroups) {
+                $groups = $this->groupManager->getUserGroups($user);
+                $groups = array_map(function($group) {
+                    /** @var IGroup $group */
+                    return 'principals/groups/' . urlencode($group->getGID());
+                }, $groups);
+
+                return $groups;
+            }
+        }
+        return [];
+    }
+
+    /**
+     * Updates the list of group members for a group principal.
+     *
+     * The principals should be passed as a list of uri's.
+     *
+     * @param string $principal
+     * @param string[] $members
+     * @throws Exception
+     */
+    public function setGroupMemberSet($principal, array $members) {
+        throw new Exception('Setting members of the group is not supported yet');
+    }
+
+    /**
+     * @param string $path
+     * @param PropPatch $propPatch
+     * @return int
+     */
+    function updatePrincipal($path, PropPatch $propPatch) {
+        return 0;
+    }
+
+    /**
+     * Search user principals
+     *
+     * @param array $searchProperties
+     * @param string $test
+     * @return array
+     */
+    protected function searchUserPrincipals(array $searchProperties, $test = 'allof') {
+        $results = [];
+
+        // If sharing is disabled, return the empty array
+        if (!$this->shareManager->shareApiEnabled()) {
+            return [];
+        }
+
+        // If sharing is restricted to group members only,
+        // return only members that have groups in common
+        $restrictGroups = false;
+        if ($this->shareManager->shareWithGroupMembersOnly()) {
+            $user = $this->userSession->getUser();
+            if (!$user) {
+                return [];
+            }
+
+            $restrictGroups = $this->groupManager->getUserGroupIds($user);
+        }
+
+        foreach ($searchProperties as $prop => $value) {
+            switch ($prop) {
+                case '{http://sabredav.org/ns}email-address':
+                    $users = $this->userManager->getByEmail($value);
+
+                    $results[] = array_reduce($users, function(array $carry, IUser $user) use ($restrictGroups) {
+                        // is sharing restricted to groups only?
+                        if ($restrictGroups !== false) {
+                            $userGroups = $this->groupManager->getUserGroupIds($user);
+                            if (count(array_intersect($userGroups, $restrictGroups)) === 0) {
+                                return $carry;
+                            }
+                        }
+
+                        $carry[] = $this->principalPrefix . '/' . $user->getUID();
+                        return $carry;
+                    }, []);
+                    break;
+
+                default:
+                    $results[] = [];
+                    break;
+            }
+        }
+
+        // results is an array of arrays, so this is not the first search result
+        // but the results of the first searchProperty
+        if (count($results) === 1) {
+            return $results[0];
+        }
+
+        switch ($test) {
+            case 'anyof':
+                return array_unique(array_merge(...$results));
+
+            case 'allof':
+            default:
+                return array_intersect(...$results);
+        }
+    }
+
+    /**
+     * @param string $prefixPath
+     * @param array $searchProperties
+     * @param string $test
+     * @return array
+     */
+    function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
+        if (count($searchProperties) === 0) {
+            return [];
+        }
+
+        switch ($prefixPath) {
+            case 'principals/users':
+                return $this->searchUserPrincipals($searchProperties, $test);
+
+            default:
+                return [];
+        }
+    }
+
+    /**
+     * @param string $uri
+     * @param string $principalPrefix
+     * @return string
+     */
+    function findByUri($uri, $principalPrefix) {
+        // If sharing is disabled, return null as in user not found
+        if (!$this->shareManager->shareApiEnabled()) {
+            return null;
+        }
+
+        // If sharing is restricted to group members only,
+        // return only members that have groups in common
+        $restrictGroups = false;
+        if ($this->shareManager->shareWithGroupMembersOnly()) {
+            $user = $this->userSession->getUser();
+            if (!$user) {
+                return null;
+            }
+
+            $restrictGroups = $this->groupManager->getUserGroupIds($user);
+        }
+
+        if (strpos($uri, 'mailto:') === 0) {
+            if ($principalPrefix === 'principals/users') {
+                $users = $this->userManager->getByEmail(substr($uri, 7));
+                if (count($users) !== 1) {
+                    return null;
+                }
+                $user = $users[0];
+
+                if ($restrictGroups !== false) {
+                    $userGroups = $this->groupManager->getUserGroupIds($user);
+                    if (count(array_intersect($userGroups, $restrictGroups)) === 0) {
+                        return null;
+                    }
+                }
+
+                return $this->principalPrefix . '/' . $user->getUID();
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @param IUser $user
+     * @return array
+     */
+    protected function userToPrincipal(IUser $user) {
+        $userId = $user->getUID();
+        $displayName = $user->getDisplayName();
+        $principal = [
+                'uri' => $this->principalPrefix . '/' . $userId,
+                '{DAV:}displayname' => is_null($displayName) ? $userId : $displayName,
+        ];
+
+        $email = $user->getEMailAddress();
+        if (!empty($email)) {
+            $principal['{http://sabredav.org/ns}email-address'] = $email;
+        }
+
+        return $principal;
+    }
+
+    /**
+     * @param IGroup $group
+     * @return array
+     */
+    protected function groupToPrincipal(IGroup $group) {
+        $groupId = $group->getGID();
+        $displayName = $group->getDisplayName();
+
+        return [
+            'uri' => $this->groupPrincipalPrefix . '/' . $groupId,
+            '{DAV:}displayname' => is_null($displayName) ? $groupId : $displayName,
+        ];
+    }
+
+    public function getPrincipalPrefix() {
+        return $this->principalPrefix;
+    }
 
 }

apps/dav/lib/CalDAV/Calendar.php

Indentation +301 added lines, -301 removed lines

@@ -42,306 +42,306 @@
  */
 class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
 
-	/** @var IConfig */
-	private $config;
-
-	public function __construct(BackendInterface $caldavBackend, $calendarInfo, IL10N $l10n, IConfig $config) {
-		parent::__construct($caldavBackend, $calendarInfo);
-
-		if ($this->getName() === BirthdayService::BIRTHDAY_CALENDAR_URI) {
-			$this->calendarInfo['{DAV:}displayname'] = $l10n->t('Contact birthdays');
-		}
-		if ($this->getName() === CalDavBackend::PERSONAL_CALENDAR_URI &&
-			$this->calendarInfo['{DAV:}displayname'] === CalDavBackend::PERSONAL_CALENDAR_NAME) {
-			$this->calendarInfo['{DAV:}displayname'] = $l10n->t('Personal');
-		}
-
-		$this->config = $config;
-	}
-
-	/**
-	 * Updates the list of shares.
-	 *
-	 * The first array is a list of people that are to be added to the
-	 * resource.
-	 *
-	 * Every element in the add array has the following properties:
-	 *   * href - A url. Usually a mailto: address
-	 *   * commonName - Usually a first and last name, or false
-	 *   * summary - A description of the share, can also be false
-	 *   * readOnly - A boolean value
-	 *
-	 * Every element in the remove array is just the address string.
-	 *
-	 * @param array $add
-	 * @param array $remove
-	 * @return void
-	 * @throws Forbidden
-	 */
-	public function updateShares(array $add, array $remove) {
-		if ($this->isShared()) {
-			throw new Forbidden();
-		}
-		$this->caldavBackend->updateShares($this, $add, $remove);
-	}
-
-	/**
-	 * Returns the list of people whom this resource 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
-	 */
-	public function getShares() {
-		if ($this->isShared()) {
-			return [];
-		}
-		return $this->caldavBackend->getShares($this->getResourceId());
-	}
-
-	public function getAllShares() {
-		return $this->caldavBackend->getShares($this->getResourceId());
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getResourceId() {
-		return $this->calendarInfo['id'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getPrincipalURI() {
-		return $this->calendarInfo['principaluri'];
-	}
-
-	public function getACL() {
-		$acl =  [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			]];
-		if ($this->getName() !== BirthdayService::BIRTHDAY_CALENDAR_URI) {
-			$acl[] = [
-				'privilege' => '{DAV:}write',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			];
-		} else {
-			$acl[] = [
-				'privilege' => '{DAV:}write-properties',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			];
-		}
-
-		if ($this->getOwner() !== parent::getOwner()) {
-			$acl[] =  [
-					'privilege' => '{DAV:}read',
-					'principal' => parent::getOwner(),
-					'protected' => true,
-				];
-			if ($this->canWrite()) {
-				$acl[] = [
-					'privilege' => '{DAV:}write',
-					'principal' => parent::getOwner(),
-					'protected' => true,
-				];
-			} else {
-				$acl[] = [
-					'privilege' => '{DAV:}write-properties',
-					'principal' => parent::getOwner(),
-					'protected' => true,
-				];
-			}
-		}
-		if ($this->isPublic()) {
-			$acl[] = [
-				'privilege' => '{DAV:}read',
-				'principal' => 'principals/system/public',
-				'protected' => true,
-			];
-		}
-
-		$acl = $this->caldavBackend->applyShareAcl($this->getResourceId(), $acl);
-
-		if (!$this->isShared()) {
-			return $acl;
-		}
-
-		$allowedPrincipals = [$this->getOwner(), parent::getOwner(), 'principals/system/public'];
-		return array_filter($acl, function($rule) use ($allowedPrincipals) {
-			return in_array($rule['principal'], $allowedPrincipals);
-		});
-	}
-
-	public function getChildACL() {
-		return $this->getACL();
-	}
-
-	public function getOwner() {
-		if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
-			return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'];
-		}
-		return parent::getOwner();
-	}
-
-	public function delete() {
-		if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal']) &&
-			$this->calendarInfo['{http://owncloud.org/ns}owner-principal'] !== $this->calendarInfo['principaluri']) {
-			$principal = 'principal:' . parent::getOwner();
-			$shares = $this->caldavBackend->getShares($this->getResourceId());
-			$shares = array_filter($shares, function($share) use ($principal){
-				return $share['href'] === $principal;
-			});
-			if (empty($shares)) {
-				throw new Forbidden();
-			}
-
-			$this->caldavBackend->updateShares($this, [], [
-				'href' => $principal
-			]);
-			return;
-		}
-
-		// Remember when a user deleted their birthday calendar
-		// in order to not regenerate it on the next contacts change
-		if ($this->getName() === BirthdayService::BIRTHDAY_CALENDAR_URI) {
-			$principalURI = $this->getPrincipalURI();
-			$userId = substr($principalURI, 17);
-
-			$this->config->setUserValue($userId, 'dav', 'generateBirthdayCalendar', 'no');
-		}
-
-		parent::delete();
-	}
-
-	public function propPatch(PropPatch $propPatch) {
-		// parent::propPatch will only update calendars table
-		// if calendar is shared, changes have to be made to the properties table
-		if (!$this->isShared()) {
-			parent::propPatch($propPatch);
-		}
-	}
-
-	public function getChild($name) {
-
-		$obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name);
-
-		if (!$obj) {
-			throw new NotFound('Calendar object not found');
-		}
-
-		if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
-			throw new NotFound('Calendar object not found');
-		}
-
-		$obj['acl'] = $this->getChildACL();
-
-		return new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
-
-	}
-
-	public function getChildren() {
-
-		$objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
-		$children = [];
-		foreach ($objs as $obj) {
-			if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
-				continue;
-			}
-			$obj['acl'] = $this->getChildACL();
-			$children[] = new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
-		}
-		return $children;
-
-	}
-
-	public function getMultipleChildren(array $paths) {
-
-		$objs = $this->caldavBackend->getMultipleCalendarObjects($this->calendarInfo['id'], $paths);
-		$children = [];
-		foreach ($objs as $obj) {
-			if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
-				continue;
-			}
-			$obj['acl'] = $this->getChildACL();
-			$children[] = new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
-		}
-		return $children;
-
-	}
-
-	public function childExists($name) {
-		$obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name);
-		if (!$obj) {
-			return false;
-		}
-		if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
-			return false;
-		}
-
-		return true;
-	}
-
-	public function calendarQuery(array $filters) {
-
-		$uris = $this->caldavBackend->calendarQuery($this->calendarInfo['id'], $filters);
-		if ($this->isShared()) {
-			return array_filter($uris, function ($uri) {
-				return $this->childExists($uri);
-			});
-		}
-
-		return $uris;
-	}
-
-	/**
-	 * @param boolean $value
-	 * @return string|null
-	 */
-	public function setPublishStatus($value) {
-		$publicUri = $this->caldavBackend->setPublishStatus($value, $this);
-		$this->calendarInfo['publicuri'] = $publicUri;
-		return $publicUri;
-	}
-
-	/**
-	 * @return mixed $value
-	 */
-	public function getPublishStatus() {
-		return $this->caldavBackend->getPublishStatus($this);
-	}
-
-	private function canWrite() {
-		if (isset($this->calendarInfo['{http://owncloud.org/ns}read-only'])) {
-			return !$this->calendarInfo['{http://owncloud.org/ns}read-only'];
-		}
-		return true;
-	}
-
-	private function isPublic() {
-		return isset($this->calendarInfo['{http://owncloud.org/ns}public']);
-	}
-
-	protected function isShared() {
-		if (!isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
-			return false;
-		}
-
-		return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'] !== $this->calendarInfo['principaluri'];
-	}
-
-	public function isSubscription() {
-		return isset($this->calendarInfo['{http://calendarserver.org/ns/}source']);
-	}
+    /** @var IConfig */
+    private $config;
+
+    public function __construct(BackendInterface $caldavBackend, $calendarInfo, IL10N $l10n, IConfig $config) {
+        parent::__construct($caldavBackend, $calendarInfo);
+
+        if ($this->getName() === BirthdayService::BIRTHDAY_CALENDAR_URI) {
+            $this->calendarInfo['{DAV:}displayname'] = $l10n->t('Contact birthdays');
+        }
+        if ($this->getName() === CalDavBackend::PERSONAL_CALENDAR_URI &&
+            $this->calendarInfo['{DAV:}displayname'] === CalDavBackend::PERSONAL_CALENDAR_NAME) {
+            $this->calendarInfo['{DAV:}displayname'] = $l10n->t('Personal');
+        }
+
+        $this->config = $config;
+    }
+
+    /**
+     * Updates the list of shares.
+     *
+     * The first array is a list of people that are to be added to the
+     * resource.
+     *
+     * Every element in the add array has the following properties:
+     *   * href - A url. Usually a mailto: address
+     *   * commonName - Usually a first and last name, or false
+     *   * summary - A description of the share, can also be false
+     *   * readOnly - A boolean value
+     *
+     * Every element in the remove array is just the address string.
+     *
+     * @param array $add
+     * @param array $remove
+     * @return void
+     * @throws Forbidden
+     */
+    public function updateShares(array $add, array $remove) {
+        if ($this->isShared()) {
+            throw new Forbidden();
+        }
+        $this->caldavBackend->updateShares($this, $add, $remove);
+    }
+
+    /**
+     * Returns the list of people whom this resource 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
+     */
+    public function getShares() {
+        if ($this->isShared()) {
+            return [];
+        }
+        return $this->caldavBackend->getShares($this->getResourceId());
+    }
+
+    public function getAllShares() {
+        return $this->caldavBackend->getShares($this->getResourceId());
+    }
+
+    /**
+     * @return int
+     */
+    public function getResourceId() {
+        return $this->calendarInfo['id'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getPrincipalURI() {
+        return $this->calendarInfo['principaluri'];
+    }
+
+    public function getACL() {
+        $acl =  [
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ]];
+        if ($this->getName() !== BirthdayService::BIRTHDAY_CALENDAR_URI) {
+            $acl[] = [
+                'privilege' => '{DAV:}write',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ];
+        } else {
+            $acl[] = [
+                'privilege' => '{DAV:}write-properties',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ];
+        }
+
+        if ($this->getOwner() !== parent::getOwner()) {
+            $acl[] =  [
+                    'privilege' => '{DAV:}read',
+                    'principal' => parent::getOwner(),
+                    'protected' => true,
+                ];
+            if ($this->canWrite()) {
+                $acl[] = [
+                    'privilege' => '{DAV:}write',
+                    'principal' => parent::getOwner(),
+                    'protected' => true,
+                ];
+            } else {
+                $acl[] = [
+                    'privilege' => '{DAV:}write-properties',
+                    'principal' => parent::getOwner(),
+                    'protected' => true,
+                ];
+            }
+        }
+        if ($this->isPublic()) {
+            $acl[] = [
+                'privilege' => '{DAV:}read',
+                'principal' => 'principals/system/public',
+                'protected' => true,
+            ];
+        }
+
+        $acl = $this->caldavBackend->applyShareAcl($this->getResourceId(), $acl);
+
+        if (!$this->isShared()) {
+            return $acl;
+        }
+
+        $allowedPrincipals = [$this->getOwner(), parent::getOwner(), 'principals/system/public'];
+        return array_filter($acl, function($rule) use ($allowedPrincipals) {
+            return in_array($rule['principal'], $allowedPrincipals);
+        });
+    }
+
+    public function getChildACL() {
+        return $this->getACL();
+    }
+
+    public function getOwner() {
+        if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
+            return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'];
+        }
+        return parent::getOwner();
+    }
+
+    public function delete() {
+        if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal']) &&
+            $this->calendarInfo['{http://owncloud.org/ns}owner-principal'] !== $this->calendarInfo['principaluri']) {
+            $principal = 'principal:' . parent::getOwner();
+            $shares = $this->caldavBackend->getShares($this->getResourceId());
+            $shares = array_filter($shares, function($share) use ($principal){
+                return $share['href'] === $principal;
+            });
+            if (empty($shares)) {
+                throw new Forbidden();
+            }
+
+            $this->caldavBackend->updateShares($this, [], [
+                'href' => $principal
+            ]);
+            return;
+        }
+
+        // Remember when a user deleted their birthday calendar
+        // in order to not regenerate it on the next contacts change
+        if ($this->getName() === BirthdayService::BIRTHDAY_CALENDAR_URI) {
+            $principalURI = $this->getPrincipalURI();
+            $userId = substr($principalURI, 17);
+
+            $this->config->setUserValue($userId, 'dav', 'generateBirthdayCalendar', 'no');
+        }
+
+        parent::delete();
+    }
+
+    public function propPatch(PropPatch $propPatch) {
+        // parent::propPatch will only update calendars table
+        // if calendar is shared, changes have to be made to the properties table
+        if (!$this->isShared()) {
+            parent::propPatch($propPatch);
+        }
+    }
+
+    public function getChild($name) {
+
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name);
+
+        if (!$obj) {
+            throw new NotFound('Calendar object not found');
+        }
+
+        if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
+            throw new NotFound('Calendar object not found');
+        }
+
+        $obj['acl'] = $this->getChildACL();
+
+        return new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
+
+    }
+
+    public function getChildren() {
+
+        $objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
+        $children = [];
+        foreach ($objs as $obj) {
+            if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
+                continue;
+            }
+            $obj['acl'] = $this->getChildACL();
+            $children[] = new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
+        }
+        return $children;
+
+    }
+
+    public function getMultipleChildren(array $paths) {
+
+        $objs = $this->caldavBackend->getMultipleCalendarObjects($this->calendarInfo['id'], $paths);
+        $children = [];
+        foreach ($objs as $obj) {
+            if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
+                continue;
+            }
+            $obj['acl'] = $this->getChildACL();
+            $children[] = new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
+        }
+        return $children;
+
+    }
+
+    public function childExists($name) {
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name);
+        if (!$obj) {
+            return false;
+        }
+        if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function calendarQuery(array $filters) {
+
+        $uris = $this->caldavBackend->calendarQuery($this->calendarInfo['id'], $filters);
+        if ($this->isShared()) {
+            return array_filter($uris, function ($uri) {
+                return $this->childExists($uri);
+            });
+        }
+
+        return $uris;
+    }
+
+    /**
+     * @param boolean $value
+     * @return string|null
+     */
+    public function setPublishStatus($value) {
+        $publicUri = $this->caldavBackend->setPublishStatus($value, $this);
+        $this->calendarInfo['publicuri'] = $publicUri;
+        return $publicUri;
+    }
+
+    /**
+     * @return mixed $value
+     */
+    public function getPublishStatus() {
+        return $this->caldavBackend->getPublishStatus($this);
+    }
+
+    private function canWrite() {
+        if (isset($this->calendarInfo['{http://owncloud.org/ns}read-only'])) {
+            return !$this->calendarInfo['{http://owncloud.org/ns}read-only'];
+        }
+        return true;
+    }
+
+    private function isPublic() {
+        return isset($this->calendarInfo['{http://owncloud.org/ns}public']);
+    }
+
+    protected function isShared() {
+        if (!isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
+            return false;
+        }
+
+        return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'] !== $this->calendarInfo['principaluri'];
+    }
+
+    public function isSubscription() {
+        return isset($this->calendarInfo['{http://calendarserver.org/ns/}source']);
+    }
 
 }

apps/dav/lib/CalDAV/Schedule/Plugin.php

Indentation +156 added lines, -156 removed lines

@@ -39,160 +39,160 @@
 
 class Plugin extends \Sabre\CalDAV\Schedule\Plugin {
 
-	/** @var Principal */
-	protected $principalBackend;
-
-	/**
-	 * Plugin constructor.
-	 *
-	 * @param Principal $principalBackend
-	 */
-	public function __construct(Principal $principalBackend) {
-		$this->principalBackend = $principalBackend;
-	}
-
-	/**
-	 * Initializes the plugin
-	 *
-	 * @param Server $server
-	 * @return void
-	 */
-	function initialize(Server $server) {
-		parent::initialize($server);
-		$server->on('propFind', [$this, 'propFindDefaultCalendarUrl'], 90);
-	}
-
-	/**
-	 * Returns a list of addresses that are associated with a principal.
-	 *
-	 * @param string $principal
-	 * @return array
-	 */
-	protected function getAddressesForPrincipal($principal) {
-		$result = parent::getAddressesForPrincipal($principal);
-
-		if ($result === null) {
-			$result = [];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * This method is triggered whenever there was a calendar object gets
-	 * created or updated.
-	 *
-	 * @param RequestInterface $request HTTP request
-	 * @param ResponseInterface $response HTTP Response
-	 * @param VCalendar $vCal Parsed iCalendar object
-	 * @param mixed $calendarPath Path to calendar collection
-	 * @param mixed $modified The iCalendar object has been touched.
-	 * @param mixed $isNew Whether this was a new item or we're updating one
-	 * @return void
-	 */
-	function calendarObjectChange(RequestInterface $request, ResponseInterface $response, VCalendar $vCal, $calendarPath, &$modified, $isNew) {
-
-		if (!$this->scheduleReply($this->server->httpRequest)) {
-			return;
-		}
-
-		/** @var \OCA\DAV\CalDAV\Calendar $calendarNode */
-		$calendarNode = $this->server->tree->getNodeForPath($calendarPath);
-
-		$addresses = [];
-		$addresses[] = $this->getAddressesForPrincipal(
-			$calendarNode->getOwner()
-		);
-
-		// get writable calendar shares
-		$shares = $calendarNode->getAllShares();
-		foreach($shares as $share) {
-			if ($share['readOnly']) {
-				continue;
-			}
-
-			if (strpos($share['{http://owncloud.org/ns}principal'], 'principals/users/') === 0) {
-				$addresses[] = $this->getAddressesForPrincipal($share['{http://owncloud.org/ns}principal']);
-			} elseif (strpos($share['{http://owncloud.org/ns}principal'], 'principals/groups/') === 0) {
-				try {
-					$members = $this->principalBackend->getGroupMemberSet($share['{http://owncloud.org/ns}principal']);
-					foreach ($members as $member) {
-						$addresses[] = $this->getAddressesForPrincipal($member);
-					}
-				} catch(\Sabre\Dav\Exception $ex) {
-					continue;
-				}
-			}
-		}
-
-		$addresses = array_merge(...$addresses);
-
-		if (!$isNew) {
-			$node = $this->server->tree->getNodeForPath($request->getPath());
-			$oldObj = Reader::read($node->get());
-		} else {
-			$oldObj = null;
-		}
-
-		$this->processICalendarChange($oldObj, $vCal, $addresses, [], $modified);
-
-		if ($oldObj) {
-			// Destroy circular references so PHP will GC the object.
-			$oldObj->destroy();
-		}
-
-	}
-
-	/**
-	 * Always use the personal calendar as target for scheduled events
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) {
-		if ($node instanceof IPrincipal) {
-			$propFind->handle('{' . self::NS_CALDAV . '}schedule-default-calendar-URL', function() use ($node) {
-				/** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */
-				$caldavPlugin = $this->server->getPlugin('caldav');
-				$principalUrl = $node->getPrincipalUrl();
-
-				$calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
-
-				if (!$calendarHomePath) {
-					return null;
-				}
-
-				/** @var CalendarHome $calendarHome */
-				$calendarHome = $this->server->tree->getNodeForPath($calendarHomePath);
-				if (!$calendarHome->childExists(CalDavBackend::PERSONAL_CALENDAR_URI)) {
-					$calendarHome->getCalDAVBackend()->createCalendar($principalUrl, CalDavBackend::PERSONAL_CALENDAR_URI, [
-						'{DAV:}displayname' => CalDavBackend::PERSONAL_CALENDAR_NAME,
-					]);
-				}
-
-				$result = $this->server->getPropertiesForPath($calendarHomePath . '/' . CalDavBackend::PERSONAL_CALENDAR_URI, [], 1);
-				if (empty($result)) {
-					return null;
-				}
-
-				return new LocalHref($result[0]['href']);
-			});
-		}
-	}
-
-	/**
-	 * This method checks the 'Schedule-Reply' header
-	 * and returns false if it's 'F', otherwise true.
-	 *
-	 * Copied from Sabre/DAV's Schedule plugin, because it's
-	 * private for whatever reason
-	 *
-	 * @param RequestInterface $request
-	 * @return bool
-	 */
-	private function scheduleReply(RequestInterface $request) {
-		$scheduleReply = $request->getHeader('Schedule-Reply');
-		return $scheduleReply !== 'F';
-	}
+    /** @var Principal */
+    protected $principalBackend;
+
+    /**
+     * Plugin constructor.
+     *
+     * @param Principal $principalBackend
+     */
+    public function __construct(Principal $principalBackend) {
+        $this->principalBackend = $principalBackend;
+    }
+
+    /**
+     * Initializes the plugin
+     *
+     * @param Server $server
+     * @return void
+     */
+    function initialize(Server $server) {
+        parent::initialize($server);
+        $server->on('propFind', [$this, 'propFindDefaultCalendarUrl'], 90);
+    }
+
+    /**
+     * Returns a list of addresses that are associated with a principal.
+     *
+     * @param string $principal
+     * @return array
+     */
+    protected function getAddressesForPrincipal($principal) {
+        $result = parent::getAddressesForPrincipal($principal);
+
+        if ($result === null) {
+            $result = [];
+        }
+
+        return $result;
+    }
+
+    /**
+     * This method is triggered whenever there was a calendar object gets
+     * created or updated.
+     *
+     * @param RequestInterface $request HTTP request
+     * @param ResponseInterface $response HTTP Response
+     * @param VCalendar $vCal Parsed iCalendar object
+     * @param mixed $calendarPath Path to calendar collection
+     * @param mixed $modified The iCalendar object has been touched.
+     * @param mixed $isNew Whether this was a new item or we're updating one
+     * @return void
+     */
+    function calendarObjectChange(RequestInterface $request, ResponseInterface $response, VCalendar $vCal, $calendarPath, &$modified, $isNew) {
+
+        if (!$this->scheduleReply($this->server->httpRequest)) {
+            return;
+        }
+
+        /** @var \OCA\DAV\CalDAV\Calendar $calendarNode */
+        $calendarNode = $this->server->tree->getNodeForPath($calendarPath);
+
+        $addresses = [];
+        $addresses[] = $this->getAddressesForPrincipal(
+            $calendarNode->getOwner()
+        );
+
+        // get writable calendar shares
+        $shares = $calendarNode->getAllShares();
+        foreach($shares as $share) {
+            if ($share['readOnly']) {
+                continue;
+            }
+
+            if (strpos($share['{http://owncloud.org/ns}principal'], 'principals/users/') === 0) {
+                $addresses[] = $this->getAddressesForPrincipal($share['{http://owncloud.org/ns}principal']);
+            } elseif (strpos($share['{http://owncloud.org/ns}principal'], 'principals/groups/') === 0) {
+                try {
+                    $members = $this->principalBackend->getGroupMemberSet($share['{http://owncloud.org/ns}principal']);
+                    foreach ($members as $member) {
+                        $addresses[] = $this->getAddressesForPrincipal($member);
+                    }
+                } catch(\Sabre\Dav\Exception $ex) {
+                    continue;
+                }
+            }
+        }
+
+        $addresses = array_merge(...$addresses);
+
+        if (!$isNew) {
+            $node = $this->server->tree->getNodeForPath($request->getPath());
+            $oldObj = Reader::read($node->get());
+        } else {
+            $oldObj = null;
+        }
+
+        $this->processICalendarChange($oldObj, $vCal, $addresses, [], $modified);
+
+        if ($oldObj) {
+            // Destroy circular references so PHP will GC the object.
+            $oldObj->destroy();
+        }
+
+    }
+
+    /**
+     * Always use the personal calendar as target for scheduled events
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) {
+        if ($node instanceof IPrincipal) {
+            $propFind->handle('{' . self::NS_CALDAV . '}schedule-default-calendar-URL', function() use ($node) {
+                /** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */
+                $caldavPlugin = $this->server->getPlugin('caldav');
+                $principalUrl = $node->getPrincipalUrl();
+
+                $calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
+
+                if (!$calendarHomePath) {
+                    return null;
+                }
+
+                /** @var CalendarHome $calendarHome */
+                $calendarHome = $this->server->tree->getNodeForPath($calendarHomePath);
+                if (!$calendarHome->childExists(CalDavBackend::PERSONAL_CALENDAR_URI)) {
+                    $calendarHome->getCalDAVBackend()->createCalendar($principalUrl, CalDavBackend::PERSONAL_CALENDAR_URI, [
+                        '{DAV:}displayname' => CalDavBackend::PERSONAL_CALENDAR_NAME,
+                    ]);
+                }
+
+                $result = $this->server->getPropertiesForPath($calendarHomePath . '/' . CalDavBackend::PERSONAL_CALENDAR_URI, [], 1);
+                if (empty($result)) {
+                    return null;
+                }
+
+                return new LocalHref($result[0]['href']);
+            });
+        }
+    }
+
+    /**
+     * This method checks the 'Schedule-Reply' header
+     * and returns false if it's 'F', otherwise true.
+     *
+     * Copied from Sabre/DAV's Schedule plugin, because it's
+     * private for whatever reason
+     *
+     * @param RequestInterface $request
+     * @return bool
+     */
+    private function scheduleReply(RequestInterface $request) {
+        $scheduleReply = $request->getHeader('Schedule-Reply');
+        return $scheduleReply !== 'F';
+    }
 }

apps/dav/lib/Server.php

Indentation +191 added lines, -191 removed lines

@@ -64,220 +64,220 @@
 
 class Server {
 
-	/** @var IRequest */
-	private $request;
+    /** @var IRequest */
+    private $request;
 
-	/** @var  string */
-	private $baseUri;
+    /** @var  string */
+    private $baseUri;
 
-	/** @var Connector\Sabre\Server  */
-	private $server;
+    /** @var Connector\Sabre\Server  */
+    private $server;
 
-	public function __construct(IRequest $request, $baseUri) {
-		$this->request = $request;
-		$this->baseUri = $baseUri;
-		$logger = \OC::$server->getLogger();
-		$dispatcher = \OC::$server->getEventDispatcher();
-		$sendInvitations = \OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes';
+    public function __construct(IRequest $request, $baseUri) {
+        $this->request = $request;
+        $this->baseUri = $baseUri;
+        $logger = \OC::$server->getLogger();
+        $dispatcher = \OC::$server->getEventDispatcher();
+        $sendInvitations = \OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes';
 
-		$root = new RootCollection();
-		$this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
+        $root = new RootCollection();
+        $this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
 
-		// Add maintenance plugin
-		$this->server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin(\OC::$server->getConfig()));
+        // Add maintenance plugin
+        $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin(\OC::$server->getConfig()));
 
-		// Backends
-		$authBackend = new Auth(
-			\OC::$server->getSession(),
-			\OC::$server->getUserSession(),
-			\OC::$server->getRequest(),
-			\OC::$server->getTwoFactorAuthManager(),
-			\OC::$server->getBruteForceThrottler()
-		);
+        // Backends
+        $authBackend = new Auth(
+            \OC::$server->getSession(),
+            \OC::$server->getUserSession(),
+            \OC::$server->getRequest(),
+            \OC::$server->getTwoFactorAuthManager(),
+            \OC::$server->getBruteForceThrottler()
+        );
 
-		// Set URL explicitly due to reverse-proxy situations
-		$this->server->httpRequest->setUrl($this->request->getRequestUri());
-		$this->server->setBaseUri($this->baseUri);
+        // Set URL explicitly due to reverse-proxy situations
+        $this->server->httpRequest->setUrl($this->request->getRequestUri());
+        $this->server->setBaseUri($this->baseUri);
 
-		$this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
-		$authPlugin = new Plugin();
-		$authPlugin->addBackend(new PublicAuth());
-		$this->server->addPlugin($authPlugin);
+        $this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
+        $authPlugin = new Plugin();
+        $authPlugin->addBackend(new PublicAuth());
+        $this->server->addPlugin($authPlugin);
 
-		// allow setup of additional auth backends
-		$event = new SabrePluginEvent($this->server);
-		$dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
+        // allow setup of additional auth backends
+        $event = new SabrePluginEvent($this->server);
+        $dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
 
-		$bearerAuthBackend = new BearerAuth(
-			\OC::$server->getUserSession(),
-			\OC::$server->getSession(),
-			\OC::$server->getRequest()
-		);
-		$authPlugin->addBackend($bearerAuthBackend);
-		// because we are throwing exceptions this plugin has to be the last one
-		$authPlugin->addBackend($authBackend);
+        $bearerAuthBackend = new BearerAuth(
+            \OC::$server->getUserSession(),
+            \OC::$server->getSession(),
+            \OC::$server->getRequest()
+        );
+        $authPlugin->addBackend($bearerAuthBackend);
+        // because we are throwing exceptions this plugin has to be the last one
+        $authPlugin->addBackend($authBackend);
 
-		// debugging
-		if(\OC::$server->getConfig()->getSystemValue('debug', false)) {
-			$this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
-		} else {
-			$this->server->addPlugin(new DummyGetResponsePlugin());
-		}
+        // debugging
+        if(\OC::$server->getConfig()->getSystemValue('debug', false)) {
+            $this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
+        } else {
+            $this->server->addPlugin(new DummyGetResponsePlugin());
+        }
 
-		$this->server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $logger));
-		$this->server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
-		$this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
+        $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $logger));
+        $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
+        $this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
 
-		// acl
-		$acl = new DavAclPlugin();
-		$acl->principalCollectionSet = [
-			'principals/users', 'principals/groups'
-		];
-		$acl->defaultUsernamePath = 'principals/users';
-		$this->server->addPlugin($acl);
+        // acl
+        $acl = new DavAclPlugin();
+        $acl->principalCollectionSet = [
+            'principals/users', 'principals/groups'
+        ];
+        $acl->defaultUsernamePath = 'principals/users';
+        $this->server->addPlugin($acl);
 
-		// calendar plugins
-		$this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
-		$this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
-		$this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(\OC::$server->query(\OCA\DAV\Connector\Sabre\Principal::class)));
-		if ($sendInvitations) {
-			$this->server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));
-		}
-		$this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
-		$this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
-		$this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
-		$this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
-			\OC::$server->getConfig(),
-			\OC::$server->getURLGenerator()
-		));
+        // calendar plugins
+        $this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
+        $this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
+        $this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(\OC::$server->query(\OCA\DAV\Connector\Sabre\Principal::class)));
+        if ($sendInvitations) {
+            $this->server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));
+        }
+        $this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
+        $this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
+        $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
+        $this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
+            \OC::$server->getConfig(),
+            \OC::$server->getURLGenerator()
+        ));
 
-		// addressbook plugins
-		$this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
-		$this->server->addPlugin(new VCFExportPlugin());
-		$this->server->addPlugin(new ImageExportPlugin(new PhotoCache(\OC::$server->getAppDataDir('dav-photocache'))));
+        // addressbook plugins
+        $this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
+        $this->server->addPlugin(new VCFExportPlugin());
+        $this->server->addPlugin(new ImageExportPlugin(new PhotoCache(\OC::$server->getAppDataDir('dav-photocache'))));
 
-		// system tags plugins
-		$this->server->addPlugin(new SystemTagPlugin(
-			\OC::$server->getSystemTagManager(),
-			\OC::$server->getGroupManager(),
-			\OC::$server->getUserSession()
-		));
+        // system tags plugins
+        $this->server->addPlugin(new SystemTagPlugin(
+            \OC::$server->getSystemTagManager(),
+            \OC::$server->getGroupManager(),
+            \OC::$server->getUserSession()
+        ));
 
-		// comments plugin
-		$this->server->addPlugin(new CommentsPlugin(
-			\OC::$server->getCommentsManager(),
-			\OC::$server->getUserSession()
-		));
+        // comments plugin
+        $this->server->addPlugin(new CommentsPlugin(
+            \OC::$server->getCommentsManager(),
+            \OC::$server->getUserSession()
+        ));
 
-		$this->server->addPlugin(new CopyEtagHeaderPlugin());
-		$this->server->addPlugin(new ChunkingPlugin());
+        $this->server->addPlugin(new CopyEtagHeaderPlugin());
+        $this->server->addPlugin(new ChunkingPlugin());
 
-		// allow setup of additional plugins
-		$dispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
+        // allow setup of additional plugins
+        $dispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
 
-		// Some WebDAV clients do require Class 2 WebDAV support (locking), since
-		// we do not provide locking we emulate it using a fake locking plugin.
-		if($request->isUserAgent([
-			'/WebDAVFS/',
-			'/OneNote/',
-			'/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
-		])) {
-			$this->server->addPlugin(new FakeLockerPlugin());
-		}
+        // Some WebDAV clients do require Class 2 WebDAV support (locking), since
+        // we do not provide locking we emulate it using a fake locking plugin.
+        if($request->isUserAgent([
+            '/WebDAVFS/',
+            '/OneNote/',
+            '/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
+        ])) {
+            $this->server->addPlugin(new FakeLockerPlugin());
+        }
 
-		if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
-			$this->server->addPlugin(new BrowserErrorPagePlugin());
-		}
+        if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
+            $this->server->addPlugin(new BrowserErrorPagePlugin());
+        }
 
-		// wait with registering these until auth is handled and the filesystem is setup
-		$this->server->on('beforeMethod', function () use ($root) {
-			// custom properties plugin must be the last one
-			$userSession = \OC::$server->getUserSession();
-			$user = $userSession->getUser();
-			if ($user !== null) {
-				$view = \OC\Files\Filesystem::getView();
-				$this->server->addPlugin(
-					new FilesPlugin(
-						$this->server->tree,
-						\OC::$server->getConfig(),
-						$this->request,
-						\OC::$server->getPreviewManager(),
-						false,
-						!\OC::$server->getConfig()->getSystemValue('debug', false)
-					)
-				);
+        // wait with registering these until auth is handled and the filesystem is setup
+        $this->server->on('beforeMethod', function () use ($root) {
+            // custom properties plugin must be the last one
+            $userSession = \OC::$server->getUserSession();
+            $user = $userSession->getUser();
+            if ($user !== null) {
+                $view = \OC\Files\Filesystem::getView();
+                $this->server->addPlugin(
+                    new FilesPlugin(
+                        $this->server->tree,
+                        \OC::$server->getConfig(),
+                        $this->request,
+                        \OC::$server->getPreviewManager(),
+                        false,
+                        !\OC::$server->getConfig()->getSystemValue('debug', false)
+                    )
+                );
 
-				$this->server->addPlugin(
-					new \Sabre\DAV\PropertyStorage\Plugin(
-						new CustomPropertiesBackend(
-							$this->server->tree,
-							\OC::$server->getDatabaseConnection(),
-							\OC::$server->getUserSession()->getUser()
-						)
-					)
-				);
-				if ($view !== null) {
-					$this->server->addPlugin(
-						new QuotaPlugin($view, false));
-				}
-				$this->server->addPlugin(
-					new TagsPlugin(
-						$this->server->tree, \OC::$server->getTagManager()
-					)
-				);
-				// TODO: switch to LazyUserFolder
-				$userFolder = \OC::$server->getUserFolder();
-				$this->server->addPlugin(new SharesPlugin(
-					$this->server->tree,
-					$userSession,
-					$userFolder,
-					\OC::$server->getShareManager()
-				));
-				$this->server->addPlugin(new CommentPropertiesPlugin(
-					\OC::$server->getCommentsManager(),
-					$userSession
-				));
-				$this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
-				if ($view !== null) {
-					$this->server->addPlugin(new FilesReportPlugin(
-						$this->server->tree,
-						$view,
-						\OC::$server->getSystemTagManager(),
-						\OC::$server->getSystemTagObjectMapper(),
-						\OC::$server->getTagManager(),
-						$userSession,
-						\OC::$server->getGroupManager(),
-						$userFolder
-					));
-					$this->server->addPlugin(new SearchPlugin(new \OCA\DAV\Files\FileSearchBackend(
-						$this->server->tree,
-						$user,
-						\OC::$server->getRootFolder(),
-						\OC::$server->getShareManager(),
-						$view
-					)));
-				}
-				$this->server->addPlugin(new \OCA\DAV\CalDAV\BirthdayCalendar\EnablePlugin(
-					\OC::$server->getConfig(),
-					\OC::$server->query(BirthdayService::class)
-				));
-			}
+                $this->server->addPlugin(
+                    new \Sabre\DAV\PropertyStorage\Plugin(
+                        new CustomPropertiesBackend(
+                            $this->server->tree,
+                            \OC::$server->getDatabaseConnection(),
+                            \OC::$server->getUserSession()->getUser()
+                        )
+                    )
+                );
+                if ($view !== null) {
+                    $this->server->addPlugin(
+                        new QuotaPlugin($view, false));
+                }
+                $this->server->addPlugin(
+                    new TagsPlugin(
+                        $this->server->tree, \OC::$server->getTagManager()
+                    )
+                );
+                // TODO: switch to LazyUserFolder
+                $userFolder = \OC::$server->getUserFolder();
+                $this->server->addPlugin(new SharesPlugin(
+                    $this->server->tree,
+                    $userSession,
+                    $userFolder,
+                    \OC::$server->getShareManager()
+                ));
+                $this->server->addPlugin(new CommentPropertiesPlugin(
+                    \OC::$server->getCommentsManager(),
+                    $userSession
+                ));
+                $this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
+                if ($view !== null) {
+                    $this->server->addPlugin(new FilesReportPlugin(
+                        $this->server->tree,
+                        $view,
+                        \OC::$server->getSystemTagManager(),
+                        \OC::$server->getSystemTagObjectMapper(),
+                        \OC::$server->getTagManager(),
+                        $userSession,
+                        \OC::$server->getGroupManager(),
+                        $userFolder
+                    ));
+                    $this->server->addPlugin(new SearchPlugin(new \OCA\DAV\Files\FileSearchBackend(
+                        $this->server->tree,
+                        $user,
+                        \OC::$server->getRootFolder(),
+                        \OC::$server->getShareManager(),
+                        $view
+                    )));
+                }
+                $this->server->addPlugin(new \OCA\DAV\CalDAV\BirthdayCalendar\EnablePlugin(
+                    \OC::$server->getConfig(),
+                    \OC::$server->query(BirthdayService::class)
+                ));
+            }
 
-			// register plugins from apps
-			$pluginManager = new PluginManager(
-				\OC::$server,
-				\OC::$server->getAppManager()
-			);
-			foreach ($pluginManager->getAppPlugins() as $appPlugin) {
-				$this->server->addPlugin($appPlugin);
-			}
-			foreach ($pluginManager->getAppCollections() as $appCollection) {
-				$root->addChild($appCollection);
-			}
-		});
-	}
+            // register plugins from apps
+            $pluginManager = new PluginManager(
+                \OC::$server,
+                \OC::$server->getAppManager()
+            );
+            foreach ($pluginManager->getAppPlugins() as $appPlugin) {
+                $this->server->addPlugin($appPlugin);
+            }
+            foreach ($pluginManager->getAppCollections() as $appCollection) {
+                $root->addChild($appCollection);
+            }
+        });
+    }
 
-	public function exec() {
-		$this->server->exec();
-	}
+    public function exec() {
+        $this->server->exec();
+    }
 }