nextcloud / server

apps/contactsinteraction/composer/autoload.php

Spacing +1 added lines, -1 removed lines

@@ -2,6 +2,6 @@
 
 // autoload.php @generated by Composer
 
-require_once __DIR__ . '/composer/autoload_real.php';
+require_once __DIR__.'/composer/autoload_real.php';
 
 return ComposerAutoloaderInitContactsInteraction::getLoader();

apps/contactsinteraction/composer/composer/autoload_classmap.php

Spacing +10 added lines, -10 removed lines

@@ -6,14 +6,14 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\ContactsInteraction\\AddressBook' => $baseDir . '/../lib/AddressBook.php',
-    'OCA\\ContactsInteraction\\AddressBookProvider' => $baseDir . '/../lib/AddressBookProvider.php',
-    'OCA\\ContactsInteraction\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\ContactsInteraction\\BackgroundJob\\CleanupJob' => $baseDir . '/../lib/BackgroundJob/CleanupJob.php',
-    'OCA\\ContactsInteraction\\Card' => $baseDir . '/../lib/Card.php',
-    'OCA\\ContactsInteraction\\Db\\CardSearchDao' => $baseDir . '/../lib/Db/CardSearchDao.php',
-    'OCA\\ContactsInteraction\\Db\\RecentContact' => $baseDir . '/../lib/Db/RecentContact.php',
-    'OCA\\ContactsInteraction\\Db\\RecentContactMapper' => $baseDir . '/../lib/Db/RecentContactMapper.php',
-    'OCA\\ContactsInteraction\\Listeners\\ContactInteractionListener' => $baseDir . '/../lib/Listeners/ContactInteractionListener.php',
-    'OCA\\ContactsInteraction\\Migration\\Version010000Date20200304152605' => $baseDir . '/../lib/Migration/Version010000Date20200304152605.php',
+    'OCA\\ContactsInteraction\\AddressBook' => $baseDir.'/../lib/AddressBook.php',
+    'OCA\\ContactsInteraction\\AddressBookProvider' => $baseDir.'/../lib/AddressBookProvider.php',
+    'OCA\\ContactsInteraction\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\ContactsInteraction\\BackgroundJob\\CleanupJob' => $baseDir.'/../lib/BackgroundJob/CleanupJob.php',
+    'OCA\\ContactsInteraction\\Card' => $baseDir.'/../lib/Card.php',
+    'OCA\\ContactsInteraction\\Db\\CardSearchDao' => $baseDir.'/../lib/Db/CardSearchDao.php',
+    'OCA\\ContactsInteraction\\Db\\RecentContact' => $baseDir.'/../lib/Db/RecentContact.php',
+    'OCA\\ContactsInteraction\\Db\\RecentContactMapper' => $baseDir.'/../lib/Db/RecentContactMapper.php',
+    'OCA\\ContactsInteraction\\Listeners\\ContactInteractionListener' => $baseDir.'/../lib/Listeners/ContactInteractionListener.php',
+    'OCA\\ContactsInteraction\\Migration\\Version010000Date20200304152605' => $baseDir.'/../lib/Migration/Version010000Date20200304152605.php',
 );

apps/contactsinteraction/composer/composer/autoload_psr4.php

Spacing +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\ContactsInteraction\\' => array($baseDir . '/../lib'),
+    'OCA\\ContactsInteraction\\' => array($baseDir.'/../lib'),
 );

apps/contactsinteraction/composer/composer/ClassLoader.php

Spacing +8 added lines, -8 removed lines

@@ -370,18 +370,18 @@ 
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                        if (file_exists($file = $dir.$pathEnd)) {
                             return $file;
                         }
                     }
@@ -391,7 +391,7 @@ 
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -403,14 +403,14 @@ 
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
         }
 
         if (isset($this->prefixesPsr0[$first])) {
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -420,7 +420,7 @@ 
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                 return $file;
             }
         }

apps/contactsinteraction/composer/composer/autoload_static.php

Spacing +17 added lines, -17 removed lines

@@ -6,36 +6,36 @@
 
 class ComposerStaticInitContactsInteraction
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\ContactsInteraction\\' => 24,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\ContactsInteraction\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'OCA\\ContactsInteraction\\AddressBook' => __DIR__ . '/..' . '/../lib/AddressBook.php',
-        'OCA\\ContactsInteraction\\AddressBookProvider' => __DIR__ . '/..' . '/../lib/AddressBookProvider.php',
-        'OCA\\ContactsInteraction\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\ContactsInteraction\\BackgroundJob\\CleanupJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupJob.php',
-        'OCA\\ContactsInteraction\\Card' => __DIR__ . '/..' . '/../lib/Card.php',
-        'OCA\\ContactsInteraction\\Db\\CardSearchDao' => __DIR__ . '/..' . '/../lib/Db/CardSearchDao.php',
-        'OCA\\ContactsInteraction\\Db\\RecentContact' => __DIR__ . '/..' . '/../lib/Db/RecentContact.php',
-        'OCA\\ContactsInteraction\\Db\\RecentContactMapper' => __DIR__ . '/..' . '/../lib/Db/RecentContactMapper.php',
-        'OCA\\ContactsInteraction\\Listeners\\ContactInteractionListener' => __DIR__ . '/..' . '/../lib/Listeners/ContactInteractionListener.php',
-        'OCA\\ContactsInteraction\\Migration\\Version010000Date20200304152605' => __DIR__ . '/..' . '/../lib/Migration/Version010000Date20200304152605.php',
+    public static $classMap = array(
+        'OCA\\ContactsInteraction\\AddressBook' => __DIR__.'/..'.'/../lib/AddressBook.php',
+        'OCA\\ContactsInteraction\\AddressBookProvider' => __DIR__.'/..'.'/../lib/AddressBookProvider.php',
+        'OCA\\ContactsInteraction\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\ContactsInteraction\\BackgroundJob\\CleanupJob' => __DIR__.'/..'.'/../lib/BackgroundJob/CleanupJob.php',
+        'OCA\\ContactsInteraction\\Card' => __DIR__.'/..'.'/../lib/Card.php',
+        'OCA\\ContactsInteraction\\Db\\CardSearchDao' => __DIR__.'/..'.'/../lib/Db/CardSearchDao.php',
+        'OCA\\ContactsInteraction\\Db\\RecentContact' => __DIR__.'/..'.'/../lib/Db/RecentContact.php',
+        'OCA\\ContactsInteraction\\Db\\RecentContactMapper' => __DIR__.'/..'.'/../lib/Db/RecentContactMapper.php',
+        'OCA\\ContactsInteraction\\Listeners\\ContactInteractionListener' => __DIR__.'/..'.'/../lib/Listeners/ContactInteractionListener.php',
+        'OCA\\ContactsInteraction\\Migration\\Version010000Date20200304152605' => __DIR__.'/..'.'/../lib/Migration/Version010000Date20200304152605.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitContactsInteraction::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitContactsInteraction::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitContactsInteraction::$classMap;

apps/contactsinteraction/composer/composer/autoload_real.php

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
     public static function loadClassLoader($class)
     {
         if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
+            require __DIR__.'/ClassLoader.php';
         }
     }
 
@@ -28,11 +28,11 @@ 
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
+            require_once __DIR__.'/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInitContactsInteraction::getInitializer($loader));
         } else {
-            $classMap = require __DIR__ . '/autoload_classmap.php';
+            $classMap = require __DIR__.'/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }

apps/dav/lib/CardDAV/UserAddressBooks.php

Indentation +79 added lines, -79 removed lines

@@ -40,84 +40,84 @@
 
 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 IAddressBook[]
-	 */
-	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);
-		/** @var IAddressBook[] $objects */
-		$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);
-		/** @var IAddressBook[][] $objectsFromPlugins */
-		$objectsFromPlugins = array_map(function(IAddressBookProvider $plugin): array {
-			return $plugin->fetchAllForAddressBookHome($this->principalUri);
-		}, $this->pluginManager->getAddressBookPlugins());
-
-		return array_merge($objects, ...$objectsFromPlugins);
-	}
-
-	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 IAddressBook[]
+     */
+    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);
+        /** @var IAddressBook[] $objects */
+        $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);
+        /** @var IAddressBook[][] $objectsFromPlugins */
+        $objectsFromPlugins = array_map(function(IAddressBookProvider $plugin): array {
+            return $plugin->fetchAllForAddressBookHome($this->principalUri);
+        }, $this->pluginManager->getAddressBookPlugins());
+
+        return array_merge($objects, ...$objectsFromPlugins);
+    }
+
+    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/files_sharing/lib/AppInfo/Application.php

Indentation +238 added lines, -238 removed lines

@@ -65,242 +65,242 @@
 
 class Application extends App {
 
-	const APP_ID = 'files_sharing';
-
-	public function __construct(array $urlParams = []) {
-		parent::__construct(self::APP_ID, $urlParams);
-
-		$container = $this->getContainer();
-
-		/** @var IServerContainer $server */
-		$server = $container->getServer();
-
-		/** @var IEventDispatcher $dispatcher */
-		$dispatcher = $container->query(IEventDispatcher::class);
-		$mountProviderCollection = $server->getMountProviderCollection();
-		$notifications = $server->getNotificationManager();
-
-		/**
-		 * Controllers
-		 */
-		$container->registerService('ShareController', function (SimpleContainer $c) use ($server) {
-			$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
-			return new ShareController(
-				$c->query('AppName'),
-				$c->query('Request'),
-				$server->getConfig(),
-				$server->getURLGenerator(),
-				$server->getUserManager(),
-				$server->getLogger(),
-				$server->getActivityManager(),
-				$server->getShareManager(),
-				$server->getSession(),
-				$server->getPreviewManager(),
-				$server->getRootFolder(),
-				$federatedSharingApp->getFederatedShareProvider(),
-				$server->getEventDispatcher(),
-				$server->getL10N($c->query('AppName')),
-				$server->query(Defaults::class)
-			);
-		});
-		$container->registerService('ExternalSharesController', function (SimpleContainer $c) {
-			return new ExternalSharesController(
-				$c->query('AppName'),
-				$c->query('Request'),
-				$c->query('ExternalManager'),
-				$c->query('HttpClientService')
-			);
-		});
-
-		/**
-		 * Core class wrappers
-		 */
-		$container->registerService('HttpClientService', function (SimpleContainer $c) use ($server) {
-			return $server->getHTTPClientService();
-		});
-		$container->registerService(ICloudIdManager::class, function (SimpleContainer $c) use ($server) {
-			return $server->getCloudIdManager();
-		});
-		$container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) {
-			$user = $server->getUserSession()->getUser();
-			$uid = $user ? $user->getUID() : null;
-			return new \OCA\Files_Sharing\External\Manager(
-				$server->getDatabaseConnection(),
-				\OC\Files\Filesystem::getMountManager(),
-				\OC\Files\Filesystem::getLoader(),
-				$server->getHTTPClientService(),
-				$server->getNotificationManager(),
-				$server->query(\OCP\OCS\IDiscoveryService::class),
-				$server->getCloudFederationProviderManager(),
-				$server->getCloudFederationFactory(),
-				$server->getGroupManager(),
-				$server->getUserManager(),
-				$uid
-			);
-		});
-		$container->registerAlias(Manager::class, 'ExternalManager');
-
-		/**
-		 * Middleware
-		 */
-		$container->registerService('SharingCheckMiddleware', function (SimpleContainer $c) use ($server) {
-			return new SharingCheckMiddleware(
-				$c->query('AppName'),
-				$server->getConfig(),
-				$server->getAppManager(),
-				$server->query(IControllerMethodReflector::class),
-				$server->getShareManager(),
-				$server->getRequest()
-			);
-		});
-
-		$container->registerService(ShareInfoMiddleware::class, function () use ($server) {
-			return new ShareInfoMiddleware(
-				$server->getShareManager()
-			);
-		});
-
-		// Execute middlewares
-		$container->registerMiddleWare('SharingCheckMiddleware');
-		$container->registerMiddleWare(OCSShareAPIMiddleware::class);
-		$container->registerMiddleWare(ShareInfoMiddleware::class);
-
-		$container->registerService('MountProvider', function (IContainer $c) {
-			/** @var \OCP\IServerContainer $server */
-			$server = $c->query('ServerContainer');
-			return new MountProvider(
-				$server->getConfig(),
-				$server->getShareManager(),
-				$server->getLogger()
-			);
-		});
-
-		$container->registerService('ExternalMountProvider', function (IContainer $c) {
-			/** @var \OCP\IServerContainer $server */
-			$server = $c->query('ServerContainer');
-			return new \OCA\Files_Sharing\External\MountProvider(
-				$server->getDatabaseConnection(),
-				function() use ($c) {
-					return $c->query('ExternalManager');
-				},
-				$server->getCloudIdManager()
-			);
-		});
-
-		/**
-		 * Register capabilities
-		 */
-		$container->registerCapability(Capabilities::class);
-
-		$notifications->registerNotifierService(Notifier::class);
-
-		$this->registerMountProviders($mountProviderCollection);
-		$this->registerEventsScripts($dispatcher);
-		$this->setupSharingMenus();
-
-		/**
-		 * Always add main sharing script
-		 */
-		Util::addScript(self::APP_ID, 'dist/main');
-	}
-
-	protected function registerMountProviders(IMountProviderCollection $mountProviderCollection) {
-		$mountProviderCollection->registerProvider($this->getContainer()->query('MountProvider'));
-		$mountProviderCollection->registerProvider($this->getContainer()->query('ExternalMountProvider'));
-	}
-
-	protected function registerEventsScripts(IEventDispatcher $dispatcher) {
-		// sidebar and files scripts
-		$dispatcher->addServiceListener(LoadAdditionalScriptsEvent::class, LoadAdditionalListener::class);
-		$dispatcher->addServiceListener(LoadSidebar::class, LoadSidebarListener::class);
-		$dispatcher->addServiceListener(ShareCreatedEvent::class, ShareInteractionListener::class);
-		$dispatcher->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', function() {
-			\OCP\Util::addScript('files_sharing', 'dist/collaboration');
-		});
-		$dispatcher->addServiceListener(ShareCreatedEvent::class, UserShareAcceptanceListener::class);
-		$dispatcher->addServiceListener(UserAddedEvent::class, UserAddedToGroupListener::class);
-
-		// notifications api to accept incoming user shares
-		$dispatcher->addListener('OCP\Share::postShare', function(GenericEvent $event) {
-			/** @var Listener $listener */
-			$listener = $this->getContainer()->query(Listener::class);
-			$listener->shareNotification($event);
-		});
-		$dispatcher->addListener(IGroup::class . '::postAddUser', function(GenericEvent $event) {
-			/** @var Listener $listener */
-			$listener = $this->getContainer()->query(Listener::class);
-			$listener->userAddedToGroup($event);
-		});
-	}
-
-	protected function setupSharingMenus() {
-		$config = \OC::$server->getConfig();
-		$l = \OC::$server->getL10N('files_sharing');
-
-		if ($config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes') {
-			return;
-		}
-
-		$sharingSublistArray = [];
-
-		if (\OCP\Util::isSharingDisabledForUser() === false) {
-			array_push($sharingSublistArray, [
-				'id' => 'sharingout',
-				'appname' => 'files_sharing',
-				'script' => 'list.php',
-				'order' => 16,
-				'name' => $l->t('Shared with others'),
-			]);
-		}
-
-		array_push($sharingSublistArray, [
-			'id' => 'sharingin',
-			'appname' => 'files_sharing',
-			'script' => 'list.php',
-			'order' => 15,
-			'name' => $l->t('Shared with you'),
-		]);
-
-		if (\OCP\Util::isSharingDisabledForUser() === false) {
-			// Check if sharing by link is enabled
-			if ($config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {
-				array_push($sharingSublistArray, [
-					'id' => 'sharinglinks',
-					'appname' => 'files_sharing',
-					'script' => 'list.php',
-					'order' => 17,
-					'name' => $l->t('Shared by link'),
-				]);
-			}
-		}
-
-		array_push($sharingSublistArray, [
-			'id' => 'deletedshares',
-			'appname' => 'files_sharing',
-			'script' => 'list.php',
-			'order' => 19,
-			'name' => $l->t('Deleted shares'),
-		]);
-
-		array_push($sharingSublistArray, [
-			'id' => 'pendingshares',
-			'appname' => 'files_sharing',
-			'script' => 'list.php',
-			'order' => 19,
-			'name' => $l->t('Pending shares'),
-		]);
-
-
-		// show_Quick_Access stored as string
-		\OCA\Files\App::getNavigationManager()->add([
-			'id' => 'shareoverview',
-			'appname' => 'files_sharing',
-			'script' => 'list.php',
-			'order' => 18,
-			'name' => $l->t('Shares'),
-			'classes' => 'collapsible',
-			'sublist' => $sharingSublistArray,
-			'expandedState' => 'show_sharing_menu'
-		]);
-	}
+    const APP_ID = 'files_sharing';
+
+    public function __construct(array $urlParams = []) {
+        parent::__construct(self::APP_ID, $urlParams);
+
+        $container = $this->getContainer();
+
+        /** @var IServerContainer $server */
+        $server = $container->getServer();
+
+        /** @var IEventDispatcher $dispatcher */
+        $dispatcher = $container->query(IEventDispatcher::class);
+        $mountProviderCollection = $server->getMountProviderCollection();
+        $notifications = $server->getNotificationManager();
+
+        /**
+         * Controllers
+         */
+        $container->registerService('ShareController', function (SimpleContainer $c) use ($server) {
+            $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
+            return new ShareController(
+                $c->query('AppName'),
+                $c->query('Request'),
+                $server->getConfig(),
+                $server->getURLGenerator(),
+                $server->getUserManager(),
+                $server->getLogger(),
+                $server->getActivityManager(),
+                $server->getShareManager(),
+                $server->getSession(),
+                $server->getPreviewManager(),
+                $server->getRootFolder(),
+                $federatedSharingApp->getFederatedShareProvider(),
+                $server->getEventDispatcher(),
+                $server->getL10N($c->query('AppName')),
+                $server->query(Defaults::class)
+            );
+        });
+        $container->registerService('ExternalSharesController', function (SimpleContainer $c) {
+            return new ExternalSharesController(
+                $c->query('AppName'),
+                $c->query('Request'),
+                $c->query('ExternalManager'),
+                $c->query('HttpClientService')
+            );
+        });
+
+        /**
+         * Core class wrappers
+         */
+        $container->registerService('HttpClientService', function (SimpleContainer $c) use ($server) {
+            return $server->getHTTPClientService();
+        });
+        $container->registerService(ICloudIdManager::class, function (SimpleContainer $c) use ($server) {
+            return $server->getCloudIdManager();
+        });
+        $container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) {
+            $user = $server->getUserSession()->getUser();
+            $uid = $user ? $user->getUID() : null;
+            return new \OCA\Files_Sharing\External\Manager(
+                $server->getDatabaseConnection(),
+                \OC\Files\Filesystem::getMountManager(),
+                \OC\Files\Filesystem::getLoader(),
+                $server->getHTTPClientService(),
+                $server->getNotificationManager(),
+                $server->query(\OCP\OCS\IDiscoveryService::class),
+                $server->getCloudFederationProviderManager(),
+                $server->getCloudFederationFactory(),
+                $server->getGroupManager(),
+                $server->getUserManager(),
+                $uid
+            );
+        });
+        $container->registerAlias(Manager::class, 'ExternalManager');
+
+        /**
+         * Middleware
+         */
+        $container->registerService('SharingCheckMiddleware', function (SimpleContainer $c) use ($server) {
+            return new SharingCheckMiddleware(
+                $c->query('AppName'),
+                $server->getConfig(),
+                $server->getAppManager(),
+                $server->query(IControllerMethodReflector::class),
+                $server->getShareManager(),
+                $server->getRequest()
+            );
+        });
+
+        $container->registerService(ShareInfoMiddleware::class, function () use ($server) {
+            return new ShareInfoMiddleware(
+                $server->getShareManager()
+            );
+        });
+
+        // Execute middlewares
+        $container->registerMiddleWare('SharingCheckMiddleware');
+        $container->registerMiddleWare(OCSShareAPIMiddleware::class);
+        $container->registerMiddleWare(ShareInfoMiddleware::class);
+
+        $container->registerService('MountProvider', function (IContainer $c) {
+            /** @var \OCP\IServerContainer $server */
+            $server = $c->query('ServerContainer');
+            return new MountProvider(
+                $server->getConfig(),
+                $server->getShareManager(),
+                $server->getLogger()
+            );
+        });
+
+        $container->registerService('ExternalMountProvider', function (IContainer $c) {
+            /** @var \OCP\IServerContainer $server */
+            $server = $c->query('ServerContainer');
+            return new \OCA\Files_Sharing\External\MountProvider(
+                $server->getDatabaseConnection(),
+                function() use ($c) {
+                    return $c->query('ExternalManager');
+                },
+                $server->getCloudIdManager()
+            );
+        });
+
+        /**
+         * Register capabilities
+         */
+        $container->registerCapability(Capabilities::class);
+
+        $notifications->registerNotifierService(Notifier::class);
+
+        $this->registerMountProviders($mountProviderCollection);
+        $this->registerEventsScripts($dispatcher);
+        $this->setupSharingMenus();
+
+        /**
+         * Always add main sharing script
+         */
+        Util::addScript(self::APP_ID, 'dist/main');
+    }
+
+    protected function registerMountProviders(IMountProviderCollection $mountProviderCollection) {
+        $mountProviderCollection->registerProvider($this->getContainer()->query('MountProvider'));
+        $mountProviderCollection->registerProvider($this->getContainer()->query('ExternalMountProvider'));
+    }
+
+    protected function registerEventsScripts(IEventDispatcher $dispatcher) {
+        // sidebar and files scripts
+        $dispatcher->addServiceListener(LoadAdditionalScriptsEvent::class, LoadAdditionalListener::class);
+        $dispatcher->addServiceListener(LoadSidebar::class, LoadSidebarListener::class);
+        $dispatcher->addServiceListener(ShareCreatedEvent::class, ShareInteractionListener::class);
+        $dispatcher->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', function() {
+            \OCP\Util::addScript('files_sharing', 'dist/collaboration');
+        });
+        $dispatcher->addServiceListener(ShareCreatedEvent::class, UserShareAcceptanceListener::class);
+        $dispatcher->addServiceListener(UserAddedEvent::class, UserAddedToGroupListener::class);
+
+        // notifications api to accept incoming user shares
+        $dispatcher->addListener('OCP\Share::postShare', function(GenericEvent $event) {
+            /** @var Listener $listener */
+            $listener = $this->getContainer()->query(Listener::class);
+            $listener->shareNotification($event);
+        });
+        $dispatcher->addListener(IGroup::class . '::postAddUser', function(GenericEvent $event) {
+            /** @var Listener $listener */
+            $listener = $this->getContainer()->query(Listener::class);
+            $listener->userAddedToGroup($event);
+        });
+    }
+
+    protected function setupSharingMenus() {
+        $config = \OC::$server->getConfig();
+        $l = \OC::$server->getL10N('files_sharing');
+
+        if ($config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes') {
+            return;
+        }
+
+        $sharingSublistArray = [];
+
+        if (\OCP\Util::isSharingDisabledForUser() === false) {
+            array_push($sharingSublistArray, [
+                'id' => 'sharingout',
+                'appname' => 'files_sharing',
+                'script' => 'list.php',
+                'order' => 16,
+                'name' => $l->t('Shared with others'),
+            ]);
+        }
+
+        array_push($sharingSublistArray, [
+            'id' => 'sharingin',
+            'appname' => 'files_sharing',
+            'script' => 'list.php',
+            'order' => 15,
+            'name' => $l->t('Shared with you'),
+        ]);
+
+        if (\OCP\Util::isSharingDisabledForUser() === false) {
+            // Check if sharing by link is enabled
+            if ($config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {
+                array_push($sharingSublistArray, [
+                    'id' => 'sharinglinks',
+                    'appname' => 'files_sharing',
+                    'script' => 'list.php',
+                    'order' => 17,
+                    'name' => $l->t('Shared by link'),
+                ]);
+            }
+        }
+
+        array_push($sharingSublistArray, [
+            'id' => 'deletedshares',
+            'appname' => 'files_sharing',
+            'script' => 'list.php',
+            'order' => 19,
+            'name' => $l->t('Deleted shares'),
+        ]);
+
+        array_push($sharingSublistArray, [
+            'id' => 'pendingshares',
+            'appname' => 'files_sharing',
+            'script' => 'list.php',
+            'order' => 19,
+            'name' => $l->t('Pending shares'),
+        ]);
+
+
+        // show_Quick_Access stored as string
+        \OCA\Files\App::getNavigationManager()->add([
+            'id' => 'shareoverview',
+            'appname' => 'files_sharing',
+            'script' => 'list.php',
+            'order' => 18,
+            'name' => $l->t('Shares'),
+            'classes' => 'collapsible',
+            'sublist' => $sharingSublistArray,
+            'expandedState' => 'show_sharing_menu'
+        ]);
+    }
 }

apps/files_sharing/lib/Listener/ShareInteractionListener.php

Indentation +47 added lines, -47 removed lines

@@ -37,59 +37,59 @@
 
 class ShareInteractionListener implements IEventListener {
 
-	private const SUPPORTED_SHARE_TYPES = [
-		IShare::TYPE_USER,
-		IShare::TYPE_EMAIL,
-		IShare::TYPE_REMOTE,
-	];
+    private const SUPPORTED_SHARE_TYPES = [
+        IShare::TYPE_USER,
+        IShare::TYPE_EMAIL,
+        IShare::TYPE_REMOTE,
+    ];
 
-	/** @var IEventDispatcher */
-	private $dispatcher;
+    /** @var IEventDispatcher */
+    private $dispatcher;
 
-	/** @var IUserManager */
-	private $userManager;
+    /** @var IUserManager */
+    private $userManager;
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	public function __construct(IEventDispatcher $dispatcher,
-								IUserManager $userManager,
-								ILogger $logger) {
-		$this->dispatcher = $dispatcher;
-		$this->userManager = $userManager;
-		$this->logger = $logger;
-	}
+    public function __construct(IEventDispatcher $dispatcher,
+                                IUserManager $userManager,
+                                ILogger $logger) {
+        $this->dispatcher = $dispatcher;
+        $this->userManager = $userManager;
+        $this->logger = $logger;
+    }
 
-	public function handle(Event $event): void {
-		if (!($event instanceof ShareCreatedEvent)) {
-			// Unrelated
-			return;
-		}
+    public function handle(Event $event): void {
+        if (!($event instanceof ShareCreatedEvent)) {
+            // Unrelated
+            return;
+        }
 
-		$share = $event->getShare();
-		if (!in_array($share->getShareType(), self::SUPPORTED_SHARE_TYPES, true)) {
-			$this->logger->debug('Share type does not allow to emit interaction event');
-			return;
-		}
-		$actor = $this->userManager->get($share->getSharedBy());
-		if ($actor === null) {
-			$this->logger->warning('Share was not created by a user, can\'t emit interaction event');
-			return;
-		}
-		$interactionEvent = new ContactInteractedWithEvent($actor);
-		switch ($share->getShareType()) {
-			case IShare::TYPE_USER:
-				$interactionEvent->setUid($share->getSharedWith());
-				break;
-			case IShare::TYPE_EMAIL:
-				$interactionEvent->setEmail($share->getSharedWith());
-				break;
-			case IShare::TYPE_REMOTE:
-				$interactionEvent->setFederatedCloudId($share->getSharedWith());
-				break;
-		}
+        $share = $event->getShare();
+        if (!in_array($share->getShareType(), self::SUPPORTED_SHARE_TYPES, true)) {
+            $this->logger->debug('Share type does not allow to emit interaction event');
+            return;
+        }
+        $actor = $this->userManager->get($share->getSharedBy());
+        if ($actor === null) {
+            $this->logger->warning('Share was not created by a user, can\'t emit interaction event');
+            return;
+        }
+        $interactionEvent = new ContactInteractedWithEvent($actor);
+        switch ($share->getShareType()) {
+            case IShare::TYPE_USER:
+                $interactionEvent->setUid($share->getSharedWith());
+                break;
+            case IShare::TYPE_EMAIL:
+                $interactionEvent->setEmail($share->getSharedWith());
+                break;
+            case IShare::TYPE_REMOTE:
+                $interactionEvent->setFederatedCloudId($share->getSharedWith());
+                break;
+        }
 
-		$this->dispatcher->dispatchTyped($interactionEvent);
-	}
+        $this->dispatcher->dispatchTyped($interactionEvent);
+    }
 
 }