nextcloud / server

core/Application.php

Indentation +104 added lines, -104 removed lines

@@ -51,109 +51,109 @@
  */
 class Application extends App {
 
-	public function __construct() {
-		parent::__construct('core');
-
-		$container = $this->getContainer();
-
-		$container->registerService('defaultMailAddress', function () {
-			return Util::getDefaultEmailAddress('lostpassword-noreply');
-		});
-
-		$server = $container->getServer();
-		/** @var IEventDispatcher $eventDispatcher */
-		$eventDispatcher = $server->query(IEventDispatcher::class);
-
-		$notificationManager = $server->getNotificationManager();
-		$notificationManager->registerNotifierService(RemoveLinkSharesNotifier::class);
-		$notificationManager->registerNotifierService(AuthenticationNotifier::class);
-
-		$eventDispatcher->addListener(IDBConnection::CHECK_MISSING_INDEXES_EVENT,
-			function (GenericEvent $event) use ($container) {
-				/** @var MissingIndexInformation $subject */
-				$subject = $event->getSubject();
-
-				$schema = new SchemaWrapper($container->query(IDBConnection::class));
-
-				if ($schema->hasTable('share')) {
-					$table = $schema->getTable('share');
-
-					if (!$table->hasIndex('share_with_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'share_with_index');
-					}
-					if (!$table->hasIndex('parent_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'parent_index');
-					}
-					if (!$table->hasIndex('owner_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'owner_index');
-					}
-					if (!$table->hasIndex('initiator_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'initiator_index');
-					}
-				}
-
-				if ($schema->hasTable('filecache')) {
-					$table = $schema->getTable('filecache');
-
-					if (!$table->hasIndex('fs_mtime')) {
-						$subject->addHintForMissingSubject($table->getName(), 'fs_mtime');
-					}
-				}
-
-				if ($schema->hasTable('twofactor_providers')) {
-					$table = $schema->getTable('twofactor_providers');
-
-					if (!$table->hasIndex('twofactor_providers_uid')) {
-						$subject->addHintForMissingSubject($table->getName(), 'twofactor_providers_uid');
-					}
-				}
-
-				if ($schema->hasTable('login_flow_v2')) {
-					$table = $schema->getTable('login_flow_v2');
-
-					if (!$table->hasIndex('poll_token')) {
-						$subject->addHintForMissingSubject($table->getName(), 'poll_token');
-					}
-					if (!$table->hasIndex('login_token')) {
-						$subject->addHintForMissingSubject($table->getName(), 'login_token');
-					}
-					if (!$table->hasIndex('timestamp')) {
-						$subject->addHintForMissingSubject($table->getName(), 'timestamp');
-					}
-				}
-
-				if ($schema->hasTable('whats_new')) {
-					$table = $schema->getTable('whats_new');
-
-					if (!$table->hasIndex('version')) {
-						$subject->addHintForMissingSubject($table->getName(), 'version');
-					}
-				}
-
-				if ($schema->hasTable('cards')) {
-					$table = $schema->getTable('cards');
-
-					if (!$table->hasIndex('cards_abid')) {
-						$subject->addHintForMissingSubject($table->getName(), 'cards_abid');
-					}
-				}
-
-				if ($schema->hasTable('cards_properties')) {
-					$table = $schema->getTable('cards_properties');
-
-					if (!$table->hasIndex('cards_prop_abid')) {
-						$subject->addHintForMissingSubject($table->getName(), 'cards_prop_abid');
-					}
-				}
-			}
-		);
-
-		$eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeActivityListener::class);
-		$eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeNotificationsListener::class);
-		$eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeEmailListener::class);
-		$eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeActivityListener::class);
-		$eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeNotificationsListener::class);
-		$eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeEmailListener::class);
-	}
+    public function __construct() {
+        parent::__construct('core');
+
+        $container = $this->getContainer();
+
+        $container->registerService('defaultMailAddress', function () {
+            return Util::getDefaultEmailAddress('lostpassword-noreply');
+        });
+
+        $server = $container->getServer();
+        /** @var IEventDispatcher $eventDispatcher */
+        $eventDispatcher = $server->query(IEventDispatcher::class);
+
+        $notificationManager = $server->getNotificationManager();
+        $notificationManager->registerNotifierService(RemoveLinkSharesNotifier::class);
+        $notificationManager->registerNotifierService(AuthenticationNotifier::class);
+
+        $eventDispatcher->addListener(IDBConnection::CHECK_MISSING_INDEXES_EVENT,
+            function (GenericEvent $event) use ($container) {
+                /** @var MissingIndexInformation $subject */
+                $subject = $event->getSubject();
+
+                $schema = new SchemaWrapper($container->query(IDBConnection::class));
+
+                if ($schema->hasTable('share')) {
+                    $table = $schema->getTable('share');
+
+                    if (!$table->hasIndex('share_with_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'share_with_index');
+                    }
+                    if (!$table->hasIndex('parent_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'parent_index');
+                    }
+                    if (!$table->hasIndex('owner_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'owner_index');
+                    }
+                    if (!$table->hasIndex('initiator_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'initiator_index');
+                    }
+                }
+
+                if ($schema->hasTable('filecache')) {
+                    $table = $schema->getTable('filecache');
+
+                    if (!$table->hasIndex('fs_mtime')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'fs_mtime');
+                    }
+                }
+
+                if ($schema->hasTable('twofactor_providers')) {
+                    $table = $schema->getTable('twofactor_providers');
+
+                    if (!$table->hasIndex('twofactor_providers_uid')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'twofactor_providers_uid');
+                    }
+                }
+
+                if ($schema->hasTable('login_flow_v2')) {
+                    $table = $schema->getTable('login_flow_v2');
+
+                    if (!$table->hasIndex('poll_token')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'poll_token');
+                    }
+                    if (!$table->hasIndex('login_token')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'login_token');
+                    }
+                    if (!$table->hasIndex('timestamp')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'timestamp');
+                    }
+                }
+
+                if ($schema->hasTable('whats_new')) {
+                    $table = $schema->getTable('whats_new');
+
+                    if (!$table->hasIndex('version')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'version');
+                    }
+                }
+
+                if ($schema->hasTable('cards')) {
+                    $table = $schema->getTable('cards');
+
+                    if (!$table->hasIndex('cards_abid')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'cards_abid');
+                    }
+                }
+
+                if ($schema->hasTable('cards_properties')) {
+                    $table = $schema->getTable('cards_properties');
+
+                    if (!$table->hasIndex('cards_prop_abid')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'cards_prop_abid');
+                    }
+                }
+            }
+        );
+
+        $eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeActivityListener::class);
+        $eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeNotificationsListener::class);
+        $eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeEmailListener::class);
+        $eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeActivityListener::class);
+        $eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeNotificationsListener::class);
+        $eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeEmailListener::class);
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 
 		$container = $this->getContainer();
 
-		$container->registerService('defaultMailAddress', function () {
+		$container->registerService('defaultMailAddress', function() {
 			return Util::getDefaultEmailAddress('lostpassword-noreply');
 		});
 
@@ -69,7 +69,7 @@ 
 		$notificationManager->registerNotifierService(AuthenticationNotifier::class);
 
 		$eventDispatcher->addListener(IDBConnection::CHECK_MISSING_INDEXES_EVENT,
-			function (GenericEvent $event) use ($container) {
+			function(GenericEvent $event) use ($container) {
 				/** @var MissingIndexInformation $subject */
 				$subject = $event->getSubject();
 

core/Notification/RemoveLinkSharesNotifier.php

Indentation +36 added lines, -36 removed lines

@@ -29,46 +29,46 @@
 use OCP\Notification\INotifier;
 
 class RemoveLinkSharesNotifier implements INotifier {
-	/** @var IFactory */
-	private $l10nFactory;
+    /** @var IFactory */
+    private $l10nFactory;
 
-	public function __construct(IFactory $factory) {
-		$this->l10nFactory = $factory;
-	}
+    public function __construct(IFactory $factory) {
+        $this->l10nFactory = $factory;
+    }
 
-	/**
-	 * Identifier of the notifier, only use [a-z0-9_]
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getID(): string {
-		return 'core';
-	}
+    /**
+     * Identifier of the notifier, only use [a-z0-9_]
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getID(): string {
+        return 'core';
+    }
 
-	/**
-	 * Human readable name describing the notifier
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getName(): string {
-		return $this->l10nFactory->get('core')->t('Nextcloud Server');
-	}
+    /**
+     * Human readable name describing the notifier
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getName(): string {
+        return $this->l10nFactory->get('core')->t('Nextcloud Server');
+    }
 
-	public function prepare(INotification $notification, string $languageCode): INotification {
-		if($notification->getApp() !== 'core') {
-			throw new \InvalidArgumentException();
-		}
-		$l = $this->l10nFactory->get('core', $languageCode);
+    public function prepare(INotification $notification, string $languageCode): INotification {
+        if($notification->getApp() !== 'core') {
+            throw new \InvalidArgumentException();
+        }
+        $l = $this->l10nFactory->get('core', $languageCode);
 
-		if ($notification->getSubject() === 'repair_exposing_links') {
-			$notification->setParsedSubject($l->t('Some of your link shares have been removed'));
-			$notification->setParsedMessage($l->t('Due to a security bug we had to remove some of your link shares. Please see the link for more information.'));
-			$notification->setLink('https://nextcloud.com/security/advisory/?id=NC-SA-2019-003');
-			return $notification;
-		}
+        if ($notification->getSubject() === 'repair_exposing_links') {
+            $notification->setParsedSubject($l->t('Some of your link shares have been removed'));
+            $notification->setParsedMessage($l->t('Due to a security bug we had to remove some of your link shares. Please see the link for more information.'));
+            $notification->setLink('https://nextcloud.com/security/advisory/?id=NC-SA-2019-003');
+            return $notification;
+        }
 
-		throw new \InvalidArgumentException('Invalid subject');
-	}
+        throw new \InvalidArgumentException('Invalid subject');
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 	}
 
 	public function prepare(INotification $notification, string $languageCode): INotification {
-		if($notification->getApp() !== 'core') {
+		if ($notification->getApp() !== 'core') {
 			throw new \InvalidArgumentException();
 		}
 		$l = $this->l10nFactory->get('core', $languageCode);

apps/updatenotification/lib/AppInfo/Application.php

Indentation +34 added lines, -34 removed lines

@@ -32,45 +32,45 @@
 use OCP\Util;
 
 class Application extends App {
-	public function __construct() {
-		parent::__construct('updatenotification', []);
-	}
+    public function __construct() {
+        parent::__construct('updatenotification', []);
+    }
 
-	public function register() {
-		$server = $this->getContainer()->getServer();
+    public function register() {
+        $server = $this->getContainer()->getServer();
 
-		if ($server->getConfig()->getSystemValue('updatechecker', true) !== true) {
-			// Updater check is disabled
-			return;
-		}
+        if ($server->getConfig()->getSystemValue('updatechecker', true) !== true) {
+            // Updater check is disabled
+            return;
+        }
 
-		// Always register the notifier, so background jobs (without a user) can send push notifications
-		$this->registerNotifier();
+        // Always register the notifier, so background jobs (without a user) can send push notifications
+        $this->registerNotifier();
 
-		$user = $server->getUserSession()->getUser();
-		if (!$user instanceof IUser) {
-			// Nothing to do for guests
-			return;
-		}
+        $user = $server->getUserSession()->getUser();
+        if (!$user instanceof IUser) {
+            // Nothing to do for guests
+            return;
+        }
 
-		if (!$server->getAppManager()->isEnabledForUser('notifications') &&
-			$server->getGroupManager()->isAdmin($user->getUID())) {
-			try {
-				$updateChecker = $this->getContainer()->query(UpdateChecker::class);
-			} catch (QueryException $e) {
-				$server->getLogger()->logException($e);
-				return;
-			}
+        if (!$server->getAppManager()->isEnabledForUser('notifications') &&
+            $server->getGroupManager()->isAdmin($user->getUID())) {
+            try {
+                $updateChecker = $this->getContainer()->query(UpdateChecker::class);
+            } catch (QueryException $e) {
+                $server->getLogger()->logException($e);
+                return;
+            }
 
-			if ($updateChecker->getUpdateState() !== []) {
-				Util::addScript('updatenotification', 'legacy-notification');
-				\OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'populateJavaScriptVariables');
-			}
-		}
-	}
+            if ($updateChecker->getUpdateState() !== []) {
+                Util::addScript('updatenotification', 'legacy-notification');
+                \OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'populateJavaScriptVariables');
+            }
+        }
+    }
 
-	public function registerNotifier() {
-		$notificationsManager = $this->getContainer()->getServer()->getNotificationManager();
-		$notificationsManager->registerNotifierService(Notifier::class);
-	}
+    public function registerNotifier() {
+        $notificationsManager = $this->getContainer()->getServer()->getNotificationManager();
+        $notificationsManager->registerNotifierService(Notifier::class);
+    }
 }

apps/updatenotification/lib/Notification/Notifier.php

Indentation +157 added lines, -157 removed lines

@@ -39,161 +39,161 @@
 
 class Notifier implements INotifier {
 
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IManager */
-	protected $notificationManager;
-
-	/** @var IFactory */
-	protected $l10NFactory;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var string[] */
-	protected $appVersions;
-
-	/**
-	 * Notifier constructor.
-	 *
-	 * @param IURLGenerator $url
-	 * @param IConfig $config
-	 * @param IManager $notificationManager
-	 * @param IFactory $l10NFactory
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IURLGenerator $url, IConfig $config, IManager $notificationManager, IFactory $l10NFactory, IUserSession $userSession, IGroupManager $groupManager) {
-		$this->url = $url;
-		$this->notificationManager = $notificationManager;
-		$this->config = $config;
-		$this->l10NFactory = $l10NFactory;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->appVersions = $this->getAppVersions();
-	}
-
-	/**
-	 * Identifier of the notifier, only use [a-z0-9_]
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getID(): string {
-		return 'updatenotification';
-	}
-
-	/**
-	 * Human readable name describing the notifier
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getName(): string {
-		return $this->l10NFactory->get('updatenotification')->t('Update notifications');
-	}
-
-	/**
-	 * @param INotification $notification
-	 * @param string $languageCode The code of the language that should be used to prepare the notification
-	 * @return INotification
-	 * @throws \InvalidArgumentException When the notification was not prepared by a notifier
-	 * @throws AlreadyProcessedException When the notification is not needed anymore and should be deleted
-	 * @since 9.0.0
-	 */
-	public function prepare(INotification $notification, string $languageCode): INotification {
-		if ($notification->getApp() !== 'updatenotification') {
-			throw new \InvalidArgumentException('Unknown app id');
-		}
-
-		$l = $this->l10NFactory->get('updatenotification', $languageCode);
-		if ($notification->getSubject() === 'connection_error') {
-			$errors = (int) $this->config->getAppValue('updatenotification', 'update_check_errors', 0);
-			if ($errors === 0) {
-				$this->notificationManager->markProcessed($notification);
-				throw new \InvalidArgumentException('Update checked worked again');
-			}
-
-			$notification->setParsedSubject($l->t('The update server could not be reached since %d days to check for new updates.', [$errors]))
-				->setParsedMessage($l->t('Please check the Nextcloud and server log files for errors.'));
-		} elseif ($notification->getObjectType() === 'core') {
-			$this->updateAlreadyInstalledCheck($notification, $this->getCoreVersions());
-
-			$parameters = $notification->getSubjectParameters();
-			$notification->setParsedSubject($l->t('Update to %1$s is available.', [$parameters['version']]));
-
-			if ($this->isAdmin()) {
-				$notification->setLink($this->url->linkToRouteAbsolute('settings.AdminSettings.index', ['section' => 'overview']) . '#version');
-			}
-		} else {
-			$appInfo = $this->getAppInfo($notification->getObjectType());
-			$appName = ($appInfo === null) ? $notification->getObjectType() : $appInfo['name'];
-
-			if (isset($this->appVersions[$notification->getObjectType()])) {
-				$this->updateAlreadyInstalledCheck($notification, $this->appVersions[$notification->getObjectType()]);
-			}
-
-			$notification->setParsedSubject($l->t('Update for %1$s to version %2$s is available.', [$appName, $notification->getObjectId()]))
-				->setRichSubject($l->t('Update for {app} to version %s is available.', [$notification->getObjectId()]), [
-					'app' => [
-						'type' => 'app',
-						'id' => $notification->getObjectType(),
-						'name' => $appName,
-					]
-				]);
-
-			if ($this->isAdmin()) {
-				$notification->setLink($this->url->linkToRouteAbsolute('settings.AppSettings.viewApps', ['category' => 'updates']) . '#app-' . $notification->getObjectType());
-			}
-		}
-
-		$notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('updatenotification', 'notification.svg')));
-
-		return $notification;
-	}
-
-	/**
-	 * Remove the notification and prevent rendering, when the update is installed
-	 *
-	 * @param INotification $notification
-	 * @param string $installedVersion
-	 * @throws AlreadyProcessedException When the update is already installed
-	 */
-	protected function updateAlreadyInstalledCheck(INotification $notification, $installedVersion) {
-		if (version_compare($notification->getObjectId(), $installedVersion, '<=')) {
-			throw new AlreadyProcessedException();
-		}
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isAdmin(): bool {
-		$user = $this->userSession->getUser();
-
-		if ($user instanceof IUser) {
-			return $this->groupManager->isAdmin($user->getUID());
-		}
-
-		return false;
-	}
-
-	protected function getCoreVersions(): string {
-		return implode('.', Util::getVersion());
-	}
-
-	protected function getAppVersions(): array {
-		return \OC_App::getAppVersions();
-	}
-
-	protected function getAppInfo($appId) {
-		return \OC_App::getAppInfo($appId);
-	}
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IManager */
+    protected $notificationManager;
+
+    /** @var IFactory */
+    protected $l10NFactory;
+
+    /** @var IUserSession */
+    protected $userSession;
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var string[] */
+    protected $appVersions;
+
+    /**
+     * Notifier constructor.
+     *
+     * @param IURLGenerator $url
+     * @param IConfig $config
+     * @param IManager $notificationManager
+     * @param IFactory $l10NFactory
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IURLGenerator $url, IConfig $config, IManager $notificationManager, IFactory $l10NFactory, IUserSession $userSession, IGroupManager $groupManager) {
+        $this->url = $url;
+        $this->notificationManager = $notificationManager;
+        $this->config = $config;
+        $this->l10NFactory = $l10NFactory;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->appVersions = $this->getAppVersions();
+    }
+
+    /**
+     * Identifier of the notifier, only use [a-z0-9_]
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getID(): string {
+        return 'updatenotification';
+    }
+
+    /**
+     * Human readable name describing the notifier
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getName(): string {
+        return $this->l10NFactory->get('updatenotification')->t('Update notifications');
+    }
+
+    /**
+     * @param INotification $notification
+     * @param string $languageCode The code of the language that should be used to prepare the notification
+     * @return INotification
+     * @throws \InvalidArgumentException When the notification was not prepared by a notifier
+     * @throws AlreadyProcessedException When the notification is not needed anymore and should be deleted
+     * @since 9.0.0
+     */
+    public function prepare(INotification $notification, string $languageCode): INotification {
+        if ($notification->getApp() !== 'updatenotification') {
+            throw new \InvalidArgumentException('Unknown app id');
+        }
+
+        $l = $this->l10NFactory->get('updatenotification', $languageCode);
+        if ($notification->getSubject() === 'connection_error') {
+            $errors = (int) $this->config->getAppValue('updatenotification', 'update_check_errors', 0);
+            if ($errors === 0) {
+                $this->notificationManager->markProcessed($notification);
+                throw new \InvalidArgumentException('Update checked worked again');
+            }
+
+            $notification->setParsedSubject($l->t('The update server could not be reached since %d days to check for new updates.', [$errors]))
+                ->setParsedMessage($l->t('Please check the Nextcloud and server log files for errors.'));
+        } elseif ($notification->getObjectType() === 'core') {
+            $this->updateAlreadyInstalledCheck($notification, $this->getCoreVersions());
+
+            $parameters = $notification->getSubjectParameters();
+            $notification->setParsedSubject($l->t('Update to %1$s is available.', [$parameters['version']]));
+
+            if ($this->isAdmin()) {
+                $notification->setLink($this->url->linkToRouteAbsolute('settings.AdminSettings.index', ['section' => 'overview']) . '#version');
+            }
+        } else {
+            $appInfo = $this->getAppInfo($notification->getObjectType());
+            $appName = ($appInfo === null) ? $notification->getObjectType() : $appInfo['name'];
+
+            if (isset($this->appVersions[$notification->getObjectType()])) {
+                $this->updateAlreadyInstalledCheck($notification, $this->appVersions[$notification->getObjectType()]);
+            }
+
+            $notification->setParsedSubject($l->t('Update for %1$s to version %2$s is available.', [$appName, $notification->getObjectId()]))
+                ->setRichSubject($l->t('Update for {app} to version %s is available.', [$notification->getObjectId()]), [
+                    'app' => [
+                        'type' => 'app',
+                        'id' => $notification->getObjectType(),
+                        'name' => $appName,
+                    ]
+                ]);
+
+            if ($this->isAdmin()) {
+                $notification->setLink($this->url->linkToRouteAbsolute('settings.AppSettings.viewApps', ['category' => 'updates']) . '#app-' . $notification->getObjectType());
+            }
+        }
+
+        $notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('updatenotification', 'notification.svg')));
+
+        return $notification;
+    }
+
+    /**
+     * Remove the notification and prevent rendering, when the update is installed
+     *
+     * @param INotification $notification
+     * @param string $installedVersion
+     * @throws AlreadyProcessedException When the update is already installed
+     */
+    protected function updateAlreadyInstalledCheck(INotification $notification, $installedVersion) {
+        if (version_compare($notification->getObjectId(), $installedVersion, '<=')) {
+            throw new AlreadyProcessedException();
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isAdmin(): bool {
+        $user = $this->userSession->getUser();
+
+        if ($user instanceof IUser) {
+            return $this->groupManager->isAdmin($user->getUID());
+        }
+
+        return false;
+    }
+
+    protected function getCoreVersions(): string {
+        return implode('.', Util::getVersion());
+    }
+
+    protected function getAppVersions(): array {
+        return \OC_App::getAppVersions();
+    }
+
+    protected function getAppInfo($appId) {
+        return \OC_App::getAppInfo($appId);
+    }
 }

apps/federatedfilesharing/lib/Notifier.php

Indentation +213 added lines, -213 removed lines

@@ -35,217 +35,217 @@
 use OCP\Notification\INotifier;
 
 class Notifier implements INotifier {
-	/** @var IFactory */
-	protected $factory;
-	/** @var IManager */
-	protected $contactsManager;
-	/** @var IURLGenerator */
-	protected $url;
-	/** @var array */
-	protected $federatedContacts;
-	/** @var ICloudIdManager */
-	protected $cloudIdManager;
-
-	/**
-	 * @param IFactory $factory
-	 * @param IManager $contactsManager
-	 * @param IURLGenerator $url
-	 * @param ICloudIdManager $cloudIdManager
-	 */
-	public function __construct(IFactory $factory, IManager $contactsManager, IURLGenerator $url, ICloudIdManager $cloudIdManager) {
-		$this->factory = $factory;
-		$this->contactsManager = $contactsManager;
-		$this->url = $url;
-		$this->cloudIdManager = $cloudIdManager;
-	}
-
-	/**
-	 * Identifier of the notifier, only use [a-z0-9_]
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getID(): string {
-		return 'federatedfilesharing';
-	}
-
-	/**
-	 * Human readable name describing the notifier
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getName(): string {
-		return $this->factory->get('federatedfilesharing')->t('Federated sharing');
-	}
-
-	/**
-	 * @param INotification $notification
-	 * @param string $languageCode The code of the language that should be used to prepare the notification
-	 * @return INotification
-	 * @throws \InvalidArgumentException
-	 */
-	public function prepare(INotification $notification, string $languageCode): INotification {
-		if ($notification->getApp() !== 'files_sharing') {
-			// Not my app => throw
-			throw new \InvalidArgumentException();
-		}
-
-		// Read the language from the notification
-		$l = $this->factory->get('files_sharing', $languageCode);
-
-		switch ($notification->getSubject()) {
-			// Deal with known subjects
-			case 'remote_share':
-				$notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-
-				$params = $notification->getSubjectParameters();
-				if ($params[0] !== $params[1] && $params[1] !== null) {
-					$notification->setParsedSubject(
-						$l->t('You received "%3$s" as a remote share from %1$s (on behalf of %2$s)', $params)
-					);
-					$notification->setRichSubject(
-						$l->t('You received {share} as a remote share from {user} (on behalf of {behalf})'),
-						[
-							'share' => [
-								'type' => 'pending-federated-share',
-								'id' => $notification->getObjectId(),
-								'name' => $params[2],
-							],
-							'user' => $this->createRemoteUser($params[0]),
-							'behalf' => $this->createRemoteUser($params[1]),
-						]
-					);
-				} else {
-					$notification->setParsedSubject(
-						$l->t('You received "%3$s" as a remote share from %1$s', $params)
-					);
-					$notification->setRichSubject(
-						$l->t('You received {share} as a remote share from {user}'),
-						[
-							'share' => [
-								'type' => 'pending-federated-share',
-								'id' => $notification->getObjectId(),
-								'name' => $params[2],
-							],
-							'user' => $this->createRemoteUser($params[0]),
-						]
-					);
-				}
-
-				// Deal with the actions for a known subject
-				foreach ($notification->getActions() as $action) {
-					switch ($action->getLabel()) {
-						case 'accept':
-							$action->setParsedLabel(
-								(string) $l->t('Accept')
-							)
-							->setPrimary(true);
-							break;
-
-						case 'decline':
-							$action->setParsedLabel(
-								(string) $l->t('Decline')
-							);
-							break;
-					}
-
-					$notification->addParsedAction($action);
-				}
-				return $notification;
-
-			default:
-				// Unknown subject => Unknown notification => throw
-				throw new \InvalidArgumentException();
-		}
-	}
-
-	/**
-	 * @param string $cloudId
-	 * @return array
-	 */
-	protected function createRemoteUser($cloudId) {
-		$displayName = $cloudId;
-		try {
-			$resolvedId = $this->cloudIdManager->resolveCloudId($cloudId);
-			$displayName = $this->getDisplayName($resolvedId);
-			$user = $resolvedId->getUser();
-			$server = $resolvedId->getRemote();
-		} catch (HintException $e) {
-			$user = $cloudId;
-			$server = '';
-		}
-
-		return [
-			'type' => 'user',
-			'id' => $user,
-			'name' => $displayName,
-			'server' => $server,
-		];
-	}
-
-	/**
-	 * Try to find the user in the contacts
-	 *
-	 * @param ICloudId $cloudId
-	 * @return string
-	 */
-	protected function getDisplayName(ICloudId $cloudId) {
-		$server = $cloudId->getRemote();
-		$user = $cloudId->getUser();
-		if (strpos($server, 'http://') === 0) {
-			$server = substr($server, strlen('http://'));
-		} else if (strpos($server, 'https://') === 0) {
-			$server = substr($server, strlen('https://'));
-		}
-
-		try {
-			return $this->getDisplayNameFromContact($cloudId->getId());
-		} catch (\OutOfBoundsException $e) {
-		}
-
-		try {
-			$this->getDisplayNameFromContact($user . '@http://' . $server);
-		} catch (\OutOfBoundsException $e) {
-		}
-
-		try {
-			$this->getDisplayNameFromContact($user . '@https://' . $server);
-		} catch (\OutOfBoundsException $e) {
-		}
-
-		return $cloudId->getId();
-	}
-
-	/**
-	 * Try to find the user in the contacts
-	 *
-	 * @param string $federatedCloudId
-	 * @return string
-	 * @throws \OutOfBoundsException when there is no contact for the id
-	 */
-	protected function getDisplayNameFromContact($federatedCloudId) {
-		if (isset($this->federatedContacts[$federatedCloudId])) {
-			if ($this->federatedContacts[$federatedCloudId] !== '') {
-				return $this->federatedContacts[$federatedCloudId];
-			} else {
-				throw new \OutOfBoundsException('No contact found for federated cloud id');
-			}
-		}
-
-		$addressBookEntries = $this->contactsManager->search($federatedCloudId, ['CLOUD']);
-		foreach ($addressBookEntries as $entry) {
-			if (isset($entry['CLOUD'])) {
-				foreach ($entry['CLOUD'] as $cloudID) {
-					if ($cloudID === $federatedCloudId) {
-						$this->federatedContacts[$federatedCloudId] = $entry['FN'];
-						return $entry['FN'];
-					}
-				}
-			}
-		}
-
-		$this->federatedContacts[$federatedCloudId] = '';
-		throw new \OutOfBoundsException('No contact found for federated cloud id');
-	}
+    /** @var IFactory */
+    protected $factory;
+    /** @var IManager */
+    protected $contactsManager;
+    /** @var IURLGenerator */
+    protected $url;
+    /** @var array */
+    protected $federatedContacts;
+    /** @var ICloudIdManager */
+    protected $cloudIdManager;
+
+    /**
+     * @param IFactory $factory
+     * @param IManager $contactsManager
+     * @param IURLGenerator $url
+     * @param ICloudIdManager $cloudIdManager
+     */
+    public function __construct(IFactory $factory, IManager $contactsManager, IURLGenerator $url, ICloudIdManager $cloudIdManager) {
+        $this->factory = $factory;
+        $this->contactsManager = $contactsManager;
+        $this->url = $url;
+        $this->cloudIdManager = $cloudIdManager;
+    }
+
+    /**
+     * Identifier of the notifier, only use [a-z0-9_]
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getID(): string {
+        return 'federatedfilesharing';
+    }
+
+    /**
+     * Human readable name describing the notifier
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getName(): string {
+        return $this->factory->get('federatedfilesharing')->t('Federated sharing');
+    }
+
+    /**
+     * @param INotification $notification
+     * @param string $languageCode The code of the language that should be used to prepare the notification
+     * @return INotification
+     * @throws \InvalidArgumentException
+     */
+    public function prepare(INotification $notification, string $languageCode): INotification {
+        if ($notification->getApp() !== 'files_sharing') {
+            // Not my app => throw
+            throw new \InvalidArgumentException();
+        }
+
+        // Read the language from the notification
+        $l = $this->factory->get('files_sharing', $languageCode);
+
+        switch ($notification->getSubject()) {
+            // Deal with known subjects
+            case 'remote_share':
+                $notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+
+                $params = $notification->getSubjectParameters();
+                if ($params[0] !== $params[1] && $params[1] !== null) {
+                    $notification->setParsedSubject(
+                        $l->t('You received "%3$s" as a remote share from %1$s (on behalf of %2$s)', $params)
+                    );
+                    $notification->setRichSubject(
+                        $l->t('You received {share} as a remote share from {user} (on behalf of {behalf})'),
+                        [
+                            'share' => [
+                                'type' => 'pending-federated-share',
+                                'id' => $notification->getObjectId(),
+                                'name' => $params[2],
+                            ],
+                            'user' => $this->createRemoteUser($params[0]),
+                            'behalf' => $this->createRemoteUser($params[1]),
+                        ]
+                    );
+                } else {
+                    $notification->setParsedSubject(
+                        $l->t('You received "%3$s" as a remote share from %1$s', $params)
+                    );
+                    $notification->setRichSubject(
+                        $l->t('You received {share} as a remote share from {user}'),
+                        [
+                            'share' => [
+                                'type' => 'pending-federated-share',
+                                'id' => $notification->getObjectId(),
+                                'name' => $params[2],
+                            ],
+                            'user' => $this->createRemoteUser($params[0]),
+                        ]
+                    );
+                }
+
+                // Deal with the actions for a known subject
+                foreach ($notification->getActions() as $action) {
+                    switch ($action->getLabel()) {
+                        case 'accept':
+                            $action->setParsedLabel(
+                                (string) $l->t('Accept')
+                            )
+                            ->setPrimary(true);
+                            break;
+
+                        case 'decline':
+                            $action->setParsedLabel(
+                                (string) $l->t('Decline')
+                            );
+                            break;
+                    }
+
+                    $notification->addParsedAction($action);
+                }
+                return $notification;
+
+            default:
+                // Unknown subject => Unknown notification => throw
+                throw new \InvalidArgumentException();
+        }
+    }
+
+    /**
+     * @param string $cloudId
+     * @return array
+     */
+    protected function createRemoteUser($cloudId) {
+        $displayName = $cloudId;
+        try {
+            $resolvedId = $this->cloudIdManager->resolveCloudId($cloudId);
+            $displayName = $this->getDisplayName($resolvedId);
+            $user = $resolvedId->getUser();
+            $server = $resolvedId->getRemote();
+        } catch (HintException $e) {
+            $user = $cloudId;
+            $server = '';
+        }
+
+        return [
+            'type' => 'user',
+            'id' => $user,
+            'name' => $displayName,
+            'server' => $server,
+        ];
+    }
+
+    /**
+     * Try to find the user in the contacts
+     *
+     * @param ICloudId $cloudId
+     * @return string
+     */
+    protected function getDisplayName(ICloudId $cloudId) {
+        $server = $cloudId->getRemote();
+        $user = $cloudId->getUser();
+        if (strpos($server, 'http://') === 0) {
+            $server = substr($server, strlen('http://'));
+        } else if (strpos($server, 'https://') === 0) {
+            $server = substr($server, strlen('https://'));
+        }
+
+        try {
+            return $this->getDisplayNameFromContact($cloudId->getId());
+        } catch (\OutOfBoundsException $e) {
+        }
+
+        try {
+            $this->getDisplayNameFromContact($user . '@http://' . $server);
+        } catch (\OutOfBoundsException $e) {
+        }
+
+        try {
+            $this->getDisplayNameFromContact($user . '@https://' . $server);
+        } catch (\OutOfBoundsException $e) {
+        }
+
+        return $cloudId->getId();
+    }
+
+    /**
+     * Try to find the user in the contacts
+     *
+     * @param string $federatedCloudId
+     * @return string
+     * @throws \OutOfBoundsException when there is no contact for the id
+     */
+    protected function getDisplayNameFromContact($federatedCloudId) {
+        if (isset($this->federatedContacts[$federatedCloudId])) {
+            if ($this->federatedContacts[$federatedCloudId] !== '') {
+                return $this->federatedContacts[$federatedCloudId];
+            } else {
+                throw new \OutOfBoundsException('No contact found for federated cloud id');
+            }
+        }
+
+        $addressBookEntries = $this->contactsManager->search($federatedCloudId, ['CLOUD']);
+        foreach ($addressBookEntries as $entry) {
+            if (isset($entry['CLOUD'])) {
+                foreach ($entry['CLOUD'] as $cloudID) {
+                    if ($cloudID === $federatedCloudId) {
+                        $this->federatedContacts[$federatedCloudId] = $entry['FN'];
+                        return $entry['FN'];
+                    }
+                }
+            }
+        }
+
+        $this->federatedContacts[$federatedCloudId] = '';
+        throw new \OutOfBoundsException('No contact found for federated cloud id');
+    }
 }

apps/federatedfilesharing/appinfo/app.php

Indentation +6 added lines, -6 removed lines

@@ -34,10 +34,10 @@
 $federatedShareProvider = $app->getFederatedShareProvider();
 
 $eventDispatcher->addListener(
-	'OCA\Files::loadAdditionalScripts',
-	function() use ($federatedShareProvider) {
-		if ($federatedShareProvider->isIncomingServer2serverShareEnabled()) {
-			\OCP\Util::addScript('federatedfilesharing', 'external');
-		}
-	}
+    'OCA\Files::loadAdditionalScripts',
+    function() use ($federatedShareProvider) {
+        if ($federatedShareProvider->isIncomingServer2serverShareEnabled()) {
+            \OCP\Util::addScript('federatedfilesharing', 'external');
+        }
+    }
 );

apps/twofactor_backupcodes/lib/AppInfo/Application.php

Indentation +35 added lines, -35 removed lines

@@ -41,45 +41,45 @@
 use OCP\Util;
 
 class Application extends App {
-	public function __construct() {
-		parent::__construct('twofactor_backupcodes');
-	}
+    public function __construct() {
+        parent::__construct('twofactor_backupcodes');
+    }
 
-	/**
-	 * Register the different app parts
-	 */
-	public function register() {
-		$this->registerHooksAndEvents();
-		$this->registerNotification();
-	}
+    /**
+     * Register the different app parts
+     */
+    public function register() {
+        $this->registerHooksAndEvents();
+        $this->registerNotification();
+    }
 
-	/**
-	 * Register the hooks and events
-	 */
-	public function registerHooksAndEvents() {
-		Util::connectHook('OC_User', 'post_deleteUser', $this, 'deleteUser');
+    /**
+     * Register the hooks and events
+     */
+    public function registerHooksAndEvents() {
+        Util::connectHook('OC_User', 'post_deleteUser', $this, 'deleteUser');
 
-		$container = $this->getContainer();
+        $container = $this->getContainer();
 
-		/** @var IEventDispatcher $eventDispatcher */
-		$eventDispatcher = $container->query(IEventDispatcher::class);
-		$eventDispatcher->addServiceListener(CodesGenerated::class, ActivityPublisher::class);
-		$eventDispatcher->addServiceListener(CodesGenerated::class, RegistryUpdater::class);
-		$eventDispatcher->addServiceListener(CodesGenerated::class, ClearNotifications::class);
-		$eventDispatcher->addServiceListener(IRegistry::EVENT_PROVIDER_ENABLED, ProviderEnabled::class);
-		$eventDispatcher->addServiceListener(IRegistry::EVENT_PROVIDER_DISABLED, ProviderDisabled::class);
-	}
+        /** @var IEventDispatcher $eventDispatcher */
+        $eventDispatcher = $container->query(IEventDispatcher::class);
+        $eventDispatcher->addServiceListener(CodesGenerated::class, ActivityPublisher::class);
+        $eventDispatcher->addServiceListener(CodesGenerated::class, RegistryUpdater::class);
+        $eventDispatcher->addServiceListener(CodesGenerated::class, ClearNotifications::class);
+        $eventDispatcher->addServiceListener(IRegistry::EVENT_PROVIDER_ENABLED, ProviderEnabled::class);
+        $eventDispatcher->addServiceListener(IRegistry::EVENT_PROVIDER_DISABLED, ProviderDisabled::class);
+    }
 
-	public function registerNotification() {
-		$container = $this->getContainer();
-		/** @var IManager $manager */
-		$manager = $container->query(IManager::class);
-		$manager->registerNotifierService(Notifier::class);
-	}
+    public function registerNotification() {
+        $container = $this->getContainer();
+        /** @var IManager $manager */
+        $manager = $container->query(IManager::class);
+        $manager->registerNotifierService(Notifier::class);
+    }
 
-	public function deleteUser($params) {
-		/** @var BackupCodeMapper $mapper */
-		$mapper = $this->getContainer()->query(BackupCodeMapper::class);
-		$mapper->deleteCodesByUserId($params['uid']);
-	}
+    public function deleteUser($params) {
+        /** @var BackupCodeMapper $mapper */
+        $mapper = $this->getContainer()->query(BackupCodeMapper::class);
+        $mapper->deleteCodesByUserId($params['uid']);
+    }
 }

apps/twofactor_backupcodes/lib/Notifications/Notifier.php

Indentation +48 added lines, -48 removed lines

@@ -31,63 +31,63 @@
 
 class Notifier implements INotifier {
 
-	/** @var IFactory */
-	private $factory;
+    /** @var IFactory */
+    private $factory;
 
-	/** @var IURLGenerator */
-	private $url;
+    /** @var IURLGenerator */
+    private $url;
 
-	public function __construct(IFactory $factory, IURLGenerator $url) {
-		$this->factory = $factory;
-		$this->url = $url;
-	}
+    public function __construct(IFactory $factory, IURLGenerator $url) {
+        $this->factory = $factory;
+        $this->url = $url;
+    }
 
-	/**
-	 * Identifier of the notifier, only use [a-z0-9_]
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getID(): string {
-		return 'twofactor_backupcodes';
-	}
+    /**
+     * Identifier of the notifier, only use [a-z0-9_]
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getID(): string {
+        return 'twofactor_backupcodes';
+    }
 
-	/**
-	 * Human readable name describing the notifier
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getName(): string {
-		return $this->factory->get('twofactor_backupcodes')->t('Second-factor backup codes');
-	}
+    /**
+     * Human readable name describing the notifier
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getName(): string {
+        return $this->factory->get('twofactor_backupcodes')->t('Second-factor backup codes');
+    }
 
-	public function prepare(INotification $notification, string $languageCode): INotification {
-		if ($notification->getApp() !== 'twofactor_backupcodes') {
-			// Not my app => throw
-			throw new \InvalidArgumentException();
-		}
+    public function prepare(INotification $notification, string $languageCode): INotification {
+        if ($notification->getApp() !== 'twofactor_backupcodes') {
+            // Not my app => throw
+            throw new \InvalidArgumentException();
+        }
 
-		// Read the language from the notification
-		$l = $this->factory->get('twofactor_backupcodes', $languageCode);
+        // Read the language from the notification
+        $l = $this->factory->get('twofactor_backupcodes', $languageCode);
 
-		switch ($notification->getSubject()) {
-			case 'create_backupcodes':
-				$notification->setParsedSubject(
-					$l->t('Generate backup codes')
-				)->setParsedMessage(
-					$l->t('You enabled two-factor authentication but did not generate backup codes yet. They are needed to restore access to your account in case you lose your second factor.')
-				);
+        switch ($notification->getSubject()) {
+            case 'create_backupcodes':
+                $notification->setParsedSubject(
+                    $l->t('Generate backup codes')
+                )->setParsedMessage(
+                    $l->t('You enabled two-factor authentication but did not generate backup codes yet. They are needed to restore access to your account in case you lose your second factor.')
+                );
 
-				$notification->setLink($this->url->linkToRouteAbsolute('settings.PersonalSettings.index', ['section' => 'security']));
+                $notification->setLink($this->url->linkToRouteAbsolute('settings.PersonalSettings.index', ['section' => 'security']));
 
-				$notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/password.svg')));
+                $notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/password.svg')));
 
-				return $notification;
+                return $notification;
 
-			default:
-				// Unknown subject => Unknown notification => throw
-				throw new \InvalidArgumentException();
-		}
-	}
+            default:
+                // Unknown subject => Unknown notification => throw
+                throw new \InvalidArgumentException();
+        }
+    }
 }

apps/comments/lib/AppInfo/Application.php

Indentation +40 added lines, -40 removed lines

@@ -35,53 +35,53 @@
 
 class Application extends App {
 
-	public function __construct (array $urlParams = array()) {
-		parent::__construct('comments', $urlParams);
-		$container = $this->getContainer();
+    public function __construct (array $urlParams = array()) {
+        parent::__construct('comments', $urlParams);
+        $container = $this->getContainer();
 
-		$container->registerAlias('NotificationsController', Notifications::class);
+        $container->registerAlias('NotificationsController', Notifications::class);
 
-		$jsSettingsHelper = new JSSettingsHelper($container->getServer());
-		Util::connectHook('\OCP\Config', 'js', $jsSettingsHelper, 'extend');
-	}
+        $jsSettingsHelper = new JSSettingsHelper($container->getServer());
+        Util::connectHook('\OCP\Config', 'js', $jsSettingsHelper, 'extend');
+    }
 
-	public function register() {
-		$server = $this->getContainer()->getServer();
+    public function register() {
+        $server = $this->getContainer()->getServer();
 
-		$dispatcher = $server->getEventDispatcher();
-		$this->registerSidebarScripts($dispatcher);
-		$this->registerDavEntity($dispatcher);
-		$this->registerNotifier();
-		$this->registerCommentsEventHandler();
+        $dispatcher = $server->getEventDispatcher();
+        $this->registerSidebarScripts($dispatcher);
+        $this->registerDavEntity($dispatcher);
+        $this->registerNotifier();
+        $this->registerCommentsEventHandler();
 
-		$server->getSearch()->registerProvider(Provider::class, ['apps' => ['files']]);
-	}
+        $server->getSearch()->registerProvider(Provider::class, ['apps' => ['files']]);
+    }
 
-	protected function registerSidebarScripts(EventDispatcherInterface $dispatcher) {
-		$dispatcher->addListener(
-			'OCA\Files::loadAdditionalScripts',
-			function() {
-				Util::addScript('comments', 'comments');
-			}
-		);
-	}
+    protected function registerSidebarScripts(EventDispatcherInterface $dispatcher) {
+        $dispatcher->addListener(
+            'OCA\Files::loadAdditionalScripts',
+            function() {
+                Util::addScript('comments', 'comments');
+            }
+        );
+    }
 
-	protected function registerDavEntity(EventDispatcherInterface $dispatcher) {
-		$dispatcher->addListener(CommentsEntityEvent::EVENT_ENTITY, function(CommentsEntityEvent $event) {
-			$event->addEntityCollection('files', function($name) {
-				$nodes = \OC::$server->getUserFolder()->getById((int)$name);
-				return !empty($nodes);
-			});
-		});
-	}
+    protected function registerDavEntity(EventDispatcherInterface $dispatcher) {
+        $dispatcher->addListener(CommentsEntityEvent::EVENT_ENTITY, function(CommentsEntityEvent $event) {
+            $event->addEntityCollection('files', function($name) {
+                $nodes = \OC::$server->getUserFolder()->getById((int)$name);
+                return !empty($nodes);
+            });
+        });
+    }
 
-	protected function registerNotifier() {
-		$this->getContainer()->getServer()->getNotificationManager()->registerNotifierService(Notifier::class);
-	}
+    protected function registerNotifier() {
+        $this->getContainer()->getServer()->getNotificationManager()->registerNotifierService(Notifier::class);
+    }
 
-	protected function registerCommentsEventHandler() {
-		$this->getContainer()->getServer()->getCommentsManager()->registerEventHandler(function () {
-			return $this->getContainer()->query(EventHandler::class);
-		});
-	}
+    protected function registerCommentsEventHandler() {
+        $this->getContainer()->getServer()->getCommentsManager()->registerEventHandler(function () {
+            return $this->getContainer()->query(EventHandler::class);
+        });
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
 
 class Application extends App {
 
-	public function __construct (array $urlParams = array()) {
+	public function __construct(array $urlParams = array()) {
 		parent::__construct('comments', $urlParams);
 		$container = $this->getContainer();
 
@@ -69,7 +69,7 @@ 
 	protected function registerDavEntity(EventDispatcherInterface $dispatcher) {
 		$dispatcher->addListener(CommentsEntityEvent::EVENT_ENTITY, function(CommentsEntityEvent $event) {
 			$event->addEntityCollection('files', function($name) {
-				$nodes = \OC::$server->getUserFolder()->getById((int)$name);
+				$nodes = \OC::$server->getUserFolder()->getById((int) $name);
 				return !empty($nodes);
 			});
 		});
@@ -80,7 +80,7 @@ 
 	}
 
 	protected function registerCommentsEventHandler() {
-		$this->getContainer()->getServer()->getCommentsManager()->registerEventHandler(function () {
+		$this->getContainer()->getServer()->getCommentsManager()->registerEventHandler(function() {
 			return $this->getContainer()->query(EventHandler::class);
 		});
 	}