nextcloud / server

apps/comments/lib/AppInfo/Application.php

Indentation +35 added lines, -35 removed lines

@@ -47,48 +47,48 @@
 use OCP\Util;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'comments';
+    public const APP_ID = 'comments';
 
-	public function __construct(array $urlParams = []) {
-		parent::__construct(self::APP_ID, $urlParams);
-	}
+    public function __construct(array $urlParams = []) {
+        parent::__construct(self::APP_ID, $urlParams);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerCapability(Capabilities::class);
+    public function register(IRegistrationContext $context): void {
+        $context->registerCapability(Capabilities::class);
 
-		$context->registerServiceAlias('NotificationsController', Notifications::class);
+        $context->registerServiceAlias('NotificationsController', Notifications::class);
 
-		$context->registerEventListener(
-			LoadAdditionalScriptsEvent::class,
-			LoadAdditionalScripts::class
-		);
-		$context->registerEventListener(
-			LoadSidebar::class,
-			LoadSidebarScripts::class
-		);
-		$context->registerEventListener(
-			CommentsEntityEvent::EVENT_ENTITY,
-			CommentsEntityEventListener::class
-		);
-	}
+        $context->registerEventListener(
+            LoadAdditionalScriptsEvent::class,
+            LoadAdditionalScripts::class
+        );
+        $context->registerEventListener(
+            LoadSidebar::class,
+            LoadSidebarScripts::class
+        );
+        $context->registerEventListener(
+            CommentsEntityEvent::EVENT_ENTITY,
+            CommentsEntityEventListener::class
+        );
+    }
 
-	public function boot(IBootContext $context): void {
-		$this->registerNotifier($context->getServerContainer());
-		$this->registerCommentsEventHandler($context->getServerContainer());
+    public function boot(IBootContext $context): void {
+        $this->registerNotifier($context->getServerContainer());
+        $this->registerCommentsEventHandler($context->getServerContainer());
 
-		$jsSettingsHelper = new JSSettingsHelper($context->getServerContainer());
-		Util::connectHook('\OCP\Config', 'js', $jsSettingsHelper, 'extend');
+        $jsSettingsHelper = new JSSettingsHelper($context->getServerContainer());
+        Util::connectHook('\OCP\Config', 'js', $jsSettingsHelper, 'extend');
 
-		$context->getServerContainer()->getSearch()->registerProvider(Provider::class, ['apps' => ['files']]);
-	}
+        $context->getServerContainer()->getSearch()->registerProvider(Provider::class, ['apps' => ['files']]);
+    }
 
-	protected function registerNotifier(IServerContainer $container) {
-		$container->getNotificationManager()->registerNotifierService(Notifier::class);
-	}
+    protected function registerNotifier(IServerContainer $container) {
+        $container->getNotificationManager()->registerNotifierService(Notifier::class);
+    }
 
-	protected function registerCommentsEventHandler(IServerContainer $container) {
-		$container->getCommentsManager()->registerEventHandler(function () {
-			return $this->getContainer()->query(EventHandler::class);
-		});
-	}
+    protected function registerCommentsEventHandler(IServerContainer $container) {
+        $container->getCommentsManager()->registerEventHandler(function () {
+            return $this->getContainer()->query(EventHandler::class);
+        });
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
 	}
 
 	protected function registerCommentsEventHandler(IServerContainer $container) {
-		$container->getCommentsManager()->registerEventHandler(function () {
+		$container->getCommentsManager()->registerEventHandler(function() {
 			return $this->getContainer()->query(EventHandler::class);
 		});
 	}

apps/comments/lib/Listener/CommentsEntityEventListener.php

Indentation +10 added lines, -10 removed lines

@@ -30,15 +30,15 @@
 use OCP\EventDispatcher\IEventListener;
 
 class CommentsEntityEventListener implements IEventListener {
-	public function handle(Event $event): void {
-		if (!($event instanceof CommentsEntityEvent)) {
-			// Unrelated
-			return;
-		}
+    public function handle(Event $event): void {
+        if (!($event instanceof CommentsEntityEvent)) {
+            // Unrelated
+            return;
+        }
 
-		$event->addEntityCollection('files', function ($name) {
-			$nodes = \OC::$server->getUserFolder()->getById((int)$name);
-			return !empty($nodes);
-		});
-	}
+        $event->addEntityCollection('files', function ($name) {
+            $nodes = \OC::$server->getUserFolder()->getById((int)$name);
+            return !empty($nodes);
+        });
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -36,8 +36,8 @@
 			return;
 		}
 
-		$event->addEntityCollection('files', function ($name) {
-			$nodes = \OC::$server->getUserFolder()->getById((int)$name);
+		$event->addEntityCollection('files', function($name) {
+			$nodes = \OC::$server->getUserFolder()->getById((int) $name);
 			return !empty($nodes);
 		});
 	}

apps/comments/composer/composer/autoload_classmap.php

Spacing +17 added lines, -17 removed lines

@@ -6,21 +6,21 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\Comments\\Activity\\Filter' => $baseDir . '/../lib/Activity/Filter.php',
-    'OCA\\Comments\\Activity\\Listener' => $baseDir . '/../lib/Activity/Listener.php',
-    'OCA\\Comments\\Activity\\Provider' => $baseDir . '/../lib/Activity/Provider.php',
-    'OCA\\Comments\\Activity\\Setting' => $baseDir . '/../lib/Activity/Setting.php',
-    'OCA\\Comments\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\Comments\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
-    'OCA\\Comments\\Collaboration\\CommentersSorter' => $baseDir . '/../lib/Collaboration/CommentersSorter.php',
-    'OCA\\Comments\\Controller\\Notifications' => $baseDir . '/../lib/Controller/Notifications.php',
-    'OCA\\Comments\\EventHandler' => $baseDir . '/../lib/EventHandler.php',
-    'OCA\\Comments\\JSSettingsHelper' => $baseDir . '/../lib/JSSettingsHelper.php',
-    'OCA\\Comments\\Listener\\CommentsEntityEventListener' => $baseDir . '/../lib/Listener/CommentsEntityEventListener.php',
-    'OCA\\Comments\\Listener\\LoadAdditionalScripts' => $baseDir . '/../lib/Listener/LoadAdditionalScripts.php',
-    'OCA\\Comments\\Listener\\LoadSidebarScripts' => $baseDir . '/../lib/Listener/LoadSidebarScripts.php',
-    'OCA\\Comments\\Notification\\Listener' => $baseDir . '/../lib/Notification/Listener.php',
-    'OCA\\Comments\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php',
-    'OCA\\Comments\\Search\\Provider' => $baseDir . '/../lib/Search/Provider.php',
-    'OCA\\Comments\\Search\\Result' => $baseDir . '/../lib/Search/Result.php',
+    'OCA\\Comments\\Activity\\Filter' => $baseDir.'/../lib/Activity/Filter.php',
+    'OCA\\Comments\\Activity\\Listener' => $baseDir.'/../lib/Activity/Listener.php',
+    'OCA\\Comments\\Activity\\Provider' => $baseDir.'/../lib/Activity/Provider.php',
+    'OCA\\Comments\\Activity\\Setting' => $baseDir.'/../lib/Activity/Setting.php',
+    'OCA\\Comments\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\Comments\\Capabilities' => $baseDir.'/../lib/Capabilities.php',
+    'OCA\\Comments\\Collaboration\\CommentersSorter' => $baseDir.'/../lib/Collaboration/CommentersSorter.php',
+    'OCA\\Comments\\Controller\\Notifications' => $baseDir.'/../lib/Controller/Notifications.php',
+    'OCA\\Comments\\EventHandler' => $baseDir.'/../lib/EventHandler.php',
+    'OCA\\Comments\\JSSettingsHelper' => $baseDir.'/../lib/JSSettingsHelper.php',
+    'OCA\\Comments\\Listener\\CommentsEntityEventListener' => $baseDir.'/../lib/Listener/CommentsEntityEventListener.php',
+    'OCA\\Comments\\Listener\\LoadAdditionalScripts' => $baseDir.'/../lib/Listener/LoadAdditionalScripts.php',
+    'OCA\\Comments\\Listener\\LoadSidebarScripts' => $baseDir.'/../lib/Listener/LoadSidebarScripts.php',
+    'OCA\\Comments\\Notification\\Listener' => $baseDir.'/../lib/Notification/Listener.php',
+    'OCA\\Comments\\Notification\\Notifier' => $baseDir.'/../lib/Notification/Notifier.php',
+    'OCA\\Comments\\Search\\Provider' => $baseDir.'/../lib/Search/Provider.php',
+    'OCA\\Comments\\Search\\Result' => $baseDir.'/../lib/Search/Result.php',
 );

apps/comments/composer/composer/autoload_static.php

Spacing +24 added lines, -24 removed lines

@@ -6,43 +6,43 @@
 
 class ComposerStaticInitComments
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\Comments\\' => 13,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Comments\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'OCA\\Comments\\Activity\\Filter' => __DIR__ . '/..' . '/../lib/Activity/Filter.php',
-        'OCA\\Comments\\Activity\\Listener' => __DIR__ . '/..' . '/../lib/Activity/Listener.php',
-        'OCA\\Comments\\Activity\\Provider' => __DIR__ . '/..' . '/../lib/Activity/Provider.php',
-        'OCA\\Comments\\Activity\\Setting' => __DIR__ . '/..' . '/../lib/Activity/Setting.php',
-        'OCA\\Comments\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Comments\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
-        'OCA\\Comments\\Collaboration\\CommentersSorter' => __DIR__ . '/..' . '/../lib/Collaboration/CommentersSorter.php',
-        'OCA\\Comments\\Controller\\Notifications' => __DIR__ . '/..' . '/../lib/Controller/Notifications.php',
-        'OCA\\Comments\\EventHandler' => __DIR__ . '/..' . '/../lib/EventHandler.php',
-        'OCA\\Comments\\JSSettingsHelper' => __DIR__ . '/..' . '/../lib/JSSettingsHelper.php',
-        'OCA\\Comments\\Listener\\CommentsEntityEventListener' => __DIR__ . '/..' . '/../lib/Listener/CommentsEntityEventListener.php',
-        'OCA\\Comments\\Listener\\LoadAdditionalScripts' => __DIR__ . '/..' . '/../lib/Listener/LoadAdditionalScripts.php',
-        'OCA\\Comments\\Listener\\LoadSidebarScripts' => __DIR__ . '/..' . '/../lib/Listener/LoadSidebarScripts.php',
-        'OCA\\Comments\\Notification\\Listener' => __DIR__ . '/..' . '/../lib/Notification/Listener.php',
-        'OCA\\Comments\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php',
-        'OCA\\Comments\\Search\\Provider' => __DIR__ . '/..' . '/../lib/Search/Provider.php',
-        'OCA\\Comments\\Search\\Result' => __DIR__ . '/..' . '/../lib/Search/Result.php',
+    public static $classMap = array(
+        'OCA\\Comments\\Activity\\Filter' => __DIR__.'/..'.'/../lib/Activity/Filter.php',
+        'OCA\\Comments\\Activity\\Listener' => __DIR__.'/..'.'/../lib/Activity/Listener.php',
+        'OCA\\Comments\\Activity\\Provider' => __DIR__.'/..'.'/../lib/Activity/Provider.php',
+        'OCA\\Comments\\Activity\\Setting' => __DIR__.'/..'.'/../lib/Activity/Setting.php',
+        'OCA\\Comments\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Comments\\Capabilities' => __DIR__.'/..'.'/../lib/Capabilities.php',
+        'OCA\\Comments\\Collaboration\\CommentersSorter' => __DIR__.'/..'.'/../lib/Collaboration/CommentersSorter.php',
+        'OCA\\Comments\\Controller\\Notifications' => __DIR__.'/..'.'/../lib/Controller/Notifications.php',
+        'OCA\\Comments\\EventHandler' => __DIR__.'/..'.'/../lib/EventHandler.php',
+        'OCA\\Comments\\JSSettingsHelper' => __DIR__.'/..'.'/../lib/JSSettingsHelper.php',
+        'OCA\\Comments\\Listener\\CommentsEntityEventListener' => __DIR__.'/..'.'/../lib/Listener/CommentsEntityEventListener.php',
+        'OCA\\Comments\\Listener\\LoadAdditionalScripts' => __DIR__.'/..'.'/../lib/Listener/LoadAdditionalScripts.php',
+        'OCA\\Comments\\Listener\\LoadSidebarScripts' => __DIR__.'/..'.'/../lib/Listener/LoadSidebarScripts.php',
+        'OCA\\Comments\\Notification\\Listener' => __DIR__.'/..'.'/../lib/Notification/Listener.php',
+        'OCA\\Comments\\Notification\\Notifier' => __DIR__.'/..'.'/../lib/Notification/Notifier.php',
+        'OCA\\Comments\\Search\\Provider' => __DIR__.'/..'.'/../lib/Search/Provider.php',
+        'OCA\\Comments\\Search\\Result' => __DIR__.'/..'.'/../lib/Search/Result.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitComments::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitComments::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitComments::$classMap;

apps/twofactor_backupcodes/lib/AppInfo/Application.php

Indentation +31 added lines, -31 removed lines

@@ -45,42 +45,42 @@
 use OCP\Util;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'twofactor_backupcodes';
+    public const APP_ID = 'twofactor_backupcodes';
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$this->registerHooksAndEvents($context);
-	}
+    public function register(IRegistrationContext $context): void {
+        $this->registerHooksAndEvents($context);
+    }
 
-	public function boot(IBootContext $context): void {
-		Util::connectHook('OC_User', 'post_deleteUser', $this, 'deleteUser');
+    public function boot(IBootContext $context): void {
+        Util::connectHook('OC_User', 'post_deleteUser', $this, 'deleteUser');
 
-		$this->registerNotification(
-			$context->getAppContainer()->query(IManager::class)
-		);
-	}
+        $this->registerNotification(
+            $context->getAppContainer()->query(IManager::class)
+        );
+    }
 
-	/**
-	 * Register the hooks and events
-	 */
-	public function registerHooksAndEvents(IRegistrationContext $context) {
-		$context->registerEventListener(CodesGenerated::class, ActivityPublisher::class);
-		$context->registerEventListener(CodesGenerated::class, RegistryUpdater::class);
-		$context->registerEventListener(CodesGenerated::class, ClearNotifications::class);
-		$context->registerEventListener(IRegistry::EVENT_PROVIDER_ENABLED, ProviderEnabled::class);
-		$context->registerEventListener(IRegistry::EVENT_PROVIDER_DISABLED, ProviderDisabled::class);
-	}
+    /**
+     * Register the hooks and events
+     */
+    public function registerHooksAndEvents(IRegistrationContext $context) {
+        $context->registerEventListener(CodesGenerated::class, ActivityPublisher::class);
+        $context->registerEventListener(CodesGenerated::class, RegistryUpdater::class);
+        $context->registerEventListener(CodesGenerated::class, ClearNotifications::class);
+        $context->registerEventListener(IRegistry::EVENT_PROVIDER_ENABLED, ProviderEnabled::class);
+        $context->registerEventListener(IRegistry::EVENT_PROVIDER_DISABLED, ProviderDisabled::class);
+    }
 
-	private function registerNotification(IManager $manager) {
-		$manager->registerNotifierService(Notifier::class);
-	}
+    private function registerNotification(IManager $manager) {
+        $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/accessibility/lib/Migration/RepairUserConfig.php

Indentation +47 added lines, -47 removed lines

@@ -36,55 +36,55 @@
 
 class RepairUserConfig implements IRepairStep {
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * MigrateUserConfig constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IConfig $config,
-								IUserManager $userManager) {
-		$this->config = $config;
-		$this->userManager = $userManager;
-	}
+    /**
+     * MigrateUserConfig constructor.
+     *
+     * @param IConfig $config
+     * @param IUserManager $userManager
+     */
+    public function __construct(IConfig $config,
+                                IUserManager $userManager) {
+        $this->config = $config;
+        $this->userManager = $userManager;
+    }
 
-	/**
-	 * Returns the step's name
-	 *
-	 * @return string
-	 * @since 9.1.0
-	 */
-	public function getName() {
-		return 'Migrate old user config';
-	}
+    /**
+     * Returns the step's name
+     *
+     * @return string
+     * @since 9.1.0
+     */
+    public function getName() {
+        return 'Migrate old user config';
+    }
 
-	/**
-	 * Run repair step.
-	 * Must throw exception on error.
-	 *
-	 * @param IOutput $output
-	 * @throws \Exception in case of failure
-	 * @since 9.1.0
-	 */
-	public function run(IOutput $output) {
-		$output->startProgress();
-		$this->userManager->callForSeenUsers(function (IUser $user) use ($output) {
-			$theme = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'theme', false);
-			if ($theme === 'themedark') {
-				$this->config->setUserValue($user->getUID(), Application::APP_ID, 'theme', 'dark');
-			}
-			if ($theme === 'themehighcontrast') {
-				$this->config->setUserValue($user->getUID(), Application::APP_ID, 'highcontrast', 'highcontrast');
-				$this->config->deleteUserValue($user->getUID(), Application::APP_ID, 'theme');
-			}
-			$output->advance();
-		});
-		$output->finishProgress();
-	}
+    /**
+     * Run repair step.
+     * Must throw exception on error.
+     *
+     * @param IOutput $output
+     * @throws \Exception in case of failure
+     * @since 9.1.0
+     */
+    public function run(IOutput $output) {
+        $output->startProgress();
+        $this->userManager->callForSeenUsers(function (IUser $user) use ($output) {
+            $theme = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'theme', false);
+            if ($theme === 'themedark') {
+                $this->config->setUserValue($user->getUID(), Application::APP_ID, 'theme', 'dark');
+            }
+            if ($theme === 'themehighcontrast') {
+                $this->config->setUserValue($user->getUID(), Application::APP_ID, 'highcontrast', 'highcontrast');
+                $this->config->deleteUserValue($user->getUID(), Application::APP_ID, 'theme');
+            }
+            $output->advance();
+        });
+        $output->finishProgress();
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 	 */
 	public function run(IOutput $output) {
 		$output->startProgress();
-		$this->userManager->callForSeenUsers(function (IUser $user) use ($output) {
+		$this->userManager->callForSeenUsers(function(IUser $user) use ($output) {
 			$theme = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'theme', false);
 			if ($theme === 'themedark') {
 				$this->config->setUserValue($user->getUID(), Application::APP_ID, 'theme', 'dark');

apps/accessibility/lib/AppInfo/Application.php

Indentation +58 added lines, -58 removed lines

@@ -43,71 +43,71 @@
 
 class Application extends App implements IBootstrap {
 
-	/** @var string */
-	public const APP_ID = 'accessibility';
+    /** @var string */
+    public const APP_ID = 'accessibility';
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IUserSession */
+    private $userSession;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
 
-	public function register(IRegistrationContext $context): void {
-	}
+    public function register(IRegistrationContext $context): void {
+    }
 
-	public function boot(IBootContext $context): void {
-		$this->injectCss(
-			$context->getAppContainer()->query(IUserSession::class),
-			$context->getAppContainer()->query(IConfig::class),
-			$context->getAppContainer()->query(IURLGenerator::class)
-		);
-		$this->injectJavascript(
-			$context->getAppContainer()->query(IURLGenerator::class),
-			$context->getAppContainer()->query(IConfig::class),
-			$context->getServerContainer()
-		);
-	}
+    public function boot(IBootContext $context): void {
+        $this->injectCss(
+            $context->getAppContainer()->query(IUserSession::class),
+            $context->getAppContainer()->query(IConfig::class),
+            $context->getAppContainer()->query(IURLGenerator::class)
+        );
+        $this->injectJavascript(
+            $context->getAppContainer()->query(IURLGenerator::class),
+            $context->getAppContainer()->query(IConfig::class),
+            $context->getServerContainer()
+        );
+    }
 
-	private function injectCss(IUserSession $userSession,
-							   IConfig $config,
-							   IURLGenerator $urlGenerator) {
-		// Inject the fake css on all pages if enabled and user is logged
-		$loggedUser = $userSession->getUser();
-		if ($loggedUser !== null) {
-			$userValues = $config->getUserKeys($loggedUser->getUID(), self::APP_ID);
-			// we want to check if any theme or font is enabled.
-			if (count($userValues) > 0) {
-				$hash = $config->getUserValue($loggedUser->getUID(), self::APP_ID, 'icons-css', md5(implode('-', $userValues)));
-				$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
-				\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
-			}
-		}
-	}
+    private function injectCss(IUserSession $userSession,
+                                IConfig $config,
+                                IURLGenerator $urlGenerator) {
+        // Inject the fake css on all pages if enabled and user is logged
+        $loggedUser = $userSession->getUser();
+        if ($loggedUser !== null) {
+            $userValues = $config->getUserKeys($loggedUser->getUID(), self::APP_ID);
+            // we want to check if any theme or font is enabled.
+            if (count($userValues) > 0) {
+                $hash = $config->getUserValue($loggedUser->getUID(), self::APP_ID, 'icons-css', md5(implode('-', $userValues)));
+                $linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
+                \OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
+            }
+        }
+    }
 
-	private function injectJavascript(IURLGenerator $urlGenerator,
-									  IConfig $config,
-									  IServerContainer $serverContainer) {
-		$linkToJs = $urlGenerator->linkToRoute(
-			self::APP_ID . '.accessibility.getJavascript',
-			[
-				'v' => $config->getAppValue(self::APP_ID, 'cachebuster', '0'),
-			]
-		);
+    private function injectJavascript(IURLGenerator $urlGenerator,
+                                        IConfig $config,
+                                        IServerContainer $serverContainer) {
+        $linkToJs = $urlGenerator->linkToRoute(
+            self::APP_ID . '.accessibility.getJavascript',
+            [
+                'v' => $config->getAppValue(self::APP_ID, 'cachebuster', '0'),
+            ]
+        );
 
-		\OCP\Util::addHeader(
-			'script',
-			[
-				'src' => $linkToJs,
-				'nonce' => $serverContainer->getContentSecurityPolicyNonceManager()->getNonce()
-			],
-			''
-		);
-	}
+        \OCP\Util::addHeader(
+            'script',
+            [
+                'src' => $linkToJs,
+                'nonce' => $serverContainer->getContentSecurityPolicyNonceManager()->getNonce()
+            ],
+            ''
+        );
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
 			// we want to check if any theme or font is enabled.
 			if (count($userValues) > 0) {
 				$hash = $config->getUserValue($loggedUser->getUID(), self::APP_ID, 'icons-css', md5(implode('-', $userValues)));
-				$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
+				$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID.'.accessibility.getCss', ['md5' => $hash]);
 				\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
 			}
 		}
@@ -95,7 +95,7 @@ 
 									  IConfig $config,
 									  IServerContainer $serverContainer) {
 		$linkToJs = $urlGenerator->linkToRoute(
-			self::APP_ID . '.accessibility.getJavascript',
+			self::APP_ID.'.accessibility.getJavascript',
 			[
 				'v' => $config->getAppValue(self::APP_ID, 'cachebuster', '0'),
 			]

apps/admin_audit/lib/AppInfo/Application.php

Indentation +210 added lines, -210 removed lines

@@ -67,221 +67,221 @@
 
 class Application extends App implements IBootstrap {
 
-	/** @var ILogger */
-	protected $logger;
+    /** @var ILogger */
+    protected $logger;
 
-	public function __construct() {
-		parent::__construct('admin_audit');
-	}
+    public function __construct() {
+        parent::__construct('admin_audit');
+    }
 
-	public function register(IRegistrationContext $context): void {
-	}
+    public function register(IRegistrationContext $context): void {
+    }
 
-	public function boot(IBootContext $context): void {
-		$logger = $this->getLogger(
-			$context->getAppContainer()->query(IConfig::class),
-			$context->getAppContainer()->query(ILogger::class),
-			$context->getAppContainer()->query(ILogFactory::class)
-		);
+    public function boot(IBootContext $context): void {
+        $logger = $this->getLogger(
+            $context->getAppContainer()->query(IConfig::class),
+            $context->getAppContainer()->query(ILogger::class),
+            $context->getAppContainer()->query(ILogFactory::class)
+        );
 
-		/*
+        /*
 		 * TODO: once the hooks are migrated to lazy events, this should be done
 		 *       in \OCA\AdminAudit\AppInfo\Application::register
 		 */
-		$this->registerHooks($logger, $context->getServerContainer());
-	}
-
-	private function getLogger(IConfig $config,
-							   ILogger $logger,
-							   ILogFactory $logFactory): ILogger {
-		$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
-		$logFile = $config->getAppValue('admin_audit', 'logfile', $default);
-
-		if ($logFile === null) {
-			return $logger;
-		}
-		return $logFactory->getCustomLogger($logFile);
-	}
-
-	/**
-	 * Register hooks in order to log them
-	 */
-	private function registerHooks(ILogger $logger,
-									 IServerContainer $serverContainer) {
-		$this->userManagementHooks($logger, $serverContainer);
-		$this->groupHooks($logger, $serverContainer);
-		$this->authHooks($logger);
-
-		$this->consoleHooks($logger, $serverContainer);
-		$this->appHooks($logger, $serverContainer);
-
-		$this->sharingHooks($logger);
-
-		$this->fileHooks($logger, $serverContainer);
-		$this->trashbinHooks($logger);
-		$this->versionsHooks($logger);
-
-		$this->securityHooks($logger, $serverContainer);
-	}
-
-	private function userManagementHooks(ILogger $logger,
-										   IServerContainer $serverContainer) {
-		$userActions = new UserManagement($logger);
-
-		Util::connectHook('OC_User', 'post_createUser', $userActions, 'create');
-		Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete');
-		Util::connectHook('OC_User', 'changeUser', $userActions, 'change');
-
-		/** @var IUserSession|Session $userSession */
-		$userSession = $serverContainer->getUserSession();
-		$userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
-		$userSession->listen('\OC\User', 'assignedUserId', [$userActions, 'assign']);
-		$userSession->listen('\OC\User', 'postUnassignedUserId', [$userActions, 'unassign']);
-	}
-
-	private function groupHooks(ILogger $logger,
-								  IServerContainer $serverContainer) {
-		$groupActions = new GroupManagement($logger);
-
-		/** @var IGroupManager|Manager $groupManager */
-		$groupManager = $serverContainer->getGroupManager();
-		$groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']);
-		$groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']);
-		$groupManager->listen('\OC\Group', 'postDelete', [$groupActions, 'deleteGroup']);
-		$groupManager->listen('\OC\Group', 'postCreate', [$groupActions, 'createGroup']);
-	}
-
-	private function sharingHooks(ILogger $logger) {
-		$shareActions = new Sharing($logger);
-
-		Util::connectHook(Share::class, 'post_shared', $shareActions, 'shared');
-		Util::connectHook(Share::class, 'post_unshare', $shareActions, 'unshare');
-		Util::connectHook(Share::class, 'post_unshareFromSelf', $shareActions, 'unshare');
-		Util::connectHook(Share::class, 'post_update_permissions', $shareActions, 'updatePermissions');
-		Util::connectHook(Share::class, 'post_update_password', $shareActions, 'updatePassword');
-		Util::connectHook(Share::class, 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
-		Util::connectHook(Share::class, 'share_link_access', $shareActions, 'shareAccessed');
-	}
-
-	private function authHooks(ILogger $logger) {
-		$authActions = new Auth($logger);
-
-		Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
-		Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
-		Util::connectHook('OC_User', 'logout', $authActions, 'logout');
-	}
-
-	private function appHooks(ILogger $logger,
-								IServerContainer $serverContainer) {
-		$eventDispatcher = $serverContainer->getEventDispatcher();
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function (ManagerEvent $event) use ($logger) {
-			$appActions = new AppManagement($logger);
-			$appActions->enableApp($event->getAppID());
-		});
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function (ManagerEvent $event) use ($logger) {
-			$appActions = new AppManagement($logger);
-			$appActions->enableAppForGroups($event->getAppID(), $event->getGroups());
-		});
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function (ManagerEvent $event) use ($logger) {
-			$appActions = new AppManagement($logger);
-			$appActions->disableApp($event->getAppID());
-		});
-	}
-
-	private function consoleHooks(ILogger $logger,
-									IServerContainer $serverContainer) {
-		$eventDispatcher = $serverContainer->getEventDispatcher();
-		$eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function (ConsoleEvent $event) use ($logger) {
-			$appActions = new Console($logger);
-			$appActions->runCommand($event->getArguments());
-		});
-	}
-
-	private function fileHooks(ILogger $logger,
-								 IServerContainer $serverContainer) {
-		$fileActions = new Files($logger);
-		$eventDispatcher = $serverContainer->getEventDispatcher();
-		$eventDispatcher->addListener(
-			IPreview::EVENT,
-			function (GenericEvent $event) use ($fileActions) {
-				/** @var File $file */
-				$file = $event->getSubject();
-				$fileActions->preview([
-					'path' => mb_substr($file->getInternalPath(), 5),
-					'width' => $event->getArguments()['width'],
-					'height' => $event->getArguments()['height'],
-					'crop' => $event->getArguments()['crop'],
-					'mode' => $event->getArguments()['mode']
-				]);
-			}
-		);
-
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_rename,
-			$fileActions,
-			'rename'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_create,
-			$fileActions,
-			'create'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_copy,
-			$fileActions,
-			'copy'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_write,
-			$fileActions,
-			'write'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_update,
-			$fileActions,
-			'update'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_read,
-			$fileActions,
-			'read'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_delete,
-			$fileActions,
-			'delete'
-		);
-	}
-
-	private function versionsHooks(ILogger $logger) {
-		$versionsActions = new Versions($logger);
-		Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
-		Util::connectHook('\OCP\Versions', 'delete', $versionsActions, 'delete');
-	}
-
-	private function trashbinHooks(ILogger $logger) {
-		$trashActions = new Trashbin($logger);
-		Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
-		Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
-	}
-
-	private function securityHooks(ILogger $logger,
-									 IServerContainer $serverContainer) {
-		$eventDispatcher = $serverContainer->getEventDispatcher();
-		$eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function (GenericEvent $event) use ($logger) {
-			$security = new Security($logger);
-			$security->twofactorSuccess($event->getSubject(), $event->getArguments());
-		});
-		$eventDispatcher->addListener(IProvider::EVENT_FAILED, function (GenericEvent $event) use ($logger) {
-			$security = new Security($logger);
-			$security->twofactorFailed($event->getSubject(), $event->getArguments());
-		});
-	}
+        $this->registerHooks($logger, $context->getServerContainer());
+    }
+
+    private function getLogger(IConfig $config,
+                                ILogger $logger,
+                                ILogFactory $logFactory): ILogger {
+        $default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
+        $logFile = $config->getAppValue('admin_audit', 'logfile', $default);
+
+        if ($logFile === null) {
+            return $logger;
+        }
+        return $logFactory->getCustomLogger($logFile);
+    }
+
+    /**
+     * Register hooks in order to log them
+     */
+    private function registerHooks(ILogger $logger,
+                                        IServerContainer $serverContainer) {
+        $this->userManagementHooks($logger, $serverContainer);
+        $this->groupHooks($logger, $serverContainer);
+        $this->authHooks($logger);
+
+        $this->consoleHooks($logger, $serverContainer);
+        $this->appHooks($logger, $serverContainer);
+
+        $this->sharingHooks($logger);
+
+        $this->fileHooks($logger, $serverContainer);
+        $this->trashbinHooks($logger);
+        $this->versionsHooks($logger);
+
+        $this->securityHooks($logger, $serverContainer);
+    }
+
+    private function userManagementHooks(ILogger $logger,
+                                            IServerContainer $serverContainer) {
+        $userActions = new UserManagement($logger);
+
+        Util::connectHook('OC_User', 'post_createUser', $userActions, 'create');
+        Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete');
+        Util::connectHook('OC_User', 'changeUser', $userActions, 'change');
+
+        /** @var IUserSession|Session $userSession */
+        $userSession = $serverContainer->getUserSession();
+        $userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
+        $userSession->listen('\OC\User', 'assignedUserId', [$userActions, 'assign']);
+        $userSession->listen('\OC\User', 'postUnassignedUserId', [$userActions, 'unassign']);
+    }
+
+    private function groupHooks(ILogger $logger,
+                                    IServerContainer $serverContainer) {
+        $groupActions = new GroupManagement($logger);
+
+        /** @var IGroupManager|Manager $groupManager */
+        $groupManager = $serverContainer->getGroupManager();
+        $groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']);
+        $groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']);
+        $groupManager->listen('\OC\Group', 'postDelete', [$groupActions, 'deleteGroup']);
+        $groupManager->listen('\OC\Group', 'postCreate', [$groupActions, 'createGroup']);
+    }
+
+    private function sharingHooks(ILogger $logger) {
+        $shareActions = new Sharing($logger);
+
+        Util::connectHook(Share::class, 'post_shared', $shareActions, 'shared');
+        Util::connectHook(Share::class, 'post_unshare', $shareActions, 'unshare');
+        Util::connectHook(Share::class, 'post_unshareFromSelf', $shareActions, 'unshare');
+        Util::connectHook(Share::class, 'post_update_permissions', $shareActions, 'updatePermissions');
+        Util::connectHook(Share::class, 'post_update_password', $shareActions, 'updatePassword');
+        Util::connectHook(Share::class, 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
+        Util::connectHook(Share::class, 'share_link_access', $shareActions, 'shareAccessed');
+    }
+
+    private function authHooks(ILogger $logger) {
+        $authActions = new Auth($logger);
+
+        Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
+        Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
+        Util::connectHook('OC_User', 'logout', $authActions, 'logout');
+    }
+
+    private function appHooks(ILogger $logger,
+                                IServerContainer $serverContainer) {
+        $eventDispatcher = $serverContainer->getEventDispatcher();
+        $eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function (ManagerEvent $event) use ($logger) {
+            $appActions = new AppManagement($logger);
+            $appActions->enableApp($event->getAppID());
+        });
+        $eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function (ManagerEvent $event) use ($logger) {
+            $appActions = new AppManagement($logger);
+            $appActions->enableAppForGroups($event->getAppID(), $event->getGroups());
+        });
+        $eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function (ManagerEvent $event) use ($logger) {
+            $appActions = new AppManagement($logger);
+            $appActions->disableApp($event->getAppID());
+        });
+    }
+
+    private function consoleHooks(ILogger $logger,
+                                    IServerContainer $serverContainer) {
+        $eventDispatcher = $serverContainer->getEventDispatcher();
+        $eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function (ConsoleEvent $event) use ($logger) {
+            $appActions = new Console($logger);
+            $appActions->runCommand($event->getArguments());
+        });
+    }
+
+    private function fileHooks(ILogger $logger,
+                                    IServerContainer $serverContainer) {
+        $fileActions = new Files($logger);
+        $eventDispatcher = $serverContainer->getEventDispatcher();
+        $eventDispatcher->addListener(
+            IPreview::EVENT,
+            function (GenericEvent $event) use ($fileActions) {
+                /** @var File $file */
+                $file = $event->getSubject();
+                $fileActions->preview([
+                    'path' => mb_substr($file->getInternalPath(), 5),
+                    'width' => $event->getArguments()['width'],
+                    'height' => $event->getArguments()['height'],
+                    'crop' => $event->getArguments()['crop'],
+                    'mode' => $event->getArguments()['mode']
+                ]);
+            }
+        );
+
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_rename,
+            $fileActions,
+            'rename'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_create,
+            $fileActions,
+            'create'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_copy,
+            $fileActions,
+            'copy'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_write,
+            $fileActions,
+            'write'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_update,
+            $fileActions,
+            'update'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_read,
+            $fileActions,
+            'read'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_delete,
+            $fileActions,
+            'delete'
+        );
+    }
+
+    private function versionsHooks(ILogger $logger) {
+        $versionsActions = new Versions($logger);
+        Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
+        Util::connectHook('\OCP\Versions', 'delete', $versionsActions, 'delete');
+    }
+
+    private function trashbinHooks(ILogger $logger) {
+        $trashActions = new Trashbin($logger);
+        Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
+        Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
+    }
+
+    private function securityHooks(ILogger $logger,
+                                        IServerContainer $serverContainer) {
+        $eventDispatcher = $serverContainer->getEventDispatcher();
+        $eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function (GenericEvent $event) use ($logger) {
+            $security = new Security($logger);
+            $security->twofactorSuccess($event->getSubject(), $event->getArguments());
+        });
+        $eventDispatcher->addListener(IProvider::EVENT_FAILED, function (GenericEvent $event) use ($logger) {
+            $security = new Security($logger);
+            $security->twofactorFailed($event->getSubject(), $event->getArguments());
+        });
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -94,7 +94,7 @@ 
 	private function getLogger(IConfig $config,
 							   ILogger $logger,
 							   ILogFactory $logFactory): ILogger {
-		$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
+		$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/audit.log';
 		$logFile = $config->getAppValue('admin_audit', 'logfile', $default);
 
 		if ($logFile === null) {
@@ -174,15 +174,15 @@ 
 	private function appHooks(ILogger $logger,
 								IServerContainer $serverContainer) {
 		$eventDispatcher = $serverContainer->getEventDispatcher();
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function (ManagerEvent $event) use ($logger) {
+		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function(ManagerEvent $event) use ($logger) {
 			$appActions = new AppManagement($logger);
 			$appActions->enableApp($event->getAppID());
 		});
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function (ManagerEvent $event) use ($logger) {
+		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function(ManagerEvent $event) use ($logger) {
 			$appActions = new AppManagement($logger);
 			$appActions->enableAppForGroups($event->getAppID(), $event->getGroups());
 		});
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function (ManagerEvent $event) use ($logger) {
+		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function(ManagerEvent $event) use ($logger) {
 			$appActions = new AppManagement($logger);
 			$appActions->disableApp($event->getAppID());
 		});
@@ -191,7 +191,7 @@ 
 	private function consoleHooks(ILogger $logger,
 									IServerContainer $serverContainer) {
 		$eventDispatcher = $serverContainer->getEventDispatcher();
-		$eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function (ConsoleEvent $event) use ($logger) {
+		$eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function(ConsoleEvent $event) use ($logger) {
 			$appActions = new Console($logger);
 			$appActions->runCommand($event->getArguments());
 		});
@@ -203,7 +203,7 @@ 
 		$eventDispatcher = $serverContainer->getEventDispatcher();
 		$eventDispatcher->addListener(
 			IPreview::EVENT,
-			function (GenericEvent $event) use ($fileActions) {
+			function(GenericEvent $event) use ($fileActions) {
 				/** @var File $file */
 				$file = $event->getSubject();
 				$fileActions->preview([
@@ -275,11 +275,11 @@ 
 	private function securityHooks(ILogger $logger,
 									 IServerContainer $serverContainer) {
 		$eventDispatcher = $serverContainer->getEventDispatcher();
-		$eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function (GenericEvent $event) use ($logger) {
+		$eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function(GenericEvent $event) use ($logger) {
 			$security = new Security($logger);
 			$security->twofactorSuccess($event->getSubject(), $event->getArguments());
 		});
-		$eventDispatcher->addListener(IProvider::EVENT_FAILED, function (GenericEvent $event) use ($logger) {
+		$eventDispatcher->addListener(IProvider::EVENT_FAILED, function(GenericEvent $event) use ($logger) {
 			$security = new Security($logger);
 			$security->twofactorFailed($event->getSubject(), $event->getArguments());
 		});

apps/settings/lib/AppInfo/Application.php

Indentation +161 added lines, -161 removed lines

@@ -61,165 +61,165 @@
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'settings';
-
-	/**
-	 * @param array $urlParams
-	 */
-	public function __construct(array $urlParams=[]) {
-		parent::__construct(self::APP_ID, $urlParams);
-	}
-
-	public function register(IRegistrationContext $context): void {
-		// Register Middleware
-		$context->registerServiceAlias('SubadminMiddleware', SubadminMiddleware::class);
-		$context->registerMiddleware(SubadminMiddleware::class);
-
-		/**
-		 * Core class wrappers
-		 */
-		/** FIXME: Remove once OC_User is non-static and mockable */
-		$context->registerService('isAdmin', function () {
-			return \OC_User::isAdminUser(\OC_User::getUser());
-		});
-		/** FIXME: Remove once OC_SubAdmin is non-static and mockable */
-		$context->registerService('isSubAdmin', function (IContainer $c) {
-			$userObject = \OC::$server->getUserSession()->getUser();
-			$isSubAdmin = false;
-			if ($userObject !== null) {
-				$isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
-			}
-			return $isSubAdmin;
-		});
-		$context->registerService('userCertificateManager', function (IContainer $c) {
-			return $c->query('ServerContainer')->getCertificateManager();
-		}, false);
-		$context->registerService('systemCertificateManager', function (IContainer $c) {
-			return $c->query('ServerContainer')->getCertificateManager(null);
-		}, false);
-		$context->registerService(IProvider::class, function (IContainer $c) {
-			return $c->query('ServerContainer')->query(IProvider::class);
-		});
-		$context->registerService(IManager::class, function (IContainer $c) {
-			return $c->query('ServerContainer')->getSettingsManager();
-		});
-
-		$context->registerService(NewUserMailHelper::class, function (IContainer $c) {
-			/** @var Server $server */
-			$server = $c->query('ServerContainer');
-			/** @var Defaults $defaults */
-			$defaults = $server->query(Defaults::class);
-
-			return new NewUserMailHelper(
-				$defaults,
-				$server->getURLGenerator(),
-				$server->getL10NFactory(),
-				$server->getMailer(),
-				$server->getSecureRandom(),
-				new TimeFactory(),
-				$server->getConfig(),
-				$server->getCrypto(),
-				Util::getDefaultEmailAddress('no-reply')
-			);
-		});
-	}
-
-	public function boot(IBootContext $context): void {
-		/** @var EventDispatcherInterface $eventDispatcher */
-		$eventDispatcher = $context->getServerContainer()->getEventDispatcher();
-		$container = $context->getAppContainer();
-		$eventDispatcher->addListener('app_password_created', function (GenericEvent $event) use ($container) {
-			if (($token = $event->getSubject()) instanceof IToken) {
-				/** @var IActivityManager $activityManager */
-				$activityManager = $container->query(IActivityManager::class);
-				/** @var ILogger $logger */
-				$logger = $container->query(ILogger::class);
-
-				$activity = $activityManager->generateEvent();
-				$activity->setApp('settings')
-					->setType('security')
-					->setAffectedUser($token->getUID())
-					->setAuthor($token->getUID())
-					->setSubject(Provider::APP_TOKEN_CREATED, ['name' => $token->getName()])
-					->setObject('app_token', $token->getId());
-
-				try {
-					$activityManager->publish($activity);
-				} catch (BadMethodCallException $e) {
-					$logger->logException($e, ['message' => 'could not publish activity', 'level' => ILogger::WARN]);
-				}
-			}
-		});
-
-		Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
-		Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
-
-		$groupManager = $context->getServerContainer()->getGroupManager();
-		$groupManager->listen('\OC\Group', 'postRemoveUser',  [$this, 'removeUserFromGroup']);
-		$groupManager->listen('\OC\Group', 'postAddUser',  [$this, 'addUserToGroup']);
-
-		Util::connectHook('\OCP\Config', 'js', $this, 'extendJsConfig');
-	}
-
-	public function addUserToGroup(IGroup $group, IUser $user): void {
-		/** @var Hooks $hooks */
-		$hooks = $this->getContainer()->query(Hooks::class);
-		$hooks->addUserToGroup($group, $user);
-	}
-
-	public function removeUserFromGroup(IGroup $group, IUser $user): void {
-		/** @var Hooks $hooks */
-		$hooks = $this->getContainer()->query(Hooks::class);
-		$hooks->removeUserFromGroup($group, $user);
-	}
-
-
-	/**
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 * @throws \Exception
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function onChangePassword(array $parameters) {
-		/** @var Hooks $hooks */
-		$hooks = $this->getContainer()->query(Hooks::class);
-		$hooks->onChangePassword($parameters['uid']);
-	}
-
-	/**
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 * @throws \Exception
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function onChangeInfo(array $parameters) {
-		if ($parameters['feature'] !== 'eMailAddress') {
-			return;
-		}
-
-		/** @var Hooks $hooks */
-		$hooks = $this->getContainer()->query(Hooks::class);
-		$hooks->onChangeEmail($parameters['user'], $parameters['old_value']);
-	}
-
-	/**
-	 * @param array $settings
-	 */
-	public function extendJsConfig(array $settings) {
-		$appConfig = json_decode($settings['array']['oc_appconfig'], true);
-
-		$publicWebFinger = \OC::$server->getConfig()->getAppValue('core', 'public_webfinger', '');
-		if (!empty($publicWebFinger)) {
-			$appConfig['core']['public_webfinger'] = $publicWebFinger;
-		}
-
-		$publicNodeInfo = \OC::$server->getConfig()->getAppValue('core', 'public_nodeinfo', '');
-		if (!empty($publicNodeInfo)) {
-			$appConfig['core']['public_nodeinfo'] = $publicNodeInfo;
-		}
-
-		$settings['array']['oc_appconfig'] = json_encode($appConfig);
-	}
+    public const APP_ID = 'settings';
+
+    /**
+     * @param array $urlParams
+     */
+    public function __construct(array $urlParams=[]) {
+        parent::__construct(self::APP_ID, $urlParams);
+    }
+
+    public function register(IRegistrationContext $context): void {
+        // Register Middleware
+        $context->registerServiceAlias('SubadminMiddleware', SubadminMiddleware::class);
+        $context->registerMiddleware(SubadminMiddleware::class);
+
+        /**
+         * Core class wrappers
+         */
+        /** FIXME: Remove once OC_User is non-static and mockable */
+        $context->registerService('isAdmin', function () {
+            return \OC_User::isAdminUser(\OC_User::getUser());
+        });
+        /** FIXME: Remove once OC_SubAdmin is non-static and mockable */
+        $context->registerService('isSubAdmin', function (IContainer $c) {
+            $userObject = \OC::$server->getUserSession()->getUser();
+            $isSubAdmin = false;
+            if ($userObject !== null) {
+                $isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
+            }
+            return $isSubAdmin;
+        });
+        $context->registerService('userCertificateManager', function (IContainer $c) {
+            return $c->query('ServerContainer')->getCertificateManager();
+        }, false);
+        $context->registerService('systemCertificateManager', function (IContainer $c) {
+            return $c->query('ServerContainer')->getCertificateManager(null);
+        }, false);
+        $context->registerService(IProvider::class, function (IContainer $c) {
+            return $c->query('ServerContainer')->query(IProvider::class);
+        });
+        $context->registerService(IManager::class, function (IContainer $c) {
+            return $c->query('ServerContainer')->getSettingsManager();
+        });
+
+        $context->registerService(NewUserMailHelper::class, function (IContainer $c) {
+            /** @var Server $server */
+            $server = $c->query('ServerContainer');
+            /** @var Defaults $defaults */
+            $defaults = $server->query(Defaults::class);
+
+            return new NewUserMailHelper(
+                $defaults,
+                $server->getURLGenerator(),
+                $server->getL10NFactory(),
+                $server->getMailer(),
+                $server->getSecureRandom(),
+                new TimeFactory(),
+                $server->getConfig(),
+                $server->getCrypto(),
+                Util::getDefaultEmailAddress('no-reply')
+            );
+        });
+    }
+
+    public function boot(IBootContext $context): void {
+        /** @var EventDispatcherInterface $eventDispatcher */
+        $eventDispatcher = $context->getServerContainer()->getEventDispatcher();
+        $container = $context->getAppContainer();
+        $eventDispatcher->addListener('app_password_created', function (GenericEvent $event) use ($container) {
+            if (($token = $event->getSubject()) instanceof IToken) {
+                /** @var IActivityManager $activityManager */
+                $activityManager = $container->query(IActivityManager::class);
+                /** @var ILogger $logger */
+                $logger = $container->query(ILogger::class);
+
+                $activity = $activityManager->generateEvent();
+                $activity->setApp('settings')
+                    ->setType('security')
+                    ->setAffectedUser($token->getUID())
+                    ->setAuthor($token->getUID())
+                    ->setSubject(Provider::APP_TOKEN_CREATED, ['name' => $token->getName()])
+                    ->setObject('app_token', $token->getId());
+
+                try {
+                    $activityManager->publish($activity);
+                } catch (BadMethodCallException $e) {
+                    $logger->logException($e, ['message' => 'could not publish activity', 'level' => ILogger::WARN]);
+                }
+            }
+        });
+
+        Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
+        Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
+
+        $groupManager = $context->getServerContainer()->getGroupManager();
+        $groupManager->listen('\OC\Group', 'postRemoveUser',  [$this, 'removeUserFromGroup']);
+        $groupManager->listen('\OC\Group', 'postAddUser',  [$this, 'addUserToGroup']);
+
+        Util::connectHook('\OCP\Config', 'js', $this, 'extendJsConfig');
+    }
+
+    public function addUserToGroup(IGroup $group, IUser $user): void {
+        /** @var Hooks $hooks */
+        $hooks = $this->getContainer()->query(Hooks::class);
+        $hooks->addUserToGroup($group, $user);
+    }
+
+    public function removeUserFromGroup(IGroup $group, IUser $user): void {
+        /** @var Hooks $hooks */
+        $hooks = $this->getContainer()->query(Hooks::class);
+        $hooks->removeUserFromGroup($group, $user);
+    }
+
+
+    /**
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     * @throws \Exception
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function onChangePassword(array $parameters) {
+        /** @var Hooks $hooks */
+        $hooks = $this->getContainer()->query(Hooks::class);
+        $hooks->onChangePassword($parameters['uid']);
+    }
+
+    /**
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     * @throws \Exception
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function onChangeInfo(array $parameters) {
+        if ($parameters['feature'] !== 'eMailAddress') {
+            return;
+        }
+
+        /** @var Hooks $hooks */
+        $hooks = $this->getContainer()->query(Hooks::class);
+        $hooks->onChangeEmail($parameters['user'], $parameters['old_value']);
+    }
+
+    /**
+     * @param array $settings
+     */
+    public function extendJsConfig(array $settings) {
+        $appConfig = json_decode($settings['array']['oc_appconfig'], true);
+
+        $publicWebFinger = \OC::$server->getConfig()->getAppValue('core', 'public_webfinger', '');
+        if (!empty($publicWebFinger)) {
+            $appConfig['core']['public_webfinger'] = $publicWebFinger;
+        }
+
+        $publicNodeInfo = \OC::$server->getConfig()->getAppValue('core', 'public_nodeinfo', '');
+        if (!empty($publicNodeInfo)) {
+            $appConfig['core']['public_nodeinfo'] = $publicNodeInfo;
+        }
+
+        $settings['array']['oc_appconfig'] = json_encode($appConfig);
+    }
 }

Spacing +11 added lines, -11 removed lines

@@ -66,7 +66,7 @@ 
 	/**
 	 * @param array $urlParams
 	 */
-	public function __construct(array $urlParams=[]) {
+	public function __construct(array $urlParams = []) {
 		parent::__construct(self::APP_ID, $urlParams);
 	}
 
@@ -79,11 +79,11 @@ 
 		 * Core class wrappers
 		 */
 		/** FIXME: Remove once OC_User is non-static and mockable */
-		$context->registerService('isAdmin', function () {
+		$context->registerService('isAdmin', function() {
 			return \OC_User::isAdminUser(\OC_User::getUser());
 		});
 		/** FIXME: Remove once OC_SubAdmin is non-static and mockable */
-		$context->registerService('isSubAdmin', function (IContainer $c) {
+		$context->registerService('isSubAdmin', function(IContainer $c) {
 			$userObject = \OC::$server->getUserSession()->getUser();
 			$isSubAdmin = false;
 			if ($userObject !== null) {
@@ -91,20 +91,20 @@ 
 			}
 			return $isSubAdmin;
 		});
-		$context->registerService('userCertificateManager', function (IContainer $c) {
+		$context->registerService('userCertificateManager', function(IContainer $c) {
 			return $c->query('ServerContainer')->getCertificateManager();
 		}, false);
-		$context->registerService('systemCertificateManager', function (IContainer $c) {
+		$context->registerService('systemCertificateManager', function(IContainer $c) {
 			return $c->query('ServerContainer')->getCertificateManager(null);
 		}, false);
-		$context->registerService(IProvider::class, function (IContainer $c) {
+		$context->registerService(IProvider::class, function(IContainer $c) {
 			return $c->query('ServerContainer')->query(IProvider::class);
 		});
-		$context->registerService(IManager::class, function (IContainer $c) {
+		$context->registerService(IManager::class, function(IContainer $c) {
 			return $c->query('ServerContainer')->getSettingsManager();
 		});
 
-		$context->registerService(NewUserMailHelper::class, function (IContainer $c) {
+		$context->registerService(NewUserMailHelper::class, function(IContainer $c) {
 			/** @var Server $server */
 			$server = $c->query('ServerContainer');
 			/** @var Defaults $defaults */
@@ -128,7 +128,7 @@ 
 		/** @var EventDispatcherInterface $eventDispatcher */
 		$eventDispatcher = $context->getServerContainer()->getEventDispatcher();
 		$container = $context->getAppContainer();
-		$eventDispatcher->addListener('app_password_created', function (GenericEvent $event) use ($container) {
+		$eventDispatcher->addListener('app_password_created', function(GenericEvent $event) use ($container) {
 			if (($token = $event->getSubject()) instanceof IToken) {
 				/** @var IActivityManager $activityManager */
 				$activityManager = $container->query(IActivityManager::class);
@@ -155,8 +155,8 @@ 
 		Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
 
 		$groupManager = $context->getServerContainer()->getGroupManager();
-		$groupManager->listen('\OC\Group', 'postRemoveUser',  [$this, 'removeUserFromGroup']);
-		$groupManager->listen('\OC\Group', 'postAddUser',  [$this, 'addUserToGroup']);
+		$groupManager->listen('\OC\Group', 'postRemoveUser', [$this, 'removeUserFromGroup']);
+		$groupManager->listen('\OC\Group', 'postAddUser', [$this, 'addUserToGroup']);
 
 		Util::connectHook('\OCP\Config', 'js', $this, 'extendJsConfig');
 	}