nextcloud / server

apps/settings/lib/AppInfo/Application.php

Indentation +169 added lines, -169 removed lines

@@ -62,173 +62,173 @@
 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 () {
-			$userObject = \OC::$server->getUserSession()->getUser();
-			$isSubAdmin = false;
-			if ($userObject !== null) {
-				$isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
-			}
-			return $isSubAdmin;
-		});
-		$context->registerService('userCertificateManager', function (ContainerInterface $c) {
-			/** @var IServerContainer $serverContainer */
-			$serverContainer = $c->get(IServerContainer::class);
-			return $serverContainer->getCertificateManager();
-		}, false);
-		$context->registerService('systemCertificateManager', function (ContainerInterface $c) {
-			/** @var IServerContainer $serverContainer */
-			$serverContainer = $c->query('ServerContainer');
-			return $serverContainer->getCertificateManager(null);
-		}, false);
-		$context->registerService(IProvider::class, function (ContainerInterface $c) {
-			/** @var IServerContainer $serverContainer */
-			$serverContainer = $c->query(IServerContainer::class);
-			return $serverContainer->query(IProvider::class);
-		});
-		$context->registerService(IManager::class, function (ContainerInterface $c) {
-			/** @var IServerContainer $serverContainer */
-			$serverContainer = $c->query(IServerContainer::class);
-			return $serverContainer->getSettingsManager();
-		});
-
-		$context->registerService(NewUserMailHelper::class, function (ContainerInterface $c) {
-			/** @var Server $server */
-			$server = $c->query(IServerContainer::class);
-			/** @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 () {
+            $userObject = \OC::$server->getUserSession()->getUser();
+            $isSubAdmin = false;
+            if ($userObject !== null) {
+                $isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
+            }
+            return $isSubAdmin;
+        });
+        $context->registerService('userCertificateManager', function (ContainerInterface $c) {
+            /** @var IServerContainer $serverContainer */
+            $serverContainer = $c->get(IServerContainer::class);
+            return $serverContainer->getCertificateManager();
+        }, false);
+        $context->registerService('systemCertificateManager', function (ContainerInterface $c) {
+            /** @var IServerContainer $serverContainer */
+            $serverContainer = $c->query('ServerContainer');
+            return $serverContainer->getCertificateManager(null);
+        }, false);
+        $context->registerService(IProvider::class, function (ContainerInterface $c) {
+            /** @var IServerContainer $serverContainer */
+            $serverContainer = $c->query(IServerContainer::class);
+            return $serverContainer->query(IProvider::class);
+        });
+        $context->registerService(IManager::class, function (ContainerInterface $c) {
+            /** @var IServerContainer $serverContainer */
+            $serverContainer = $c->query(IServerContainer::class);
+            return $serverContainer->getSettingsManager();
+        });
+
+        $context->registerService(NewUserMailHelper::class, function (ContainerInterface $c) {
+            /** @var Server $server */
+            $server = $c->query(IServerContainer::class);
+            /** @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

@@ -67,7 +67,7 @@ 
 	/**
 	 * @param array $urlParams
 	 */
-	public function __construct(array $urlParams=[]) {
+	public function __construct(array $urlParams = []) {
 		parent::__construct(self::APP_ID, $urlParams);
 	}
 
@@ -80,11 +80,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 () {
+		$context->registerService('isSubAdmin', function() {
 			$userObject = \OC::$server->getUserSession()->getUser();
 			$isSubAdmin = false;
 			if ($userObject !== null) {
@@ -92,28 +92,28 @@ 
 			}
 			return $isSubAdmin;
 		});
-		$context->registerService('userCertificateManager', function (ContainerInterface $c) {
+		$context->registerService('userCertificateManager', function(ContainerInterface $c) {
 			/** @var IServerContainer $serverContainer */
 			$serverContainer = $c->get(IServerContainer::class);
 			return $serverContainer->getCertificateManager();
 		}, false);
-		$context->registerService('systemCertificateManager', function (ContainerInterface $c) {
+		$context->registerService('systemCertificateManager', function(ContainerInterface $c) {
 			/** @var IServerContainer $serverContainer */
 			$serverContainer = $c->query('ServerContainer');
 			return $serverContainer->getCertificateManager(null);
 		}, false);
-		$context->registerService(IProvider::class, function (ContainerInterface $c) {
+		$context->registerService(IProvider::class, function(ContainerInterface $c) {
 			/** @var IServerContainer $serverContainer */
 			$serverContainer = $c->query(IServerContainer::class);
 			return $serverContainer->query(IProvider::class);
 		});
-		$context->registerService(IManager::class, function (ContainerInterface $c) {
+		$context->registerService(IManager::class, function(ContainerInterface $c) {
 			/** @var IServerContainer $serverContainer */
 			$serverContainer = $c->query(IServerContainer::class);
 			return $serverContainer->getSettingsManager();
 		});
 
-		$context->registerService(NewUserMailHelper::class, function (ContainerInterface $c) {
+		$context->registerService(NewUserMailHelper::class, function(ContainerInterface $c) {
 			/** @var Server $server */
 			$server = $c->query(IServerContainer::class);
 			/** @var Defaults $defaults */
@@ -137,7 +137,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);
@@ -164,8 +164,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');
 	}