Inspection of "Merge pull request #6835 from nextcloud/dav-plugin..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( f6f7b5...3a3e6c )

by Lukas

created 2017-10-19 09:09 UTC

Status

Indentation +185 added lines, -185 removed lines patch added patch discarded remove patch

@@ -60,214 +60,214 @@
 block discarded – undo
 
 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();
-		$mailer = \OC::$server->getMailer();
-		$dispatcher = \OC::$server->getEventDispatcher();
-		$timezone = new TimeFactory();
+    public function __construct(IRequest $request, $baseUri) {
+        $this->request = $request;
+        $this->baseUri = $baseUri;
+        $logger = \OC::$server->getLogger();
+        $mailer = \OC::$server->getMailer();
+        $dispatcher = \OC::$server->getEventDispatcher();
+        $timezone = new TimeFactory();
 
-		$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());
-		$this->server->addPlugin(new IMipPlugin($mailer, $logger, $timezone));
-		$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());
+        $this->server->addPlugin(new IMipPlugin($mailer, $logger, $timezone));
+        $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 CopyEtagHeaderPlugin());
 
-		// 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/',
-			'/Microsoft Office OneNote 2013/',
-			'/^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/',
+            '/Microsoft Office OneNote 2013/',
+            '/^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 \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
+                    )));
+                }
+            }
 
-			// 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();
+    }
 }

Please login to merge, or discard this patch.

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -115,7 +115,7 @@  discard block
 block discarded – undo
 		$authPlugin->addBackend($authBackend);
 
 		// debugging
-		if(\OC::$server->getConfig()->getSystemValue('debug', false)) {
+		if (\OC::$server->getConfig()->getSystemValue('debug', false)) {
 			$this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
 		} else {
 			$this->server->addPlugin(new DummyGetResponsePlugin());
@@ -171,10 +171,10 @@  discard block
 block discarded – undo
 
 		// 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([
+		if ($request->isUserAgent([
 			'/WebDAVFS/',
 			'/Microsoft Office OneNote 2013/',
-			'/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
+			'/^Microsoft-WebDAV/', // Microsoft-WebDAV-MiniRedir/6.1.7601
 		])) {
 			$this->server->addPlugin(new FakeLockerPlugin());
 		}
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
 		}
 
 		// wait with registering these until auth is handled and the filesystem is setup
-		$this->server->on('beforeMethod', function () use ($root) {
+		$this->server->on('beforeMethod', function() use ($root) {
 			// custom properties plugin must be the last one
 			$userSession = \OC::$server->getUserSession();
 			$user = $userSession->getUser();

Please login to merge, or discard this patch.

apps/dav/lib/AppInfo/PluginManager.php 1 patch

Indentation +125 added lines, -125 removed lines patch added patch discarded remove patch

@@ -30,141 +30,141 @@
 block discarded – undo
  */
 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;
 
-	/**
-	 * 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;
+    }
 
-	/**
-	 * Retrieve plugin and collection list and populate attributes
-	 */
-	private function populate() {
-		$this->plugins = [];
-		$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;
-			}
-			// FIXME: switch to public API once available
-			// load app to make sure its classes are available
-			\OC_App::loadApp($app);
-			$this->loadSabrePluginsFromInfoXml($this->extractPluginList($info));
-			$this->loadSabreCollectionsFromInfoXml($this->extractCollectionList($info));
-		}
-	}
+    /**
+     * Retrieve plugin and collection list and populate attributes
+     */
+    private function populate() {
+        $this->plugins = [];
+        $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;
+            }
+            // FIXME: switch to public API once available
+            // load app to make sure its classes are available
+            \OC_App::loadApp($app);
+            $this->loadSabrePluginsFromInfoXml($this->extractPluginList($info));
+            $this->loadSabreCollectionsFromInfoXml($this->extractCollectionList($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 [];
+    }
 
-	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");
+                }
+            }
+        }
+    }
 
 }

Please login to merge, or discard this patch.

		@@ -115,7 +115,7 @@ discard block
		block discarded – undo
115	115	$authPlugin->addBackend($authBackend);
116	116
117	117	// debugging
118		- if(\OC::$server->getConfig()->getSystemValue('debug', false)) {
	118	+ if (\OC::$server->getConfig()->getSystemValue('debug', false)) {
119	119	$this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
120	120	} else {
121	121	$this->server->addPlugin(new DummyGetResponsePlugin());
		@@ -171,10 +171,10 @@ discard block
		block discarded – undo
171	171
172	172	// Some WebDAV clients do require Class 2 WebDAV support (locking), since
173	173	// we do not provide locking we emulate it using a fake locking plugin.
174		- if($request->isUserAgent([
	174	+ if ($request->isUserAgent([
175	175	'/WebDAVFS/',
176	176	'/Microsoft Office OneNote 2013/',
177		- '/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
	177	+ '/^Microsoft-WebDAV/', // Microsoft-WebDAV-MiniRedir/6.1.7601
178	178	])) {
179	179	$this->server->addPlugin(new FakeLockerPlugin());
180	180	}
		@@ -184,7 +184,7 @@ discard block
		block discarded – undo
184	184	}
185	185
186	186	// wait with registering these until auth is handled and the filesystem is setup
187		- $this->server->on('beforeMethod', function () use ($root) {
	187	+ $this->server->on('beforeMethod', function() use ($root) {
188	188	// custom properties plugin must be the last one
189	189	$userSession = \OC::$server->getUserSession();
190	190	$user = $userSession->getUser();

		@@ -60,214 +60,214 @@
		block discarded – undo
60	60
61	61	class Server {
62	62
63		- /** @var IRequest */
64		- private $request;
	63	+ /** @var IRequest */
	64	+ private $request;
65	65
66		- /** @var string */
67		- private $baseUri;
	66	+ /** @var string */
	67	+ private $baseUri;
68	68
69		- /** @var Connector\Sabre\Server */
70		- private $server;
	69	+ /** @var Connector\Sabre\Server */
	70	+ private $server;
71	71
72		- public function __construct(IRequest $request, $baseUri) {
73		- $this->request = $request;
74		- $this->baseUri = $baseUri;
75		- $logger = \OC::$server->getLogger();
76		- $mailer = \OC::$server->getMailer();
77		- $dispatcher = \OC::$server->getEventDispatcher();
78		- $timezone = new TimeFactory();
	72	+ public function __construct(IRequest $request, $baseUri) {
	73	+ $this->request = $request;
	74	+ $this->baseUri = $baseUri;
	75	+ $logger = \OC::$server->getLogger();
	76	+ $mailer = \OC::$server->getMailer();
	77	+ $dispatcher = \OC::$server->getEventDispatcher();
	78	+ $timezone = new TimeFactory();
79	79
80		- $root = new RootCollection();
81		- $this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
	80	+ $root = new RootCollection();
	81	+ $this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
82	82
83		- // Add maintenance plugin
84		- $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin(\OC::$server->getConfig()));
	83	+ // Add maintenance plugin
	84	+ $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin(\OC::$server->getConfig()));
85	85
86		- // Backends
87		- $authBackend = new Auth(
88		- \OC::$server->getSession(),
89		- \OC::$server->getUserSession(),
90		- \OC::$server->getRequest(),
91		- \OC::$server->getTwoFactorAuthManager(),
92		- \OC::$server->getBruteForceThrottler()
93		- );
	86	+ // Backends
	87	+ $authBackend = new Auth(
	88	+ \OC::$server->getSession(),
	89	+ \OC::$server->getUserSession(),
	90	+ \OC::$server->getRequest(),
	91	+ \OC::$server->getTwoFactorAuthManager(),
	92	+ \OC::$server->getBruteForceThrottler()
	93	+ );
94	94
95		- // Set URL explicitly due to reverse-proxy situations
96		- $this->server->httpRequest->setUrl($this->request->getRequestUri());
97		- $this->server->setBaseUri($this->baseUri);
	95	+ // Set URL explicitly due to reverse-proxy situations
	96	+ $this->server->httpRequest->setUrl($this->request->getRequestUri());
	97	+ $this->server->setBaseUri($this->baseUri);
98	98
99		- $this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
100		- $authPlugin = new Plugin();
101		- $authPlugin->addBackend(new PublicAuth());
102		- $this->server->addPlugin($authPlugin);
	99	+ $this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
	100	+ $authPlugin = new Plugin();
	101	+ $authPlugin->addBackend(new PublicAuth());
	102	+ $this->server->addPlugin($authPlugin);
103	103
104		- // allow setup of additional auth backends
105		- $event = new SabrePluginEvent($this->server);
106		- $dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
	104	+ // allow setup of additional auth backends
	105	+ $event = new SabrePluginEvent($this->server);
	106	+ $dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
107	107
108		- $bearerAuthBackend = new BearerAuth(
109		- \OC::$server->getUserSession(),
110		- \OC::$server->getSession(),
111		- \OC::$server->getRequest()
112		- );
113		- $authPlugin->addBackend($bearerAuthBackend);
114		- // because we are throwing exceptions this plugin has to be the last one
115		- $authPlugin->addBackend($authBackend);
	108	+ $bearerAuthBackend = new BearerAuth(
	109	+ \OC::$server->getUserSession(),
	110	+ \OC::$server->getSession(),
	111	+ \OC::$server->getRequest()
	112	+ );
	113	+ $authPlugin->addBackend($bearerAuthBackend);
	114	+ // because we are throwing exceptions this plugin has to be the last one
	115	+ $authPlugin->addBackend($authBackend);
116	116
117		- // debugging
118		- if(\OC::$server->getConfig()->getSystemValue('debug', false)) {
119		- $this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
120		- } else {
121		- $this->server->addPlugin(new DummyGetResponsePlugin());
122		- }
	117	+ // debugging
	118	+ if(\OC::$server->getConfig()->getSystemValue('debug', false)) {
	119	+ $this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
	120	+ } else {
	121	+ $this->server->addPlugin(new DummyGetResponsePlugin());
	122	+ }
123	123
124		- $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $logger));
125		- $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
126		- $this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
	124	+ $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $logger));
	125	+ $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
	126	+ $this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
127	127
128		- // acl
129		- $acl = new DavAclPlugin();
130		- $acl->principalCollectionSet = [
131		- 'principals/users', 'principals/groups'
132		- ];
133		- $acl->defaultUsernamePath = 'principals/users';
134		- $this->server->addPlugin($acl);
	128	+ // acl
	129	+ $acl = new DavAclPlugin();
	130	+ $acl->principalCollectionSet = [
	131	+ 'principals/users', 'principals/groups'
	132	+ ];
	133	+ $acl->defaultUsernamePath = 'principals/users';
	134	+ $this->server->addPlugin($acl);
135	135
136		- // calendar plugins
137		- $this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
138		- $this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
139		- $this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin());
140		- $this->server->addPlugin(new IMipPlugin($mailer, $logger, $timezone));
141		- $this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
142		- $this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
143		- $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
144		- $this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
145		- \OC::$server->getConfig(),
146		- \OC::$server->getURLGenerator()
147		- ));
	136	+ // calendar plugins
	137	+ $this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
	138	+ $this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
	139	+ $this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin());
	140	+ $this->server->addPlugin(new IMipPlugin($mailer, $logger, $timezone));
	141	+ $this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
	142	+ $this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
	143	+ $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
	144	+ $this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
	145	+ \OC::$server->getConfig(),
	146	+ \OC::$server->getURLGenerator()
	147	+ ));
148	148
149		- // addressbook plugins
150		- $this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
151		- $this->server->addPlugin(new VCFExportPlugin());
152		- $this->server->addPlugin(new ImageExportPlugin(new PhotoCache(\OC::$server->getAppDataDir('dav-photocache'))));
	149	+ // addressbook plugins
	150	+ $this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
	151	+ $this->server->addPlugin(new VCFExportPlugin());
	152	+ $this->server->addPlugin(new ImageExportPlugin(new PhotoCache(\OC::$server->getAppDataDir('dav-photocache'))));
153	153
154		- // system tags plugins
155		- $this->server->addPlugin(new SystemTagPlugin(
156		- \OC::$server->getSystemTagManager(),
157		- \OC::$server->getGroupManager(),
158		- \OC::$server->getUserSession()
159		- ));
	154	+ // system tags plugins
	155	+ $this->server->addPlugin(new SystemTagPlugin(
	156	+ \OC::$server->getSystemTagManager(),
	157	+ \OC::$server->getGroupManager(),
	158	+ \OC::$server->getUserSession()
	159	+ ));
160	160
161		- // comments plugin
162		- $this->server->addPlugin(new CommentsPlugin(
163		- \OC::$server->getCommentsManager(),
164		- \OC::$server->getUserSession()
165		- ));
	161	+ // comments plugin
	162	+ $this->server->addPlugin(new CommentsPlugin(
	163	+ \OC::$server->getCommentsManager(),
	164	+ \OC::$server->getUserSession()
	165	+ ));
166	166
167		- $this->server->addPlugin(new CopyEtagHeaderPlugin());
	167	+ $this->server->addPlugin(new CopyEtagHeaderPlugin());
168	168
169		- // allow setup of additional plugins
170		- $dispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
	169	+ // allow setup of additional plugins
	170	+ $dispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
171	171
172		- // Some WebDAV clients do require Class 2 WebDAV support (locking), since
173		- // we do not provide locking we emulate it using a fake locking plugin.
174		- if($request->isUserAgent([
175		- '/WebDAVFS/',
176		- '/Microsoft Office OneNote 2013/',
177		- '/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
178		- ])) {
179		- $this->server->addPlugin(new FakeLockerPlugin());
180		- }
	172	+ // Some WebDAV clients do require Class 2 WebDAV support (locking), since
	173	+ // we do not provide locking we emulate it using a fake locking plugin.
	174	+ if($request->isUserAgent([
	175	+ '/WebDAVFS/',
	176	+ '/Microsoft Office OneNote 2013/',
	177	+ '/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
	178	+ ])) {
	179	+ $this->server->addPlugin(new FakeLockerPlugin());
	180	+ }
181	181
182		- if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
183		- $this->server->addPlugin(new BrowserErrorPagePlugin());
184		- }
	182	+ if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
	183	+ $this->server->addPlugin(new BrowserErrorPagePlugin());
	184	+ }
185	185
186		- // wait with registering these until auth is handled and the filesystem is setup
187		- $this->server->on('beforeMethod', function () use ($root) {
188		- // custom properties plugin must be the last one
189		- $userSession = \OC::$server->getUserSession();
190		- $user = $userSession->getUser();
191		- if ($user !== null) {
192		- $view = \OC\Files\Filesystem::getView();
193		- $this->server->addPlugin(
194		- new FilesPlugin(
195		- $this->server->tree,
196		- \OC::$server->getConfig(),
197		- $this->request,
198		- \OC::$server->getPreviewManager(),
199		- false,
200		- !\OC::$server->getConfig()->getSystemValue('debug', false)
201		- )
202		- );
	186	+ // wait with registering these until auth is handled and the filesystem is setup
	187	+ $this->server->on('beforeMethod', function () use ($root) {
	188	+ // custom properties plugin must be the last one
	189	+ $userSession = \OC::$server->getUserSession();
	190	+ $user = $userSession->getUser();
	191	+ if ($user !== null) {
	192	+ $view = \OC\Files\Filesystem::getView();
	193	+ $this->server->addPlugin(
	194	+ new FilesPlugin(
	195	+ $this->server->tree,
	196	+ \OC::$server->getConfig(),
	197	+ $this->request,
	198	+ \OC::$server->getPreviewManager(),
	199	+ false,
	200	+ !\OC::$server->getConfig()->getSystemValue('debug', false)
	201	+ )
	202	+ );
203	203
204		- $this->server->addPlugin(
205		- new \Sabre\DAV\PropertyStorage\Plugin(
206		- new CustomPropertiesBackend(
207		- $this->server->tree,
208		- \OC::$server->getDatabaseConnection(),
209		- \OC::$server->getUserSession()->getUser()
210		- )
211		- )
212		- );
213		- if ($view !== null) {
214		- $this->server->addPlugin(
215		- new QuotaPlugin($view, false));
216		- }
217		- $this->server->addPlugin(
218		- new TagsPlugin(
219		- $this->server->tree, \OC::$server->getTagManager()
220		- )
221		- );
222		- // TODO: switch to LazyUserFolder
223		- $userFolder = \OC::$server->getUserFolder();
224		- $this->server->addPlugin(new SharesPlugin(
225		- $this->server->tree,
226		- $userSession,
227		- $userFolder,
228		- \OC::$server->getShareManager()
229		- ));
230		- $this->server->addPlugin(new CommentPropertiesPlugin(
231		- \OC::$server->getCommentsManager(),
232		- $userSession
233		- ));
234		- $this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
235		- if ($view !== null) {
236		- $this->server->addPlugin(new FilesReportPlugin(
237		- $this->server->tree,
238		- $view,
239		- \OC::$server->getSystemTagManager(),
240		- \OC::$server->getSystemTagObjectMapper(),
241		- \OC::$server->getTagManager(),
242		- $userSession,
243		- \OC::$server->getGroupManager(),
244		- $userFolder
245		- ));
246		- $this->server->addPlugin(new SearchPlugin(new \OCA\DAV\Files\FileSearchBackend(
247		- $this->server->tree,
248		- $user,
249		- \OC::$server->getRootFolder(),
250		- \OC::$server->getShareManager(),
251		- $view
252		- )));
253		- }
254		- }
	204	+ $this->server->addPlugin(
	205	+ new \Sabre\DAV\PropertyStorage\Plugin(
	206	+ new CustomPropertiesBackend(
	207	+ $this->server->tree,
	208	+ \OC::$server->getDatabaseConnection(),
	209	+ \OC::$server->getUserSession()->getUser()
	210	+ )
	211	+ )
	212	+ );
	213	+ if ($view !== null) {
	214	+ $this->server->addPlugin(
	215	+ new QuotaPlugin($view, false));
	216	+ }
	217	+ $this->server->addPlugin(
	218	+ new TagsPlugin(
	219	+ $this->server->tree, \OC::$server->getTagManager()
	220	+ )
	221	+ );
	222	+ // TODO: switch to LazyUserFolder
	223	+ $userFolder = \OC::$server->getUserFolder();
	224	+ $this->server->addPlugin(new SharesPlugin(
	225	+ $this->server->tree,
	226	+ $userSession,
	227	+ $userFolder,
	228	+ \OC::$server->getShareManager()
	229	+ ));
	230	+ $this->server->addPlugin(new CommentPropertiesPlugin(
	231	+ \OC::$server->getCommentsManager(),
	232	+ $userSession
	233	+ ));
	234	+ $this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
	235	+ if ($view !== null) {
	236	+ $this->server->addPlugin(new FilesReportPlugin(
	237	+ $this->server->tree,
	238	+ $view,
	239	+ \OC::$server->getSystemTagManager(),
	240	+ \OC::$server->getSystemTagObjectMapper(),
	241	+ \OC::$server->getTagManager(),
	242	+ $userSession,
	243	+ \OC::$server->getGroupManager(),
	244	+ $userFolder
	245	+ ));
	246	+ $this->server->addPlugin(new SearchPlugin(new \OCA\DAV\Files\FileSearchBackend(
	247	+ $this->server->tree,
	248	+ $user,
	249	+ \OC::$server->getRootFolder(),
	250	+ \OC::$server->getShareManager(),
	251	+ $view
	252	+ )));
	253	+ }
	254	+ }
255	255
256		- // register plugins from apps
257		- $pluginManager = new PluginManager(
258		- \OC::$server,
259		- \OC::$server->getAppManager()
260		- );
261		- foreach ($pluginManager->getAppPlugins() as $appPlugin) {
262		- $this->server->addPlugin($appPlugin);
263		- }
264		- foreach ($pluginManager->getAppCollections() as $appCollection) {
265		- $root->addChild($appCollection);
266		- }
267		- });
268		- }
	256	+ // register plugins from apps
	257	+ $pluginManager = new PluginManager(
	258	+ \OC::$server,
	259	+ \OC::$server->getAppManager()
	260	+ );
	261	+ foreach ($pluginManager->getAppPlugins() as $appPlugin) {
	262	+ $this->server->addPlugin($appPlugin);
	263	+ }
	264	+ foreach ($pluginManager->getAppCollections() as $appCollection) {
	265	+ $root->addChild($appCollection);
	266	+ }
	267	+ });
	268	+ }
269	269
270		- public function exec() {
271		- $this->server->exec();
272		- }
	270	+ public function exec() {
	271	+ $this->server->exec();
	272	+ }
273	273	}

		@@ -30,141 +30,141 @@
		block discarded – undo
30	30	*/
31	31	class PluginManager {
32	32
33		- /**
34		- * @var ServerContainer
35		- */
36		- private $container;
	33	+ /**
	34	+ * @var ServerContainer
	35	+ */
	36	+ private $container;
37	37
38		- /**
39		- * @var IAppManager
40		- */
41		- private $appManager;
	38	+ /**
	39	+ * @var IAppManager
	40	+ */
	41	+ private $appManager;
42	42
43		- /**
44		- * App plugins
45		- *
46		- * @var array
47		- */
48		- private $plugins = null;
	43	+ /**
	44	+ * App plugins
	45	+ *
	46	+ * @var array
	47	+ */
	48	+ private $plugins = null;
49	49
50		- /**
51		- * App collections
52		- *
53		- * @var array
54		- */
55		- private $collections = null;
	50	+ /**
	51	+ * App collections
	52	+ *
	53	+ * @var array
	54	+ */
	55	+ private $collections = null;
56	56
57		- /**
58		- * Contstruct a PluginManager
59		- *
60		- * @param ServerContainer $container server container for resolving plugin classes
61		- * @param IAppManager $appManager app manager to loading apps and their info
62		- */
63		- public function __construct(ServerContainer $container, IAppManager $appManager) {
64		- $this->container = $container;
65		- $this->appManager = $appManager;
66		- }
	57	+ /**
	58	+ * Contstruct a PluginManager
	59	+ *
	60	+ * @param ServerContainer $container server container for resolving plugin classes
	61	+ * @param IAppManager $appManager app manager to loading apps and their info
	62	+ */
	63	+ public function __construct(ServerContainer $container, IAppManager $appManager) {
	64	+ $this->container = $container;
	65	+ $this->appManager = $appManager;
	66	+ }
67	67
68		- /**
69		- * Returns an array of app-registered plugins
70		- *
71		- * @return array
72		- */
73		- public function getAppPlugins() {
74		- if (null === $this->plugins) {
75		- $this->populate();
76		- }
77		- return $this->plugins;
78		- }
	68	+ /**
	69	+ * Returns an array of app-registered plugins
	70	+ *
	71	+ * @return array
	72	+ */
	73	+ public function getAppPlugins() {
	74	+ if (null === $this->plugins) {
	75	+ $this->populate();
	76	+ }
	77	+ return $this->plugins;
	78	+ }
79	79
80		- /**
81		- * Returns an array of app-registered collections
82		- *
83		- * @return array
84		- */
85		- public function getAppCollections() {
86		- if (null === $this->collections) {
87		- $this->populate();
88		- }
89		- return $this->collections;
90		- }
	80	+ /**
	81	+ * Returns an array of app-registered collections
	82	+ *
	83	+ * @return array
	84	+ */
	85	+ public function getAppCollections() {
	86	+ if (null === $this->collections) {
	87	+ $this->populate();
	88	+ }
	89	+ return $this->collections;
	90	+ }
91	91
92		- /**
93		- * Retrieve plugin and collection list and populate attributes
94		- */
95		- private function populate() {
96		- $this->plugins = [];
97		- $this->collections = [];
98		- foreach ($this->appManager->getInstalledApps() as $app) {
99		- // load plugins and collections from info.xml
100		- $info = $this->appManager->getAppInfo($app);
101		- if (!isset($info['types']) \|\| !in_array('dav', $info['types'], true)) {
102		- continue;
103		- }
104		- // FIXME: switch to public API once available
105		- // load app to make sure its classes are available
106		- \OC_App::loadApp($app);
107		- $this->loadSabrePluginsFromInfoXml($this->extractPluginList($info));
108		- $this->loadSabreCollectionsFromInfoXml($this->extractCollectionList($info));
109		- }
110		- }
	92	+ /**
	93	+ * Retrieve plugin and collection list and populate attributes
	94	+ */
	95	+ private function populate() {
	96	+ $this->plugins = [];
	97	+ $this->collections = [];
	98	+ foreach ($this->appManager->getInstalledApps() as $app) {
	99	+ // load plugins and collections from info.xml
	100	+ $info = $this->appManager->getAppInfo($app);
	101	+ if (!isset($info['types']) \|\| !in_array('dav', $info['types'], true)) {
	102	+ continue;
	103	+ }
	104	+ // FIXME: switch to public API once available
	105	+ // load app to make sure its classes are available
	106	+ \OC_App::loadApp($app);
	107	+ $this->loadSabrePluginsFromInfoXml($this->extractPluginList($info));
	108	+ $this->loadSabreCollectionsFromInfoXml($this->extractCollectionList($info));
	109	+ }
	110	+ }
111	111
112		- private function extractPluginList(array $array) {
113		- if (isset($array['sabre']) && is_array($array['sabre'])) {
114		- if (isset($array['sabre']['plugins']) && is_array($array['sabre']['plugins'])) {
115		- if (isset($array['sabre']['plugins']['plugin'])) {
116		- $items = $array['sabre']['plugins']['plugin'];
117		- if (!is_array($items)) {
118		- $items = [$items];
119		- }
120		- return $items;
121		- }
122		- }
123		- }
124		- return [];
125		- }
	112	+ private function extractPluginList(array $array) {
	113	+ if (isset($array['sabre']) && is_array($array['sabre'])) {
	114	+ if (isset($array['sabre']['plugins']) && is_array($array['sabre']['plugins'])) {
	115	+ if (isset($array['sabre']['plugins']['plugin'])) {
	116	+ $items = $array['sabre']['plugins']['plugin'];
	117	+ if (!is_array($items)) {
	118	+ $items = [$items];
	119	+ }
	120	+ return $items;
	121	+ }
	122	+ }
	123	+ }
	124	+ return [];
	125	+ }
126	126
127		- private function extractCollectionList(array $array) {
128		- if (isset($array['sabre']) && is_array($array['sabre'])) {
129		- if (isset($array['sabre']['collections']) && is_array($array['sabre']['collections'])) {
130		- if (isset($array['sabre']['collections']['collection'])) {
131		- $items = $array['sabre']['collections']['collection'];
132		- if (!is_array($items)) {
133		- $items = [$items];
134		- }
135		- return $items;
136		- }
137		- }
138		- }
139		- return [];
140		- }
	127	+ private function extractCollectionList(array $array) {
	128	+ if (isset($array['sabre']) && is_array($array['sabre'])) {
	129	+ if (isset($array['sabre']['collections']) && is_array($array['sabre']['collections'])) {
	130	+ if (isset($array['sabre']['collections']['collection'])) {
	131	+ $items = $array['sabre']['collections']['collection'];
	132	+ if (!is_array($items)) {
	133	+ $items = [$items];
	134	+ }
	135	+ return $items;
	136	+ }
	137	+ }
	138	+ }
	139	+ return [];
	140	+ }
141	141
142		- private function loadSabrePluginsFromInfoXml(array $plugins) {
143		- foreach ($plugins as $plugin) {
144		- try {
145		- $this->plugins[] = $this->container->query($plugin);
146		- } catch (QueryException $e) {
147		- if (class_exists($plugin)) {
148		- $this->plugins[] = new $plugin();
149		- } else {
150		- throw new \Exception("Sabre plugin class '$plugin' is unknown and could not be loaded");
151		- }
152		- }
153		- }
154		- }
	142	+ private function loadSabrePluginsFromInfoXml(array $plugins) {
	143	+ foreach ($plugins as $plugin) {
	144	+ try {
	145	+ $this->plugins[] = $this->container->query($plugin);
	146	+ } catch (QueryException $e) {
	147	+ if (class_exists($plugin)) {
	148	+ $this->plugins[] = new $plugin();
	149	+ } else {
	150	+ throw new \Exception("Sabre plugin class '$plugin' is unknown and could not be loaded");
	151	+ }
	152	+ }
	153	+ }
	154	+ }
155	155
156		- private function loadSabreCollectionsFromInfoXml(array $collections) {
157		- foreach ($collections as $collection) {
158		- try {
159		- $this->collections[] = $this->container->query($collection);
160		- } catch (QueryException $e) {
161		- if (class_exists($collection)) {
162		- $this->collections[] = new $collection();
163		- } else {
164		- throw new \Exception("Sabre collection class '$collection' is unknown and could not be loaded");
165		- }
166		- }
167		- }
168		- }
	156	+ private function loadSabreCollectionsFromInfoXml(array $collections) {
	157	+ foreach ($collections as $collection) {
	158	+ try {
	159	+ $this->collections[] = $this->container->query($collection);
	160	+ } catch (QueryException $e) {
	161	+ if (class_exists($collection)) {
	162	+ $this->collections[] = new $collection();
	163	+ } else {
	164	+ throw new \Exception("Sabre collection class '$collection' is unknown and could not be loaded");
	165	+ }
	166	+ }
	167	+ }
	168	+ }
169	169
170	170	}

nextcloud / server

Push — master ( f6f7b5...3a3e6c )

Status

Category

Indentation +185 added lines, -185 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +125 added lines, -125 removed lines patch added patch discarded remove patch