Passed
Push — master ( 4765f5...78c7e6 )
by Roeland
11:41 queued 14s
created
apps/settings/lib/AppInfo/Application.php 1 patch
Indentation   +159 added lines, -159 removed lines patch added patch discarded remove patch
@@ -62,163 +62,163 @@
 block discarded – undo
62 62
 class Application extends App {
63 63
 
64 64
 
65
-	/**
66
-	 * @param array $urlParams
67
-	 */
68
-	public function __construct(array $urlParams=[]){
69
-		parent::__construct('settings', $urlParams);
70
-
71
-		$container = $this->getContainer();
72
-
73
-		// Register Middleware
74
-		$container->registerAlias('SubadminMiddleware', SubadminMiddleware::class);
75
-		$container->registerMiddleWare('SubadminMiddleware');
76
-
77
-		/**
78
-		 * Core class wrappers
79
-		 */
80
-		/** FIXME: Remove once OC_User is non-static and mockable */
81
-		$container->registerService('isAdmin', function() {
82
-			return \OC_User::isAdminUser(\OC_User::getUser());
83
-		});
84
-		/** FIXME: Remove once OC_SubAdmin is non-static and mockable */
85
-		$container->registerService('isSubAdmin', function(IContainer $c) {
86
-			$userObject = \OC::$server->getUserSession()->getUser();
87
-			$isSubAdmin = false;
88
-			if($userObject !== null) {
89
-				$isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
90
-			}
91
-			return $isSubAdmin;
92
-		});
93
-		$container->registerService('userCertificateManager', function(IContainer $c) {
94
-			return $c->query('ServerContainer')->getCertificateManager();
95
-		}, false);
96
-		$container->registerService('systemCertificateManager', function (IContainer $c) {
97
-			return $c->query('ServerContainer')->getCertificateManager(null);
98
-		}, false);
99
-		$container->registerService(IProvider::class, function (IContainer $c) {
100
-			return $c->query('ServerContainer')->query(IProvider::class);
101
-		});
102
-		$container->registerService(IManager::class, function (IContainer $c) {
103
-			return $c->query('ServerContainer')->getSettingsManager();
104
-		});
105
-
106
-		$container->registerService(NewUserMailHelper::class, function (IContainer $c) {
107
-			/** @var Server $server */
108
-			$server = $c->query('ServerContainer');
109
-			/** @var Defaults $defaults */
110
-			$defaults = $server->query(Defaults::class);
111
-
112
-			return new NewUserMailHelper(
113
-				$defaults,
114
-				$server->getURLGenerator(),
115
-				$server->getL10NFactory(),
116
-				$server->getMailer(),
117
-				$server->getSecureRandom(),
118
-				new TimeFactory(),
119
-				$server->getConfig(),
120
-				$server->getCrypto(),
121
-				Util::getDefaultEmailAddress('no-reply')
122
-			);
123
-		});
124
-
125
-		/** @var EventDispatcherInterface $eventDispatcher */
126
-		$eventDispatcher = $container->getServer()->getEventDispatcher();
127
-		$eventDispatcher->addListener('app_password_created', function (GenericEvent $event) use ($container) {
128
-			if (($token = $event->getSubject()) instanceof IToken) {
129
-				/** @var IActivityManager $activityManager */
130
-				$activityManager = $container->query(IActivityManager::class);
131
-				/** @var ILogger $logger */
132
-				$logger = $container->query(ILogger::class);
133
-
134
-				$activity = $activityManager->generateEvent();
135
-				$activity->setApp('settings')
136
-					->setType('security')
137
-					->setAffectedUser($token->getUID())
138
-					->setAuthor($token->getUID())
139
-					->setSubject(Provider::APP_TOKEN_CREATED, ['name' => $token->getName()])
140
-					->setObject('app_token', $token->getId());
141
-
142
-				try {
143
-					$activityManager->publish($activity);
144
-				} catch (BadMethodCallException $e) {
145
-					$logger->logException($e, ['message' => 'could not publish activity', 'level' => ILogger::WARN]);
146
-				}
147
-			}
148
-		});
149
-	}
150
-
151
-	public function register() {
152
-		Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
153
-		Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
154
-
155
-		$groupManager = $this->getContainer()->getServer()->getGroupManager();
156
-		$groupManager->listen('\OC\Group', 'postRemoveUser',  [$this, 'removeUserFromGroup']);
157
-		$groupManager->listen('\OC\Group', 'postAddUser',  [$this, 'addUserToGroup']);
158
-
159
-		Util::connectHook('\OCP\Config', 'js', $this, 'extendJsConfig');
160
-	}
161
-
162
-	public function addUserToGroup(IGroup $group, IUser $user): void {
163
-		/** @var Hooks $hooks */
164
-		$hooks = $this->getContainer()->query(Hooks::class);
165
-		$hooks->addUserToGroup($group, $user);
166
-
167
-	}
168
-
169
-	public function removeUserFromGroup(IGroup $group, IUser $user): void {
170
-		/** @var Hooks $hooks */
171
-		$hooks = $this->getContainer()->query(Hooks::class);
172
-		$hooks->removeUserFromGroup($group, $user);
173
-	}
174
-
175
-
176
-	/**
177
-	 * @param array $parameters
178
-	 * @throws \InvalidArgumentException
179
-	 * @throws \BadMethodCallException
180
-	 * @throws \Exception
181
-	 * @throws \OCP\AppFramework\QueryException
182
-	 */
183
-	public function onChangePassword(array $parameters) {
184
-		/** @var Hooks $hooks */
185
-		$hooks = $this->getContainer()->query(Hooks::class);
186
-		$hooks->onChangePassword($parameters['uid']);
187
-	}
188
-
189
-	/**
190
-	 * @param array $parameters
191
-	 * @throws \InvalidArgumentException
192
-	 * @throws \BadMethodCallException
193
-	 * @throws \Exception
194
-	 * @throws \OCP\AppFramework\QueryException
195
-	 */
196
-	public function onChangeInfo(array $parameters) {
197
-		if ($parameters['feature'] !== 'eMailAddress') {
198
-			return;
199
-		}
200
-
201
-		/** @var Hooks $hooks */
202
-		$hooks = $this->getContainer()->query(Hooks::class);
203
-		$hooks->onChangeEmail($parameters['user'], $parameters['old_value']);
204
-	}
205
-
206
-	/**
207
-	 * @param array $settings
208
-	 */
209
-	public function extendJsConfig(array $settings) {
210
-		$appConfig = json_decode($settings['array']['oc_appconfig'], true);
211
-
212
-		$publicWebFinger = \OC::$server->getConfig()->getAppValue('core', 'public_webfinger', '');
213
-		if (!empty($publicWebFinger)) {
214
-			$appConfig['core']['public_webfinger'] = $publicWebFinger;
215
-		}
216
-
217
-		$publicNodeInfo = \OC::$server->getConfig()->getAppValue('core', 'public_nodeinfo', '');
218
-		if (!empty($publicNodeInfo)) {
219
-			$appConfig['core']['public_nodeinfo'] = $publicNodeInfo;
220
-		}
221
-
222
-		$settings['array']['oc_appconfig'] = json_encode($appConfig);
223
-	}
65
+    /**
66
+     * @param array $urlParams
67
+     */
68
+    public function __construct(array $urlParams=[]){
69
+        parent::__construct('settings', $urlParams);
70
+
71
+        $container = $this->getContainer();
72
+
73
+        // Register Middleware
74
+        $container->registerAlias('SubadminMiddleware', SubadminMiddleware::class);
75
+        $container->registerMiddleWare('SubadminMiddleware');
76
+
77
+        /**
78
+         * Core class wrappers
79
+         */
80
+        /** FIXME: Remove once OC_User is non-static and mockable */
81
+        $container->registerService('isAdmin', function() {
82
+            return \OC_User::isAdminUser(\OC_User::getUser());
83
+        });
84
+        /** FIXME: Remove once OC_SubAdmin is non-static and mockable */
85
+        $container->registerService('isSubAdmin', function(IContainer $c) {
86
+            $userObject = \OC::$server->getUserSession()->getUser();
87
+            $isSubAdmin = false;
88
+            if($userObject !== null) {
89
+                $isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
90
+            }
91
+            return $isSubAdmin;
92
+        });
93
+        $container->registerService('userCertificateManager', function(IContainer $c) {
94
+            return $c->query('ServerContainer')->getCertificateManager();
95
+        }, false);
96
+        $container->registerService('systemCertificateManager', function (IContainer $c) {
97
+            return $c->query('ServerContainer')->getCertificateManager(null);
98
+        }, false);
99
+        $container->registerService(IProvider::class, function (IContainer $c) {
100
+            return $c->query('ServerContainer')->query(IProvider::class);
101
+        });
102
+        $container->registerService(IManager::class, function (IContainer $c) {
103
+            return $c->query('ServerContainer')->getSettingsManager();
104
+        });
105
+
106
+        $container->registerService(NewUserMailHelper::class, function (IContainer $c) {
107
+            /** @var Server $server */
108
+            $server = $c->query('ServerContainer');
109
+            /** @var Defaults $defaults */
110
+            $defaults = $server->query(Defaults::class);
111
+
112
+            return new NewUserMailHelper(
113
+                $defaults,
114
+                $server->getURLGenerator(),
115
+                $server->getL10NFactory(),
116
+                $server->getMailer(),
117
+                $server->getSecureRandom(),
118
+                new TimeFactory(),
119
+                $server->getConfig(),
120
+                $server->getCrypto(),
121
+                Util::getDefaultEmailAddress('no-reply')
122
+            );
123
+        });
124
+
125
+        /** @var EventDispatcherInterface $eventDispatcher */
126
+        $eventDispatcher = $container->getServer()->getEventDispatcher();
127
+        $eventDispatcher->addListener('app_password_created', function (GenericEvent $event) use ($container) {
128
+            if (($token = $event->getSubject()) instanceof IToken) {
129
+                /** @var IActivityManager $activityManager */
130
+                $activityManager = $container->query(IActivityManager::class);
131
+                /** @var ILogger $logger */
132
+                $logger = $container->query(ILogger::class);
133
+
134
+                $activity = $activityManager->generateEvent();
135
+                $activity->setApp('settings')
136
+                    ->setType('security')
137
+                    ->setAffectedUser($token->getUID())
138
+                    ->setAuthor($token->getUID())
139
+                    ->setSubject(Provider::APP_TOKEN_CREATED, ['name' => $token->getName()])
140
+                    ->setObject('app_token', $token->getId());
141
+
142
+                try {
143
+                    $activityManager->publish($activity);
144
+                } catch (BadMethodCallException $e) {
145
+                    $logger->logException($e, ['message' => 'could not publish activity', 'level' => ILogger::WARN]);
146
+                }
147
+            }
148
+        });
149
+    }
150
+
151
+    public function register() {
152
+        Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
153
+        Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
154
+
155
+        $groupManager = $this->getContainer()->getServer()->getGroupManager();
156
+        $groupManager->listen('\OC\Group', 'postRemoveUser',  [$this, 'removeUserFromGroup']);
157
+        $groupManager->listen('\OC\Group', 'postAddUser',  [$this, 'addUserToGroup']);
158
+
159
+        Util::connectHook('\OCP\Config', 'js', $this, 'extendJsConfig');
160
+    }
161
+
162
+    public function addUserToGroup(IGroup $group, IUser $user): void {
163
+        /** @var Hooks $hooks */
164
+        $hooks = $this->getContainer()->query(Hooks::class);
165
+        $hooks->addUserToGroup($group, $user);
166
+
167
+    }
168
+
169
+    public function removeUserFromGroup(IGroup $group, IUser $user): void {
170
+        /** @var Hooks $hooks */
171
+        $hooks = $this->getContainer()->query(Hooks::class);
172
+        $hooks->removeUserFromGroup($group, $user);
173
+    }
174
+
175
+
176
+    /**
177
+     * @param array $parameters
178
+     * @throws \InvalidArgumentException
179
+     * @throws \BadMethodCallException
180
+     * @throws \Exception
181
+     * @throws \OCP\AppFramework\QueryException
182
+     */
183
+    public function onChangePassword(array $parameters) {
184
+        /** @var Hooks $hooks */
185
+        $hooks = $this->getContainer()->query(Hooks::class);
186
+        $hooks->onChangePassword($parameters['uid']);
187
+    }
188
+
189
+    /**
190
+     * @param array $parameters
191
+     * @throws \InvalidArgumentException
192
+     * @throws \BadMethodCallException
193
+     * @throws \Exception
194
+     * @throws \OCP\AppFramework\QueryException
195
+     */
196
+    public function onChangeInfo(array $parameters) {
197
+        if ($parameters['feature'] !== 'eMailAddress') {
198
+            return;
199
+        }
200
+
201
+        /** @var Hooks $hooks */
202
+        $hooks = $this->getContainer()->query(Hooks::class);
203
+        $hooks->onChangeEmail($parameters['user'], $parameters['old_value']);
204
+    }
205
+
206
+    /**
207
+     * @param array $settings
208
+     */
209
+    public function extendJsConfig(array $settings) {
210
+        $appConfig = json_decode($settings['array']['oc_appconfig'], true);
211
+
212
+        $publicWebFinger = \OC::$server->getConfig()->getAppValue('core', 'public_webfinger', '');
213
+        if (!empty($publicWebFinger)) {
214
+            $appConfig['core']['public_webfinger'] = $publicWebFinger;
215
+        }
216
+
217
+        $publicNodeInfo = \OC::$server->getConfig()->getAppValue('core', 'public_nodeinfo', '');
218
+        if (!empty($publicNodeInfo)) {
219
+            $appConfig['core']['public_nodeinfo'] = $publicNodeInfo;
220
+        }
221
+
222
+        $settings['array']['oc_appconfig'] = json_encode($appConfig);
223
+    }
224 224
 }
Please login to merge, or discard this patch.