nextcloud / server

apps/dav/lib/CardDAV/AddressBookRoot.php

Indentation +37 added lines, -37 removed lines

@@ -28,48 +28,48 @@
 
 class AddressBookRoot extends \Sabre\CardDAV\AddressBookRoot {
 
-	/** @var PluginManager */
-	private $pluginManager;
+    /** @var PluginManager */
+    private $pluginManager;
 
-	/**
-	 * @param \Sabre\DAVACL\PrincipalBackend\BackendInterface $principalBackend
-	 * @param \Sabre\CardDAV\Backend\BackendInterface $carddavBackend
-	 * @param string $principalPrefix
-	 */
-	public function __construct(\Sabre\DAVACL\PrincipalBackend\BackendInterface $principalBackend,
-								\Sabre\CardDAV\Backend\BackendInterface $carddavBackend,
-								PluginManager $pluginManager,
-								$principalPrefix = 'principals') {
-		parent::__construct($principalBackend, $carddavBackend, $principalPrefix);
-		$this->pluginManager = $pluginManager;
-	}
+    /**
+     * @param \Sabre\DAVACL\PrincipalBackend\BackendInterface $principalBackend
+     * @param \Sabre\CardDAV\Backend\BackendInterface $carddavBackend
+     * @param string $principalPrefix
+     */
+    public function __construct(\Sabre\DAVACL\PrincipalBackend\BackendInterface $principalBackend,
+                                \Sabre\CardDAV\Backend\BackendInterface $carddavBackend,
+                                PluginManager $pluginManager,
+                                $principalPrefix = 'principals') {
+        parent::__construct($principalBackend, $carddavBackend, $principalPrefix);
+        $this->pluginManager = $pluginManager;
+    }
 
-	/**
-	 * This method returns a node for a principal.
-	 *
-	 * The passed array contains principal information, and is guaranteed to
-	 * at least contain a uri item. Other properties may or may not be
-	 * supplied by the authentication backend.
-	 *
-	 * @param array $principal
-	 *
-	 * @return \Sabre\DAV\INode
-	 */
-	function getChildForPrincipal(array $principal) {
-		return new UserAddressBooks($this->carddavBackend, $principal['uri'], $this->pluginManager);
-	}
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     *
+     * @param array $principal
+     *
+     * @return \Sabre\DAV\INode
+     */
+    function getChildForPrincipal(array $principal) {
+        return new UserAddressBooks($this->carddavBackend, $principal['uri'], $this->pluginManager);
+    }
 
-	function getName() {
+    function getName() {
 
-		if ($this->principalPrefix === 'principals') {
-			return parent::getName();
-		}
-		// Grabbing all the components of the principal path.
-		$parts = explode('/', $this->principalPrefix);
+        if ($this->principalPrefix === 'principals') {
+            return parent::getName();
+        }
+        // Grabbing all the components of the principal path.
+        $parts = explode('/', $this->principalPrefix);
 
-		// We are only interested in the second part.
-		return $parts[1];
+        // We are only interested in the second part.
+        return $parts[1];
 
-	}
+    }
 
 }

apps/dav/lib/CardDAV/UserAddressBooks.php

Indentation +77 added lines, -77 removed lines

@@ -37,82 +37,82 @@
 
 class UserAddressBooks extends \Sabre\CardDAV\AddressBookHome {
 
-	/** @var IL10N */
-	protected $l10n;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var PluginManager */
-	private $pluginManager;
-
-	public function __construct(Backend\BackendInterface $carddavBackend,
-								string $principalUri,
-								PluginManager $pluginManager) {
-		parent::__construct($carddavBackend, $principalUri);
-		$this->pluginManager = $pluginManager;
-	}
-
-	/**
-	 * Returns a list of address books
-	 *
-	 * @return array
-	 */
-	function getChildren() {
-		if ($this->l10n === null) {
-			$this->l10n = \OC::$server->getL10N('dav');
-		}
-		if ($this->config === null) {
-			$this->config = \OC::$server->getConfig();
-		}
-
-		$addressBooks = $this->carddavBackend->getAddressBooksForUser($this->principalUri);
-		$objects = array_map(function(array $addressBook) {
-			if ($addressBook['principaluri'] === 'principals/system/system') {
-				return new SystemAddressbook($this->carddavBackend, $addressBook, $this->l10n, $this->config);
-			}
-
-			return new AddressBook($this->carddavBackend, $addressBook, $this->l10n);
-		}, $addressBooks);
-		foreach ($this->pluginManager->getAddressBookPlugins() as $plugin) {
-			$plugin->fetchAllForAddressBookHome($this->principalUri);
-		}
-		return $objects;
-
-	}
-
-	public function createExtendedCollection($name, MkCol $mkCol) {
-		if (ExternalAddressBook::doesViolateReservedName($name)) {
-			throw new MethodNotAllowed('The resource you tried to create has a reserved name');
-		}
-
-		parent::createExtendedCollection($name, $mkCol);
-	}
-
-	/**
-	 * Returns a list of ACE's for this node.
-	 *
-	 * Each ACE has the following properties:
-	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-	 *     currently the only supported privileges
-	 *   * 'principal', a url to the principal who owns the node
-	 *   * 'protected' (optional), indicating that this ACE is not allowed to
-	 *      be updated.
-	 *
-	 * @return array
-	 */
-	function getACL() {
-
-		$acl = parent::getACL();
-		if ($this->principalUri === 'principals/system/system') {
-			$acl[] = [
-				'privilege' => '{DAV:}read',
-				'principal' => '{DAV:}authenticated',
-				'protected' => true,
-			];
-		}
-
-		return $acl;
-	}
+    /** @var IL10N */
+    protected $l10n;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var PluginManager */
+    private $pluginManager;
+
+    public function __construct(Backend\BackendInterface $carddavBackend,
+                                string $principalUri,
+                                PluginManager $pluginManager) {
+        parent::__construct($carddavBackend, $principalUri);
+        $this->pluginManager = $pluginManager;
+    }
+
+    /**
+     * Returns a list of address books
+     *
+     * @return array
+     */
+    function getChildren() {
+        if ($this->l10n === null) {
+            $this->l10n = \OC::$server->getL10N('dav');
+        }
+        if ($this->config === null) {
+            $this->config = \OC::$server->getConfig();
+        }
+
+        $addressBooks = $this->carddavBackend->getAddressBooksForUser($this->principalUri);
+        $objects = array_map(function(array $addressBook) {
+            if ($addressBook['principaluri'] === 'principals/system/system') {
+                return new SystemAddressbook($this->carddavBackend, $addressBook, $this->l10n, $this->config);
+            }
+
+            return new AddressBook($this->carddavBackend, $addressBook, $this->l10n);
+        }, $addressBooks);
+        foreach ($this->pluginManager->getAddressBookPlugins() as $plugin) {
+            $plugin->fetchAllForAddressBookHome($this->principalUri);
+        }
+        return $objects;
+
+    }
+
+    public function createExtendedCollection($name, MkCol $mkCol) {
+        if (ExternalAddressBook::doesViolateReservedName($name)) {
+            throw new MethodNotAllowed('The resource you tried to create has a reserved name');
+        }
+
+        parent::createExtendedCollection($name, $mkCol);
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    function getACL() {
+
+        $acl = parent::getACL();
+        if ($this->principalUri === 'principals/system/system') {
+            $acl[] = [
+                'privilege' => '{DAV:}read',
+                'principal' => '{DAV:}authenticated',
+                'protected' => true,
+            ];
+        }
+
+        return $acl;
+    }
 
 }

apps/dav/lib/CardDAV/Integration/IAddressBookProvider.php

Indentation +38 added lines, -38 removed lines

@@ -11,43 +11,43 @@
  */
 interface IAddressBookProvider {
 
-	/**
-	 * Provides the appId of the plugin
-	 *
-	 * @since 19.0.0
-	 * @return string AppId
-	 */
-	public function getAppId(): string;
-
-	/**
-	 * Fetches all address books for a given principal uri
-	 *
-	 * @since 19.0.0
-	 * @param string $principalUri E.g. principals/users/user1
-	 * @return ExternalAddressBook[] Array of all address books
-	 */
-	public function fetchAllForAddressBookHome(string $principalUri): array;
-
-	/**
-	 * Checks whether plugin has an address book for a given principalUri and URI
-	 *
-	 * @since 19.0.0
-	 * @param string $principalUri E.g. principals/users/user1
-	 * @param string $uri E.g. personal
-	 * @return bool True if address book for principalUri and URI exists, false otherwise
-	 */
-	public function hasAddressBookInAddressBookHome(string $principalUri, string $uri): bool;
-
-	/**
-	 * Fetches an address book for a given principalUri and URI
-	 * Returns null if address book does not exist
-	 *
-	 * @param string $principalUri E.g. principals/users/user1
-	 * @param string $uri E.g. personal
-	 *
-	 * @return ExternalAddressBook|null address book if it exists, null otherwise
-	 *@since 19.0.0
-	 */
-	public function getAddressBookInAddressBookHome(string $principalUri, string $uri): ?ExternalAddressBook;
+    /**
+     * Provides the appId of the plugin
+     *
+     * @since 19.0.0
+     * @return string AppId
+     */
+    public function getAppId(): string;
+
+    /**
+     * Fetches all address books for a given principal uri
+     *
+     * @since 19.0.0
+     * @param string $principalUri E.g. principals/users/user1
+     * @return ExternalAddressBook[] Array of all address books
+     */
+    public function fetchAllForAddressBookHome(string $principalUri): array;
+
+    /**
+     * Checks whether plugin has an address book for a given principalUri and URI
+     *
+     * @since 19.0.0
+     * @param string $principalUri E.g. principals/users/user1
+     * @param string $uri E.g. personal
+     * @return bool True if address book for principalUri and URI exists, false otherwise
+     */
+    public function hasAddressBookInAddressBookHome(string $principalUri, string $uri): bool;
+
+    /**
+     * Fetches an address book for a given principalUri and URI
+     * Returns null if address book does not exist
+     *
+     * @param string $principalUri E.g. principals/users/user1
+     * @param string $uri E.g. personal
+     *
+     * @return ExternalAddressBook|null address book if it exists, null otherwise
+     *@since 19.0.0
+     */
+    public function getAddressBookInAddressBookHome(string $principalUri, string $uri): ?ExternalAddressBook;
 
 }

apps/dav/lib/CardDAV/Integration/ExternalAddressBook.php

Indentation +97 added lines, -97 removed lines

@@ -12,102 +12,102 @@
  */
 abstract class ExternalAddressBook implements IAddressBook, DAV\IProperties {
 
-	/** @var string */
-	private const PREFIX = 'app-generated';
-
-	/**
-	 * @var string
-	 *
-	 * Double dash is a valid delimiter,
-	 * because it will always split the URIs correctly:
-	 * - our prefix contains only one dash and won't be split
-	 * - appIds are not allowed to contain dashes as per spec:
-	 * > must contain only lowercase ASCII characters and underscore
-	 * - explode has a limit of three, so even if the app-generated
-	 *   URI has double dashes, it won't be split
-	 */
-	private const DELIMITER = '--';
-
-	/** @var string */
-	private $appId;
-
-	/** @var string */
-	private $uri;
-
-	/**
-	 * @param string $appId
-	 * @param string $uri
-	 */
-	public function __construct(string $appId, string $uri) {
-		$this->appId = $appId;
-		$this->uri = $uri;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	final public function getName() {
-		return implode(self::DELIMITER, [
-			self::PREFIX,
-			$this->appId,
-			$this->uri,
-		]);
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	final public function setName($name) {
-		throw new DAV\Exception\MethodNotAllowed('Renaming address books is not yet supported');
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	final public function createDirectory($name) {
-		throw new DAV\Exception\MethodNotAllowed('Creating collections in address book objects is not allowed');
-
-	}
-
-	/**
-	 * Checks whether the address book uri is app-generated
-	 *
-	 * @param string $uri
-	 *
-	 * @return bool
-	 */
-	public static function isAppGeneratedAddressBook(string $uri): bool {
-		return strpos($uri, self::PREFIX) === 0 && substr_count($uri, self::DELIMITER) >= 2;
-	}
-
-	/**
-	 * Splits an app-generated uri into appId and uri
-	 *
-	 * @param string $uri
-	 *
-	 * @return array
-	 */
-	public static function splitAppGeneratedAddressBookUri(string $uri): array {
-		$array = array_slice(explode(self::DELIMITER, $uri, 3), 1);
-		// Check the array has expected amount of elements
-		// and none of them is an empty string
-		if (\count($array) !== 2 || \in_array('', $array, true)) {
-			throw new \InvalidArgumentException('Provided address book uri was not app-generated');
-		}
-
-		return $array;
-	}
-
-	/**
-	 * Checks whether a address book name the user wants to create violates
-	 * the reserved name for URIs
-	 *
-	 * @param string $uri
-	 *
-	 * @return bool
-	 */
-	public static function doesViolateReservedName(string $uri): bool {
-		return strpos($uri, self::PREFIX) === 0;
-	}
+    /** @var string */
+    private const PREFIX = 'app-generated';
+
+    /**
+     * @var string
+     *
+     * Double dash is a valid delimiter,
+     * because it will always split the URIs correctly:
+     * - our prefix contains only one dash and won't be split
+     * - appIds are not allowed to contain dashes as per spec:
+     * > must contain only lowercase ASCII characters and underscore
+     * - explode has a limit of three, so even if the app-generated
+     *   URI has double dashes, it won't be split
+     */
+    private const DELIMITER = '--';
+
+    /** @var string */
+    private $appId;
+
+    /** @var string */
+    private $uri;
+
+    /**
+     * @param string $appId
+     * @param string $uri
+     */
+    public function __construct(string $appId, string $uri) {
+        $this->appId = $appId;
+        $this->uri = $uri;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    final public function getName() {
+        return implode(self::DELIMITER, [
+            self::PREFIX,
+            $this->appId,
+            $this->uri,
+        ]);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    final public function setName($name) {
+        throw new DAV\Exception\MethodNotAllowed('Renaming address books is not yet supported');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    final public function createDirectory($name) {
+        throw new DAV\Exception\MethodNotAllowed('Creating collections in address book objects is not allowed');
+
+    }
+
+    /**
+     * Checks whether the address book uri is app-generated
+     *
+     * @param string $uri
+     *
+     * @return bool
+     */
+    public static function isAppGeneratedAddressBook(string $uri): bool {
+        return strpos($uri, self::PREFIX) === 0 && substr_count($uri, self::DELIMITER) >= 2;
+    }
+
+    /**
+     * Splits an app-generated uri into appId and uri
+     *
+     * @param string $uri
+     *
+     * @return array
+     */
+    public static function splitAppGeneratedAddressBookUri(string $uri): array {
+        $array = array_slice(explode(self::DELIMITER, $uri, 3), 1);
+        // Check the array has expected amount of elements
+        // and none of them is an empty string
+        if (\count($array) !== 2 || \in_array('', $array, true)) {
+            throw new \InvalidArgumentException('Provided address book uri was not app-generated');
+        }
+
+        return $array;
+    }
+
+    /**
+     * Checks whether a address book name the user wants to create violates
+     * the reserved name for URIs
+     *
+     * @param string $uri
+     *
+     * @return bool
+     */
+    public static function doesViolateReservedName(string $uri): bool {
+        return strpos($uri, self::PREFIX) === 0;
+    }
 
 }

apps/dav/lib/AppInfo/PluginManager.php

Indentation +235 added lines, -235 removed lines

@@ -42,264 +42,264 @@
  */
 class PluginManager {
 
-	/**
-	 * @var ServerContainer
-	 */
-	private $container;
+    /**
+     * @var ServerContainer
+     */
+    private $container;
 
-	/**
-	 * @var IAppManager
-	 */
-	private $appManager;
+    /**
+     * @var IAppManager
+     */
+    private $appManager;
 
-	/**
-	 * App plugins
-	 *
-	 * @var array
-	 */
-	private $plugins = null;
+    /**
+     * App plugins
+     *
+     * @var array
+     */
+    private $plugins = null;
 
-	/**
-	 * App collections
-	 *
-	 * @var array
-	 */
-	private $collections = null;
+    /**
+     * App collections
+     *
+     * @var array
+     */
+    private $collections = null;
 
-	/**
-	 * Address book plugins
-	 *
-	 * @var IAddressBookProvider[]|null
-	 */
-	private $addressBookPlugins = null;
+    /**
+     * Address book plugins
+     *
+     * @var IAddressBookProvider[]|null
+     */
+    private $addressBookPlugins = null;
 
-	/**
-	 * Calendar plugins
-	 *
-	 * @var array
-	 */
-	private $calendarPlugins = null;
+    /**
+     * Calendar plugins
+     *
+     * @var array
+     */
+    private $calendarPlugins = null;
 
-	/**
-	 * Contstruct a PluginManager
-	 *
-	 * @param ServerContainer $container server container for resolving plugin classes
-	 * @param IAppManager $appManager app manager to loading apps and their info
-	 */
-	public function __construct(ServerContainer $container, IAppManager $appManager) {
-		$this->container = $container;
-		$this->appManager = $appManager;
-	}
+    /**
+     * Contstruct a PluginManager
+     *
+     * @param ServerContainer $container server container for resolving plugin classes
+     * @param IAppManager $appManager app manager to loading apps and their info
+     */
+    public function __construct(ServerContainer $container, IAppManager $appManager) {
+        $this->container = $container;
+        $this->appManager = $appManager;
+    }
 
-	/**
-	 * Returns an array of app-registered plugins
-	 *
-	 * @return array
-	 */
-	public function getAppPlugins() {
-		if (null === $this->plugins) {
-			$this->populate();
-		}
-		return $this->plugins;
-	}
+    /**
+     * Returns an array of app-registered plugins
+     *
+     * @return array
+     */
+    public function getAppPlugins() {
+        if (null === $this->plugins) {
+            $this->populate();
+        }
+        return $this->plugins;
+    }
 
-	/**
-	 * Returns an array of app-registered collections
-	 *
-	 * @return array
-	 */
-	public function getAppCollections() {
-		if (null === $this->collections) {
-			$this->populate();
-		}
-		return $this->collections;
-	}
+    /**
+     * Returns an array of app-registered collections
+     *
+     * @return array
+     */
+    public function getAppCollections() {
+        if (null === $this->collections) {
+            $this->populate();
+        }
+        return $this->collections;
+    }
 
-	/**
-	 * @return IAddressBookProvider[]
-	 */
-	public function getAddressBookPlugins(): array {
-		if ($this->addressBookPlugins === null) {
-			$this->populate();
-		}
-		return $this->addressBookPlugins;
-	}
+    /**
+     * @return IAddressBookProvider[]
+     */
+    public function getAddressBookPlugins(): array {
+        if ($this->addressBookPlugins === null) {
+            $this->populate();
+        }
+        return $this->addressBookPlugins;
+    }
 
-	/**
-	 * Returns an array of app-registered calendar plugins
-	 *
-	 * @return array
-	 */
-	public function getCalendarPlugins():array {
-		if (null === $this->calendarPlugins) {
-			$this->populate();
-		}
-		return $this->calendarPlugins;
-	}
+    /**
+     * Returns an array of app-registered calendar plugins
+     *
+     * @return array
+     */
+    public function getCalendarPlugins():array {
+        if (null === $this->calendarPlugins) {
+            $this->populate();
+        }
+        return $this->calendarPlugins;
+    }
 
-	/**
-	 * Retrieve plugin and collection list and populate attributes
-	 */
-	private function populate() {
-		$this->plugins = [];
-		$this->addressBookPlugins = [];
-		$this->calendarPlugins = [];
-		$this->collections = [];
-		foreach ($this->appManager->getInstalledApps() as $app) {
-			// load plugins and collections from info.xml
-			$info = $this->appManager->getAppInfo($app);
-			if (!isset($info['types']) || !in_array('dav', $info['types'], true)) {
-				continue;
-			}
-			$this->loadSabrePluginsFromInfoXml($this->extractPluginList($info));
-			$this->loadSabreCollectionsFromInfoXml($this->extractCollectionList($info));
-			$this->loadSabreAddressBookPluginsFromInfoXml($this->extractAddressBookPluginList($info));
-			$this->loadSabreCalendarPluginsFromInfoXml($this->extractCalendarPluginList($info));
-		}
-	}
+    /**
+     * Retrieve plugin and collection list and populate attributes
+     */
+    private function populate() {
+        $this->plugins = [];
+        $this->addressBookPlugins = [];
+        $this->calendarPlugins = [];
+        $this->collections = [];
+        foreach ($this->appManager->getInstalledApps() as $app) {
+            // load plugins and collections from info.xml
+            $info = $this->appManager->getAppInfo($app);
+            if (!isset($info['types']) || !in_array('dav', $info['types'], true)) {
+                continue;
+            }
+            $this->loadSabrePluginsFromInfoXml($this->extractPluginList($info));
+            $this->loadSabreCollectionsFromInfoXml($this->extractCollectionList($info));
+            $this->loadSabreAddressBookPluginsFromInfoXml($this->extractAddressBookPluginList($info));
+            $this->loadSabreCalendarPluginsFromInfoXml($this->extractCalendarPluginList($info));
+        }
+    }
 
-	private function extractPluginList(array $array) {
-		if (isset($array['sabre']) && is_array($array['sabre'])) {
-			if (isset($array['sabre']['plugins']) && is_array($array['sabre']['plugins'])) {
-				if (isset($array['sabre']['plugins']['plugin'])) {
-					$items = $array['sabre']['plugins']['plugin'];
-					if (!is_array($items)) {
-						$items = [$items];
-					}
-					return $items;
-				}
-			}
-		}
-		return [];
-	}
+    private function extractPluginList(array $array) {
+        if (isset($array['sabre']) && is_array($array['sabre'])) {
+            if (isset($array['sabre']['plugins']) && is_array($array['sabre']['plugins'])) {
+                if (isset($array['sabre']['plugins']['plugin'])) {
+                    $items = $array['sabre']['plugins']['plugin'];
+                    if (!is_array($items)) {
+                        $items = [$items];
+                    }
+                    return $items;
+                }
+            }
+        }
+        return [];
+    }
 
-	private function extractCollectionList(array $array) {
-		if (isset($array['sabre']) && is_array($array['sabre'])) {
-			if (isset($array['sabre']['collections']) && is_array($array['sabre']['collections'])) {
-				if (isset($array['sabre']['collections']['collection'])) {
-					$items = $array['sabre']['collections']['collection'];
-					if (!is_array($items)) {
-						$items = [$items];
-					}
-					return $items;
-				}
-			}
-		}
-		return [];
-	}
+    private function extractCollectionList(array $array) {
+        if (isset($array['sabre']) && is_array($array['sabre'])) {
+            if (isset($array['sabre']['collections']) && is_array($array['sabre']['collections'])) {
+                if (isset($array['sabre']['collections']['collection'])) {
+                    $items = $array['sabre']['collections']['collection'];
+                    if (!is_array($items)) {
+                        $items = [$items];
+                    }
+                    return $items;
+                }
+            }
+        }
+        return [];
+    }
 
-	/**
-	 * @param array $array
-	 *
-	 * @return string[]
-	 */
-	private function extractAddressBookPluginList(array $array): array {
-		if (!isset($array['sabre']) || !is_array($array['sabre'])) {
-			return [];
-		}
-		if (!isset($array['sabre']['address-book-plugins']) || !is_array($array['sabre']['address-book-plugins'])) {
-			return [];
-		}
-		if (!isset($array['sabre']['address-book-plugins']['plugin'])) {
-			return [];
-		}
+    /**
+     * @param array $array
+     *
+     * @return string[]
+     */
+    private function extractAddressBookPluginList(array $array): array {
+        if (!isset($array['sabre']) || !is_array($array['sabre'])) {
+            return [];
+        }
+        if (!isset($array['sabre']['address-book-plugins']) || !is_array($array['sabre']['address-book-plugins'])) {
+            return [];
+        }
+        if (!isset($array['sabre']['address-book-plugins']['plugin'])) {
+            return [];
+        }
 
-		$items = $array['sabre']['address-book-plugins']['plugin'];
-		if (!is_array($items)) {
-			$items = [$items];
-		}
-		return $items;
-	}
+        $items = $array['sabre']['address-book-plugins']['plugin'];
+        if (!is_array($items)) {
+            $items = [$items];
+        }
+        return $items;
+    }
 
-	private function extractCalendarPluginList(array $array):array {
-		if (isset($array['sabre']) && is_array($array['sabre'])) {
-			if (isset($array['sabre']['calendar-plugins']) && is_array($array['sabre']['calendar-plugins'])) {
-				if (isset($array['sabre']['calendar-plugins']['plugin'])) {
-					$items = $array['sabre']['calendar-plugins']['plugin'];
-					if (!is_array($items)) {
-						$items = [$items];
-					}
-					return $items;
-				}
-			}
-		}
-		return [];
-	}
+    private function extractCalendarPluginList(array $array):array {
+        if (isset($array['sabre']) && is_array($array['sabre'])) {
+            if (isset($array['sabre']['calendar-plugins']) && is_array($array['sabre']['calendar-plugins'])) {
+                if (isset($array['sabre']['calendar-plugins']['plugin'])) {
+                    $items = $array['sabre']['calendar-plugins']['plugin'];
+                    if (!is_array($items)) {
+                        $items = [$items];
+                    }
+                    return $items;
+                }
+            }
+        }
+        return [];
+    }
 
-	private function loadSabrePluginsFromInfoXml(array $plugins) {
-		foreach ($plugins as $plugin) {
-			try {
-				$this->plugins[] = $this->container->query($plugin);
-			} catch (QueryException $e) {
-				if (class_exists($plugin)) {
-					$this->plugins[] = new $plugin();
-				} else {
-					throw new \Exception("Sabre plugin class '$plugin' is unknown and could not be loaded");
-				}
-			}
-		}
-	}
+    private function loadSabrePluginsFromInfoXml(array $plugins) {
+        foreach ($plugins as $plugin) {
+            try {
+                $this->plugins[] = $this->container->query($plugin);
+            } catch (QueryException $e) {
+                if (class_exists($plugin)) {
+                    $this->plugins[] = new $plugin();
+                } else {
+                    throw new \Exception("Sabre plugin class '$plugin' is unknown and could not be loaded");
+                }
+            }
+        }
+    }
 
-	private function loadSabreCollectionsFromInfoXml(array $collections) {
-		foreach ($collections as $collection) {
-			try {
-				$this->collections[] = $this->container->query($collection);
-			} catch (QueryException $e) {
-				if (class_exists($collection)) {
-					$this->collections[] = new $collection();
-				} else {
-					throw new \Exception("Sabre collection class '$collection' is unknown and could not be loaded");
-				}
-			}
-		}
-	}
+    private function loadSabreCollectionsFromInfoXml(array $collections) {
+        foreach ($collections as $collection) {
+            try {
+                $this->collections[] = $this->container->query($collection);
+            } catch (QueryException $e) {
+                if (class_exists($collection)) {
+                    $this->collections[] = new $collection();
+                } else {
+                    throw new \Exception("Sabre collection class '$collection' is unknown and could not be loaded");
+                }
+            }
+        }
+    }
 
-	private function createPluginInstance(string $className) {
-		try {
-			return $this->container->query($className);
-		} catch (QueryException $e) {
-			if (class_exists($className)) {
-				return new $className();
-			}
-		}
+    private function createPluginInstance(string $className) {
+        try {
+            return $this->container->query($className);
+        } catch (QueryException $e) {
+            if (class_exists($className)) {
+                return new $className();
+            }
+        }
 
-		throw new \Exception("Sabre plugin class '$className' is unknown and could not be loaded");
-	}
+        throw new \Exception("Sabre plugin class '$className' is unknown and could not be loaded");
+    }
 
-	/**
-	 * @param string[] $plugin
-	 */
-	private function loadSabreAddressBookPluginsFromInfoXml(array $plugins): void {
-		$providers = array_map(function(string $className): IAddressBookProvider {
-			$instance = $this->createPluginInstance($className);
-			if (!($instance instanceof IAddressBookProvider)) {
-				throw new \Exception("Sabre address book plugin class '$className' does not implement the \OCA\DAV\CardDAV\Integration\IAddressBookProvider interface");
-			}
-			return $instance;
-		}, $plugins);
-		foreach ($providers as $provider) {
-			$this->addressBookPlugins[] = $provider;
-		}
-	}
+    /**
+     * @param string[] $plugin
+     */
+    private function loadSabreAddressBookPluginsFromInfoXml(array $plugins): void {
+        $providers = array_map(function(string $className): IAddressBookProvider {
+            $instance = $this->createPluginInstance($className);
+            if (!($instance instanceof IAddressBookProvider)) {
+                throw new \Exception("Sabre address book plugin class '$className' does not implement the \OCA\DAV\CardDAV\Integration\IAddressBookProvider interface");
+            }
+            return $instance;
+        }, $plugins);
+        foreach ($providers as $provider) {
+            $this->addressBookPlugins[] = $provider;
+        }
+    }
 
-	private function loadSabreCalendarPluginsFromInfoXml(array $calendarPlugins):void {
-		foreach ($calendarPlugins as $calendarPlugin) {
-			try {
-				$instantiatedCalendarPlugin = $this->container->query($calendarPlugin);
-			} catch (QueryException $e) {
-				if (class_exists($calendarPlugin)) {
-					$instantiatedCalendarPlugin = new $calendarPlugin();
-				} else {
-					throw new \Exception("Sabre calendar-plugin class '$calendarPlugin' is unknown and could not be loaded");
-				}
-			}
+    private function loadSabreCalendarPluginsFromInfoXml(array $calendarPlugins):void {
+        foreach ($calendarPlugins as $calendarPlugin) {
+            try {
+                $instantiatedCalendarPlugin = $this->container->query($calendarPlugin);
+            } catch (QueryException $e) {
+                if (class_exists($calendarPlugin)) {
+                    $instantiatedCalendarPlugin = new $calendarPlugin();
+                } else {
+                    throw new \Exception("Sabre calendar-plugin class '$calendarPlugin' is unknown and could not be loaded");
+                }
+            }
 
-			if (!($instantiatedCalendarPlugin instanceof ICalendarProvider)) {
-				throw new \Exception("Sabre calendar-plugin class '$calendarPlugin' does not implement ICalendarProvider interface");
-			}
+            if (!($instantiatedCalendarPlugin instanceof ICalendarProvider)) {
+                throw new \Exception("Sabre calendar-plugin class '$calendarPlugin' does not implement ICalendarProvider interface");
+            }
 
-			$this->calendarPlugins[] = $instantiatedCalendarPlugin;
-		}
-	}
+            $this->calendarPlugins[] = $instantiatedCalendarPlugin;
+        }
+    }
 
 }

apps/dav/lib/RootCollection.php

Indentation +127 added lines, -127 removed lines

@@ -48,132 +48,132 @@
 
 class RootCollection extends SimpleCollection {
 
-	public function __construct() {
-		$config = \OC::$server->getConfig();
-		$l10n = \OC::$server->getL10N('dav');
-		$random = \OC::$server->getSecureRandom();
-		$logger = \OC::$server->getLogger();
-		$userManager = \OC::$server->getUserManager();
-		$userSession = \OC::$server->getUserSession();
-		$groupManager = \OC::$server->getGroupManager();
-		$shareManager = \OC::$server->getShareManager();
-		$db = \OC::$server->getDatabaseConnection();
-		$dispatcher = \OC::$server->getEventDispatcher();
-		$proxyMapper = \OC::$server->query(ProxyMapper::class);
-
-		$userPrincipalBackend = new Principal(
-			$userManager,
-			$groupManager,
-			$shareManager,
-			\OC::$server->getUserSession(),
-			\OC::$server->getAppManager(),
-			$proxyMapper,
-			\OC::$server->getConfig()
-		);
-		$groupPrincipalBackend = new GroupPrincipalBackend($groupManager, $userSession, $shareManager);
-		$calendarResourcePrincipalBackend = new ResourcePrincipalBackend($db, $userSession, $groupManager, $logger, $proxyMapper);
-		$calendarRoomPrincipalBackend = new RoomPrincipalBackend($db, $userSession, $groupManager, $logger, $proxyMapper);
-		// as soon as debug mode is enabled we allow listing of principals
-		$disableListing = !$config->getSystemValue('debug', false);
-
-		// setup the first level of the dav tree
-		$userPrincipals = new Collection($userPrincipalBackend, 'principals/users');
-		$userPrincipals->disableListing = $disableListing;
-		$groupPrincipals = new Collection($groupPrincipalBackend, 'principals/groups');
-		$groupPrincipals->disableListing = $disableListing;
-		$systemPrincipals = new Collection(new SystemPrincipalBackend(), 'principals/system');
-		$systemPrincipals->disableListing = $disableListing;
-		$calendarResourcePrincipals = new Collection($calendarResourcePrincipalBackend, 'principals/calendar-resources');
-		$calendarResourcePrincipals->disableListing = $disableListing;
-		$calendarRoomPrincipals = new Collection($calendarRoomPrincipalBackend, 'principals/calendar-rooms');
-		$calendarRoomPrincipals->disableListing = $disableListing;
-
-
-		$filesCollection = new Files\RootCollection($userPrincipalBackend, 'principals/users');
-		$filesCollection->disableListing = $disableListing;
-		$caldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher);
-		$userCalendarRoot = new CalendarRoot($userPrincipalBackend, $caldavBackend, 'principals/users');
-		$userCalendarRoot->disableListing = $disableListing;
-
-		$resourceCalendarCaldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher);
-		$resourceCalendarRoot = new CalendarRoot($calendarResourcePrincipalBackend, $caldavBackend, 'principals/calendar-resources');
-		$resourceCalendarRoot->disableListing = $disableListing;
-		$roomCalendarCaldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher);
-		$roomCalendarRoot = new CalendarRoot($calendarRoomPrincipalBackend, $roomCalendarCaldavBackend, 'principals/calendar-rooms');
-		$roomCalendarRoot->disableListing = $disableListing;
-
-		$publicCalendarRoot = new PublicCalendarRoot($caldavBackend, $l10n, $config);
-		$publicCalendarRoot->disableListing = $disableListing;
-
-		$systemTagCollection = new SystemTag\SystemTagsByIdCollection(
-			\OC::$server->getSystemTagManager(),
-			\OC::$server->getUserSession(),
-			$groupManager
-		);
-		$systemTagRelationsCollection = new SystemTag\SystemTagsRelationsCollection(
-			\OC::$server->getSystemTagManager(),
-			\OC::$server->getSystemTagObjectMapper(),
-			\OC::$server->getUserSession(),
-			$groupManager,
-			\OC::$server->getEventDispatcher()
-		);
-		$commentsCollection = new Comments\RootCollection(
-			\OC::$server->getCommentsManager(),
-			$userManager,
-			\OC::$server->getUserSession(),
-			\OC::$server->getEventDispatcher(),
-			\OC::$server->getLogger()
-		);
-
-		$pluginManager = new PluginManager(\OC::$server, \OC::$server->query(IAppManager::class));
-		$usersCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher);
-		$usersAddressBookRoot = new AddressBookRoot($userPrincipalBackend, $usersCardDavBackend, $pluginManager, 'principals/users');
-		$usersAddressBookRoot->disableListing = $disableListing;
-
-		$systemCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher);
-		$systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, $pluginManager, 'principals/system');
-		$systemAddressBookRoot->disableListing = $disableListing;
-
-		$uploadCollection = new Upload\RootCollection(
-			$userPrincipalBackend,
-			'principals/users',
-			\OC::$server->query(CleanupService::class));
-		$uploadCollection->disableListing = $disableListing;
-
-		$avatarCollection = new Avatars\RootCollection($userPrincipalBackend, 'principals/users');
-		$avatarCollection->disableListing = $disableListing;
-
-		$appleProvisioning = new AppleProvisioningNode(
-			\OC::$server->query(ITimeFactory::class));
-
-		$children = [
-				new SimpleCollection('principals', [
-						$userPrincipals,
-						$groupPrincipals,
-						$systemPrincipals,
-						$calendarResourcePrincipals,
-						$calendarRoomPrincipals]),
-				$filesCollection,
-				$userCalendarRoot,
-				new SimpleCollection('system-calendars', [
-					$resourceCalendarRoot,
-					$roomCalendarRoot,
-				]),
-				$publicCalendarRoot,
-				new SimpleCollection('addressbooks', [
-						$usersAddressBookRoot,
-						$systemAddressBookRoot]),
-				$systemTagCollection,
-				$systemTagRelationsCollection,
-				$commentsCollection,
-				$uploadCollection,
-				$avatarCollection,
-				new SimpleCollection('provisioning', [
-					$appleProvisioning
-				])
-		];
-
-		parent::__construct('root', $children);
-	}
+    public function __construct() {
+        $config = \OC::$server->getConfig();
+        $l10n = \OC::$server->getL10N('dav');
+        $random = \OC::$server->getSecureRandom();
+        $logger = \OC::$server->getLogger();
+        $userManager = \OC::$server->getUserManager();
+        $userSession = \OC::$server->getUserSession();
+        $groupManager = \OC::$server->getGroupManager();
+        $shareManager = \OC::$server->getShareManager();
+        $db = \OC::$server->getDatabaseConnection();
+        $dispatcher = \OC::$server->getEventDispatcher();
+        $proxyMapper = \OC::$server->query(ProxyMapper::class);
+
+        $userPrincipalBackend = new Principal(
+            $userManager,
+            $groupManager,
+            $shareManager,
+            \OC::$server->getUserSession(),
+            \OC::$server->getAppManager(),
+            $proxyMapper,
+            \OC::$server->getConfig()
+        );
+        $groupPrincipalBackend = new GroupPrincipalBackend($groupManager, $userSession, $shareManager);
+        $calendarResourcePrincipalBackend = new ResourcePrincipalBackend($db, $userSession, $groupManager, $logger, $proxyMapper);
+        $calendarRoomPrincipalBackend = new RoomPrincipalBackend($db, $userSession, $groupManager, $logger, $proxyMapper);
+        // as soon as debug mode is enabled we allow listing of principals
+        $disableListing = !$config->getSystemValue('debug', false);
+
+        // setup the first level of the dav tree
+        $userPrincipals = new Collection($userPrincipalBackend, 'principals/users');
+        $userPrincipals->disableListing = $disableListing;
+        $groupPrincipals = new Collection($groupPrincipalBackend, 'principals/groups');
+        $groupPrincipals->disableListing = $disableListing;
+        $systemPrincipals = new Collection(new SystemPrincipalBackend(), 'principals/system');
+        $systemPrincipals->disableListing = $disableListing;
+        $calendarResourcePrincipals = new Collection($calendarResourcePrincipalBackend, 'principals/calendar-resources');
+        $calendarResourcePrincipals->disableListing = $disableListing;
+        $calendarRoomPrincipals = new Collection($calendarRoomPrincipalBackend, 'principals/calendar-rooms');
+        $calendarRoomPrincipals->disableListing = $disableListing;
+
+
+        $filesCollection = new Files\RootCollection($userPrincipalBackend, 'principals/users');
+        $filesCollection->disableListing = $disableListing;
+        $caldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher);
+        $userCalendarRoot = new CalendarRoot($userPrincipalBackend, $caldavBackend, 'principals/users');
+        $userCalendarRoot->disableListing = $disableListing;
+
+        $resourceCalendarCaldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher);
+        $resourceCalendarRoot = new CalendarRoot($calendarResourcePrincipalBackend, $caldavBackend, 'principals/calendar-resources');
+        $resourceCalendarRoot->disableListing = $disableListing;
+        $roomCalendarCaldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher);
+        $roomCalendarRoot = new CalendarRoot($calendarRoomPrincipalBackend, $roomCalendarCaldavBackend, 'principals/calendar-rooms');
+        $roomCalendarRoot->disableListing = $disableListing;
+
+        $publicCalendarRoot = new PublicCalendarRoot($caldavBackend, $l10n, $config);
+        $publicCalendarRoot->disableListing = $disableListing;
+
+        $systemTagCollection = new SystemTag\SystemTagsByIdCollection(
+            \OC::$server->getSystemTagManager(),
+            \OC::$server->getUserSession(),
+            $groupManager
+        );
+        $systemTagRelationsCollection = new SystemTag\SystemTagsRelationsCollection(
+            \OC::$server->getSystemTagManager(),
+            \OC::$server->getSystemTagObjectMapper(),
+            \OC::$server->getUserSession(),
+            $groupManager,
+            \OC::$server->getEventDispatcher()
+        );
+        $commentsCollection = new Comments\RootCollection(
+            \OC::$server->getCommentsManager(),
+            $userManager,
+            \OC::$server->getUserSession(),
+            \OC::$server->getEventDispatcher(),
+            \OC::$server->getLogger()
+        );
+
+        $pluginManager = new PluginManager(\OC::$server, \OC::$server->query(IAppManager::class));
+        $usersCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher);
+        $usersAddressBookRoot = new AddressBookRoot($userPrincipalBackend, $usersCardDavBackend, $pluginManager, 'principals/users');
+        $usersAddressBookRoot->disableListing = $disableListing;
+
+        $systemCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher);
+        $systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, $pluginManager, 'principals/system');
+        $systemAddressBookRoot->disableListing = $disableListing;
+
+        $uploadCollection = new Upload\RootCollection(
+            $userPrincipalBackend,
+            'principals/users',
+            \OC::$server->query(CleanupService::class));
+        $uploadCollection->disableListing = $disableListing;
+
+        $avatarCollection = new Avatars\RootCollection($userPrincipalBackend, 'principals/users');
+        $avatarCollection->disableListing = $disableListing;
+
+        $appleProvisioning = new AppleProvisioningNode(
+            \OC::$server->query(ITimeFactory::class));
+
+        $children = [
+                new SimpleCollection('principals', [
+                        $userPrincipals,
+                        $groupPrincipals,
+                        $systemPrincipals,
+                        $calendarResourcePrincipals,
+                        $calendarRoomPrincipals]),
+                $filesCollection,
+                $userCalendarRoot,
+                new SimpleCollection('system-calendars', [
+                    $resourceCalendarRoot,
+                    $roomCalendarRoot,
+                ]),
+                $publicCalendarRoot,
+                new SimpleCollection('addressbooks', [
+                        $usersAddressBookRoot,
+                        $systemAddressBookRoot]),
+                $systemTagCollection,
+                $systemTagRelationsCollection,
+                $commentsCollection,
+                $uploadCollection,
+                $avatarCollection,
+                new SimpleCollection('provisioning', [
+                    $appleProvisioning
+                ])
+        ];
+
+        parent::__construct('root', $children);
+    }
 
 }