nextcloud / server

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);
+    }
 
 }

lib/public/Contacts/Events/ContactInteractedWithEvent.php

Indentation +92 added lines, -92 removed lines

@@ -40,97 +40,97 @@
  */
 class ContactInteractedWithEvent extends Event {
 
-	/** @var IUser */
-	private $actor;
-
-	/** @var string|null */
-	private $uid;
-
-	/** @var string|null */
-	private $email;
-
-	/** @var string|null */
-	private $federatedCloudId;
-
-	/**
-	 * @param IUser $actor the user who started the interaction
-	 *
-	 * @since 19.0.0
-	 */
-	public function __construct(IUser $actor) {
-		parent::__construct();
-		$this->actor = $actor;
-	}
-
-	/**
-	 * @return IUser
-	 * @since 19.0.0
-	 */
-	public function getActor(): IUser {
-		return $this->actor;
-	}
-
-	/**
-	 * @return string|null
-	 * @since 19.0.0
-	 */
-	public function getUid(): ?string {
-		return $this->uid;
-	}
-
-	/**
-	 * Set the uid of the person interacted with, if known
-	 *
-	 * @param string $uid
-	 *
-	 * @return self
-	 * @since 19.0.0
-	 */
-	public function setUid(string $uid): self {
-		$this->uid = $uid;
-		return $this;
-	}
-
-	/**
-	 * @return string|null
-	 * @since 19.0.0
-	 */
-	public function getEmail(): ?string {
-		return $this->email;
-	}
-
-	/**
-	 * Set the email of the person interacted with, if known
-	 *
-	 * @param string $email
-	 *
-	 * @return self
-	 * @since 19.0.0
-	 */
-	public function setEmail(string $email): self {
-		$this->email = $email;
-		return $this;
-	}
-
-	/**
-	 * @return string|null
-	 * @since 19.0.0
-	 */
-	public function getFederatedCloudId(): ?string {
-		return $this->federatedCloudId;
-	}
-
-	/**
-	 * Set the federated cloud of the person interacted with, if known
-	 *
-	 * @param string $federatedCloudId
-	 *
-	 * @return self
-	 * @since 19.0.0
-	 */
-	public function setFederatedCloudId(string $federatedCloudId): self {
-		$this->federatedCloudId = $federatedCloudId;
-		return $this;
-	}
+    /** @var IUser */
+    private $actor;
+
+    /** @var string|null */
+    private $uid;
+
+    /** @var string|null */
+    private $email;
+
+    /** @var string|null */
+    private $federatedCloudId;
+
+    /**
+     * @param IUser $actor the user who started the interaction
+     *
+     * @since 19.0.0
+     */
+    public function __construct(IUser $actor) {
+        parent::__construct();
+        $this->actor = $actor;
+    }
+
+    /**
+     * @return IUser
+     * @since 19.0.0
+     */
+    public function getActor(): IUser {
+        return $this->actor;
+    }
+
+    /**
+     * @return string|null
+     * @since 19.0.0
+     */
+    public function getUid(): ?string {
+        return $this->uid;
+    }
+
+    /**
+     * Set the uid of the person interacted with, if known
+     *
+     * @param string $uid
+     *
+     * @return self
+     * @since 19.0.0
+     */
+    public function setUid(string $uid): self {
+        $this->uid = $uid;
+        return $this;
+    }
+
+    /**
+     * @return string|null
+     * @since 19.0.0
+     */
+    public function getEmail(): ?string {
+        return $this->email;
+    }
+
+    /**
+     * Set the email of the person interacted with, if known
+     *
+     * @param string $email
+     *
+     * @return self
+     * @since 19.0.0
+     */
+    public function setEmail(string $email): self {
+        $this->email = $email;
+        return $this;
+    }
+
+    /**
+     * @return string|null
+     * @since 19.0.0
+     */
+    public function getFederatedCloudId(): ?string {
+        return $this->federatedCloudId;
+    }
+
+    /**
+     * Set the federated cloud of the person interacted with, if known
+     *
+     * @param string $federatedCloudId
+     *
+     * @return self
+     * @since 19.0.0
+     */
+    public function setFederatedCloudId(string $federatedCloudId): self {
+        $this->federatedCloudId = $federatedCloudId;
+        return $this;
+    }
 
 }

core/Command/App/ListApps.php

Indentation +105 added lines, -105 removed lines

@@ -34,109 +34,109 @@
 
 class ListApps extends Base {
 
-	/** @var IAppManager */
-	protected $manager;
-
-	/**
-	 * @param IAppManager $manager
-	 */
-	public function __construct(IAppManager $manager) {
-		parent::__construct();
-		$this->manager = $manager;
-	}
-
-	protected function configure() {
-		parent::configure();
-
-		$this
-			->setName('app:list')
-			->setDescription('List all available apps')
-			->addOption(
-				'shipped',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'true - limit to shipped apps only, false - limit to non-shipped apps only'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		if ($input->getOption('shipped') === 'true' || $input->getOption('shipped') === 'false'){
-			$shippedFilter = $input->getOption('shipped') === 'true';
-		} else {
-			$shippedFilter = null;
-		}
-
-		$apps = \OC_App::getAllApps();
-		$enabledApps = $disabledApps = [];
-		$versions = \OC_App::getAppVersions();
-
-		//sort enabled apps above disabled apps
-		foreach ($apps as $app) {
-			if ($shippedFilter !== null && $this->manager->isShipped($app) !== $shippedFilter){
-				continue;
-			}
-			if ($this->manager->isInstalled($app)) {
-				$enabledApps[] = $app;
-			} else {
-				$disabledApps[] = $app;
-			}
-		}
-
-		$apps = ['enabled' => [], 'disabled' => []];
-
-		sort($enabledApps);
-		foreach ($enabledApps as $app) {
-			$apps['enabled'][$app] = isset($versions[$app]) ? $versions[$app] : true;
-		}
-
-		sort($disabledApps);
-		foreach ($disabledApps as $app) {
-			$apps['disabled'][$app] = null;
-		}
-
-		$this->writeAppList($input, $output, $apps);
-	}
-
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @param array $items
-	 */
-	protected function writeAppList(InputInterface $input, OutputInterface $output, $items) {
-		switch ($input->getOption('output')) {
-			case self::OUTPUT_FORMAT_PLAIN:
-				$output->writeln('Enabled:');
-				parent::writeArrayInOutputFormat($input, $output, $items['enabled']);
-
-				$output->writeln('Disabled:');
-				parent::writeArrayInOutputFormat($input, $output, $items['disabled']);
-			break;
-
-			default:
-				parent::writeArrayInOutputFormat($input, $output, $items);
-			break;
-		}
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $completionContext
-	 * @return array
-	 */
-	public function completeOptionValues($optionName, CompletionContext $completionContext) {
-		if ($optionName === 'shipped') {
-			return ['true', 'false'];
-		}
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		return [];
-	}
+    /** @var IAppManager */
+    protected $manager;
+
+    /**
+     * @param IAppManager $manager
+     */
+    public function __construct(IAppManager $manager) {
+        parent::__construct();
+        $this->manager = $manager;
+    }
+
+    protected function configure() {
+        parent::configure();
+
+        $this
+            ->setName('app:list')
+            ->setDescription('List all available apps')
+            ->addOption(
+                'shipped',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'true - limit to shipped apps only, false - limit to non-shipped apps only'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        if ($input->getOption('shipped') === 'true' || $input->getOption('shipped') === 'false'){
+            $shippedFilter = $input->getOption('shipped') === 'true';
+        } else {
+            $shippedFilter = null;
+        }
+
+        $apps = \OC_App::getAllApps();
+        $enabledApps = $disabledApps = [];
+        $versions = \OC_App::getAppVersions();
+
+        //sort enabled apps above disabled apps
+        foreach ($apps as $app) {
+            if ($shippedFilter !== null && $this->manager->isShipped($app) !== $shippedFilter){
+                continue;
+            }
+            if ($this->manager->isInstalled($app)) {
+                $enabledApps[] = $app;
+            } else {
+                $disabledApps[] = $app;
+            }
+        }
+
+        $apps = ['enabled' => [], 'disabled' => []];
+
+        sort($enabledApps);
+        foreach ($enabledApps as $app) {
+            $apps['enabled'][$app] = isset($versions[$app]) ? $versions[$app] : true;
+        }
+
+        sort($disabledApps);
+        foreach ($disabledApps as $app) {
+            $apps['disabled'][$app] = null;
+        }
+
+        $this->writeAppList($input, $output, $apps);
+    }
+
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @param array $items
+     */
+    protected function writeAppList(InputInterface $input, OutputInterface $output, $items) {
+        switch ($input->getOption('output')) {
+            case self::OUTPUT_FORMAT_PLAIN:
+                $output->writeln('Enabled:');
+                parent::writeArrayInOutputFormat($input, $output, $items['enabled']);
+
+                $output->writeln('Disabled:');
+                parent::writeArrayInOutputFormat($input, $output, $items['disabled']);
+            break;
+
+            default:
+                parent::writeArrayInOutputFormat($input, $output, $items);
+            break;
+        }
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $completionContext
+     * @return array
+     */
+    public function completeOptionValues($optionName, CompletionContext $completionContext) {
+        if ($optionName === 'shipped') {
+            return ['true', 'false'];
+        }
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        return [];
+    }
 }