Passed
Push — master ( 557066...971e22 )
by John
15:32 queued 12s
created
apps/user_ldap/ajax/setConfiguration.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
 \OC_JSON::checkAppEnabled('user_ldap');
31 31
 \OC_JSON::callCheck();
32 32
 
33
-$prefix = (string)$_POST['ldap_serverconfig_chooser'];
33
+$prefix = (string) $_POST['ldap_serverconfig_chooser'];
34 34
 
35 35
 // Checkboxes are not submitted, when they are unchecked. Set them manually.
36 36
 // only legacy checkboxes (Advanced and Expert tab) need to be handled here,
Please login to merge, or discard this patch.
apps/user_ldap/ajax/wizard.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,13 +39,13 @@
 block discarded – undo
39 39
 if (!isset($_POST['action'])) {
40 40
 	\OC_JSON::error(['message' => $l->t('No action specified')]);
41 41
 }
42
-$action = (string)$_POST['action'];
42
+$action = (string) $_POST['action'];
43 43
 
44 44
 
45 45
 if (!isset($_POST['ldap_serverconfig_chooser'])) {
46 46
 	\OC_JSON::error(['message' => $l->t('No configuration specified')]);
47 47
 }
48
-$prefix = (string)$_POST['ldap_serverconfig_chooser'];
48
+$prefix = (string) $_POST['ldap_serverconfig_chooser'];
49 49
 
50 50
 $ldapWrapper = new \OCA\User_LDAP\LDAP();
51 51
 $configuration = new \OCA\User_LDAP\Configuration($prefix);
Please login to merge, or discard this patch.
apps/user_ldap/ajax/clearMappings.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -33,16 +33,16 @@
 block discarded – undo
33 33
 \OC_JSON::checkAppEnabled('user_ldap');
34 34
 \OC_JSON::callCheck();
35 35
 
36
-$subject = (string)$_POST['ldap_clear_mapping'];
36
+$subject = (string) $_POST['ldap_clear_mapping'];
37 37
 $mapping = null;
38 38
 try {
39 39
 	if ($subject === 'user') {
40 40
 		$mapping = new UserMapping(\OC::$server->getDatabaseConnection());
41 41
 		$result = $mapping->clearCb(
42
-			function ($uid) {
42
+			function($uid) {
43 43
 				\OC::$server->getUserManager()->emit('\OC\User', 'preUnassignedUserId', [$uid]);
44 44
 			},
45
-			function ($uid) {
45
+			function($uid) {
46 46
 				\OC::$server->getUserManager()->emit('\OC\User', 'postUnassignedUserId', [$uid]);
47 47
 			}
48 48
 		);
Please login to merge, or discard this patch.
apps/cloud_federation_api/lib/Controller/RequestHandlerController.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 		$supportedShareTypes = $this->config->getSupportedShareTypes($resourceType);
147 147
 		if (!in_array($shareType, $supportedShareTypes)) {
148 148
 			return new JSONResponse(
149
-				['message' => 'Share type "' . $shareType . '" not implemented'],
149
+				['message' => 'Share type "'.$shareType.'" not implemented'],
150 150
 				Http::STATUS_NOT_IMPLEMENTED
151 151
 			);
152 152
 		}
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 
160 160
 			if (!$this->userManager->userExists($shareWith)) {
161 161
 				return new JSONResponse(
162
-					['message' => 'User "' . $shareWith . '" does not exists at ' . $this->urlGenerator->getBaseUrl()],
162
+					['message' => 'User "'.$shareWith.'" does not exists at '.$this->urlGenerator->getBaseUrl()],
163 163
 					Http::STATUS_BAD_REQUEST
164 164
 				);
165 165
 			}
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
 		if ($shareType === 'group') {
169 169
 			if (!$this->groupManager->groupExists($shareWith)) {
170 170
 				return new JSONResponse(
171
-					['message' => 'Group "' . $shareWith . '" does not exists at ' . $this->urlGenerator->getBaseUrl()],
171
+					['message' => 'Group "'.$shareWith.'" does not exists at '.$this->urlGenerator->getBaseUrl()],
172 172
 					Http::STATUS_BAD_REQUEST
173 173
 				);
174 174
 			}
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 			);
202 202
 		} catch (\Exception $e) {
203 203
 			return new JSONResponse(
204
-				['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()],
204
+				['message' => 'Internal error at '.$this->urlGenerator->getBaseUrl()],
205 205
 				Http::STATUS_BAD_REQUEST
206 206
 			);
207 207
 		}
@@ -268,12 +268,12 @@  discard block
 block discarded – undo
268 268
 			return new JSONResponse(["message" => "RESOURCE_NOT_FOUND"], Http::STATUS_FORBIDDEN);
269 269
 		} catch (\Exception $e) {
270 270
 			return new JSONResponse(
271
-				['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()],
271
+				['message' => 'Internal error at '.$this->urlGenerator->getBaseUrl()],
272 272
 				Http::STATUS_BAD_REQUEST
273 273
 			);
274 274
 		}
275 275
 
276
-		return new JSONResponse($result,Http::STATUS_CREATED);
276
+		return new JSONResponse($result, Http::STATUS_CREATED);
277 277
 	}
278 278
 
279 279
 	/**
@@ -284,13 +284,13 @@  discard block
 block discarded – undo
284 284
 	 */
285 285
 	private function mapUid($uid) {
286 286
 		// FIXME this should be a method in the user management instead
287
-		$this->logger->debug('shareWith before, ' . $uid, ['app' => $this->appName]);
287
+		$this->logger->debug('shareWith before, '.$uid, ['app' => $this->appName]);
288 288
 		\OCP\Util::emitHook(
289 289
 			'\OCA\Files_Sharing\API\Server2Server',
290 290
 			'preLoginNameUsedAsUserName',
291 291
 			['uid' => &$uid]
292 292
 		);
293
-		$this->logger->debug('shareWith after, ' . $uid, ['app' => $this->appName]);
293
+		$this->logger->debug('shareWith after, '.$uid, ['app' => $this->appName]);
294 294
 
295 295
 		return $uid;
296 296
 	}
Please login to merge, or discard this patch.
apps/encryption/lib/Recovery.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 		$encryptedRecoveryKey = $this->crypt->encryptPrivateKey($decryptedRecoveryKey, $newPassword);
127 127
 		$header = $this->crypt->generateHeader();
128 128
 		if ($encryptedRecoveryKey) {
129
-			$this->keyManager->setSystemPrivateKey($this->keyManager->getRecoveryKeyId(), $header . $encryptedRecoveryKey);
129
+			$this->keyManager->setSystemPrivateKey($this->keyManager->getRecoveryKeyId(), $header.$encryptedRecoveryKey);
130 130
 			return true;
131 131
 		}
132 132
 		return false;
@@ -187,9 +187,9 @@  discard block
 block discarded – undo
187 187
 				$value);
188 188
 
189 189
 			if ($value === '1') {
190
-				$this->addRecoveryKeys('/' . $this->user->getUID() . '/files/');
190
+				$this->addRecoveryKeys('/'.$this->user->getUID().'/files/');
191 191
 			} else {
192
-				$this->removeRecoveryKeys('/' . $this->user->getUID() . '/files/');
192
+				$this->removeRecoveryKeys('/'.$this->user->getUID().'/files/');
193 193
 			}
194 194
 
195 195
 			return true;
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
 		foreach ($dirContent as $item) {
208 208
 			$filePath = $item->getPath();
209 209
 			if ($item['type'] === 'dir') {
210
-				$this->addRecoveryKeys($filePath . '/');
210
+				$this->addRecoveryKeys($filePath.'/');
211 211
 			} else {
212 212
 				$fileKey = $this->keyManager->getFileKey($filePath, $this->user->getUID());
213 213
 				if (!empty($fileKey)) {
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
 		foreach ($dirContent as $item) {
236 236
 			$filePath = $item->getPath();
237 237
 			if ($item['type'] === 'dir') {
238
-				$this->removeRecoveryKeys($filePath . '/');
238
+				$this->removeRecoveryKeys($filePath.'/');
239 239
 			} else {
240 240
 				$this->keyManager->deleteShareKey($filePath, $this->keyManager->getRecoveryKeyId());
241 241
 			}
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
 
254 254
 		$privateKey = $this->crypt->decryptPrivateKey($encryptedKey, $recoveryPassword);
255 255
 		if ($privateKey !== false) {
256
-			$this->recoverAllFiles('/' . $user . '/files/', $privateKey, $user);
256
+			$this->recoverAllFiles('/'.$user.'/files/', $privateKey, $user);
257 257
 		}
258 258
 	}
259 259
 
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
 			// Get relative path from encryption/keyfiles
272 272
 			$filePath = $item->getPath();
273 273
 			if ($this->view->is_dir($filePath)) {
274
-				$this->recoverAllFiles($filePath . '/', $privateKey, $uid);
274
+				$this->recoverAllFiles($filePath.'/', $privateKey, $uid);
275 275
 			} else {
276 276
 				$this->recoverFile($filePath, $privateKey, $uid);
277 277
 			}
Please login to merge, or discard this patch.
apps/encryption/templates/settings-admin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
 				   value="1" <?php if ($_['encryptHomeStorage']) {
15 15
 	print_unescaped('checked="checked"');
16 16
 } ?> />
17
-			<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br>
17
+			<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage')); ?></label></br>
18 18
 			<em><?php p($l->t("Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted")); ?></em>
19 19
 		</p>
20 20
 		<br />
Please login to merge, or discard this patch.
apps/settings/lib/Controller/AdminSettingsController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -87,9 +87,9 @@
 block discarded – undo
87 87
 	private function getLegacyForms() {
88 88
 		$forms = \OC_App::getForms('admin');
89 89
 
90
-		$forms = array_map(function ($form) {
90
+		$forms = array_map(function($form) {
91 91
 			if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
92
-				$sectionName = str_replace('<h2' . $regs['class'] . '>', '', $regs[0]);
92
+				$sectionName = str_replace('<h2'.$regs['class'].'>', '', $regs[0]);
93 93
 				$sectionName = str_replace('</h2>', '', $sectionName);
94 94
 				$anchor = strtolower($sectionName);
95 95
 				$anchor = str_replace(' ', '-', $anchor);
Please login to merge, or discard this patch.
apps/settings/lib/Controller/PersonalSettingsController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -79,9 +79,9 @@
 block discarded – undo
79 79
 	private function getLegacyForms() {
80 80
 		$forms = \OC_App::getForms('personal');
81 81
 
82
-		$forms = array_map(function ($form) {
82
+		$forms = array_map(function($form) {
83 83
 			if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
84
-				$sectionName = str_replace('<h2' . $regs['class'] . '>', '', $regs[0]);
84
+				$sectionName = str_replace('<h2'.$regs['class'].'>', '', $regs[0]);
85 85
 				$sectionName = str_replace('</h2>', '', $sectionName);
86 86
 				$anchor = strtolower($sectionName);
87 87
 				$anchor = str_replace(' ', '-', $anchor);
Please login to merge, or discard this patch.
apps/settings/lib/Controller/ChangePasswordController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -229,7 +229,7 @@
 block discarded – undo
229 229
 						'message' => $this->l->t('Please provide an admin recovery password; otherwise, all user data will be lost.'),
230 230
 					]
231 231
 				]);
232
-			} elseif ($recoveryEnabledForUser && ! $validRecoveryPassword) {
232
+			} elseif ($recoveryEnabledForUser && !$validRecoveryPassword) {
233 233
 				return new JSONResponse([
234 234
 					'status' => 'error',
235 235
 					'data' => [
Please login to merge, or discard this patch.