Completed
Pull Request — master (#7490)
by Tobia
19:43 queued 01:32
created
lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -84,8 +84,8 @@  discard block
 block discarded – undo
84 84
 		$anonPeriod = $this->reflector->getAnnotationParameter('AnonRateThrottle', 'period');
85 85
 		$userLimit = $this->reflector->getAnnotationParameter('UserRateThrottle', 'limit');
86 86
 		$userPeriod = $this->reflector->getAnnotationParameter('UserRateThrottle', 'period');
87
-		$rateLimitIdentifier = get_class($controller) . '::' . $methodName;
88
-		if($userLimit !== '' && $userPeriod !== '' && $this->userSession->isLoggedIn()) {
87
+		$rateLimitIdentifier = get_class($controller).'::'.$methodName;
88
+		if ($userLimit !== '' && $userPeriod !== '' && $this->userSession->isLoggedIn()) {
89 89
 			$this->limiter->registerUserRequest(
90 90
 				$rateLimitIdentifier,
91 91
 				$userLimit,
@@ -106,8 +106,8 @@  discard block
 block discarded – undo
106 106
 	 * {@inheritDoc}
107 107
 	 */
108 108
 	public function afterException($controller, $methodName, \Exception $exception) {
109
-		if($exception instanceof RateLimitExceededException) {
110
-			if (stripos($this->request->getHeader('Accept'),'html') === false) {
109
+		if ($exception instanceof RateLimitExceededException) {
110
+			if (stripos($this->request->getHeader('Accept'), 'html') === false) {
111 111
 				$response = new JSONResponse(
112 112
 					[
113 113
 						'message' => $exception->getMessage(),
Please login to merge, or discard this patch.
lib/private/Security/RateLimiting/Backend/MemoryCache.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 	 */
55 55
 	private function hash($methodIdentifier,
56 56
 						  $userIdentifier) {
57
-		return hash('sha512', $methodIdentifier . $userIdentifier);
57
+		return hash('sha512', $methodIdentifier.$userIdentifier);
58 58
 	}
59 59
 
60 60
 	/**
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 	 */
64 64
 	private function getExistingAttempts($identifier) {
65 65
 		$cachedAttempts = json_decode($this->cache->get($identifier), true);
66
-		if(is_array($cachedAttempts)) {
66
+		if (is_array($cachedAttempts)) {
67 67
 			return $cachedAttempts;
68 68
 		}
69 69
 
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 		$currentTime = $this->timeFactory->getTime();
84 84
 		/** @var array $existingAttempts */
85 85
 		foreach ($existingAttempts as $attempt) {
86
-			if(($attempt + $seconds) > $currentTime) {
86
+			if (($attempt + $seconds) > $currentTime) {
87 87
 				$count++;
88 88
 			}
89 89
 		}
@@ -103,14 +103,14 @@  discard block
 block discarded – undo
103 103
 
104 104
 		// Unset all attempts older than $period
105 105
 		foreach ($existingAttempts as $key => $attempt) {
106
-			if(($attempt + $period) < $currentTime) {
106
+			if (($attempt + $period) < $currentTime) {
107 107
 				unset($existingAttempts[$key]);
108 108
 			}
109 109
 		}
110 110
 		$existingAttempts = array_values($existingAttempts);
111 111
 
112 112
 		// Store the new attempt
113
-		$existingAttempts[] = (string)$currentTime;
113
+		$existingAttempts[] = (string) $currentTime;
114 114
 		$this->cache->set($identifier, json_encode($existingAttempts));
115 115
 	}
116 116
 }
Please login to merge, or discard this patch.
lib/private/AppFramework/Middleware/Security/BruteForceMiddleware.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 	public function beforeController($controller, $methodName) {
62 62
 		parent::beforeController($controller, $methodName);
63 63
 
64
-		if($this->reflector->hasAnnotation('BruteForceProtection')) {
64
+		if ($this->reflector->hasAnnotation('BruteForceProtection')) {
65 65
 			$action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
66 66
 			$this->throttler->sleepDelay($this->request->getRemoteAddress(), $action);
67 67
 		}
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	 * {@inheritDoc}
72 72
 	 */
73 73
 	public function afterController($controller, $methodName, Response $response) {
74
-		if($this->reflector->hasAnnotation('BruteForceProtection') && $response->isThrottled()) {
74
+		if ($this->reflector->hasAnnotation('BruteForceProtection') && $response->isThrottled()) {
75 75
 			$action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
76 76
 			$ip = $this->request->getRemoteAddress();
77 77
 			$this->throttler->sleepDelay($ip, $action);
Please login to merge, or discard this patch.
apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 		$storedPassword = $share->getPassword();
148 148
 		$authenticated = $this->session->get('public_link_authenticated') === $share->getId() ||
149 149
 			$this->shareManager->checkPassword($share, $password);
150
-		if (!empty($storedPassword) && !$authenticated ) {
150
+		if (!empty($storedPassword) && !$authenticated) {
151 151
 			$response = new JSONResponse(
152 152
 				['message' => 'No permission to access the share'],
153 153
 				Http::STATUS_BAD_REQUEST
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 		$httpClient = $this->clientService->newClient();
192 192
 
193 193
 		try {
194
-			$response = $httpClient->post($remote . '/index.php/apps/federatedfilesharing/createFederatedShare',
194
+			$response = $httpClient->post($remote.'/index.php/apps/federatedfilesharing/createFederatedShare',
195 195
 				[
196 196
 					'body' =>
197 197
 						[
@@ -285,14 +285,14 @@  discard block
 block discarded – undo
285 285
 			// note: checkStorageAvailability will already remove the invalid share
286 286
 			Util::writeLog(
287 287
 				'federatedfilesharing',
288
-				'Invalid remote storage: ' . get_class($e) . ': ' . $e->getMessage(),
288
+				'Invalid remote storage: '.get_class($e).': '.$e->getMessage(),
289 289
 				Util::DEBUG
290 290
 			);
291 291
 			return new JSONResponse(['message' => $this->l->t('Could not authenticate to remote share, password might be wrong')], Http::STATUS_BAD_REQUEST);
292 292
 		} catch (\Exception $e) {
293 293
 			Util::writeLog(
294 294
 				'federatedfilesharing',
295
-				'Invalid remote storage: ' . get_class($e) . ': ' . $e->getMessage(),
295
+				'Invalid remote storage: '.get_class($e).': '.$e->getMessage(),
296 296
 				Util::DEBUG
297 297
 			);
298 298
 			$externalManager->removeShare($mount->getMountPoint());
@@ -311,14 +311,14 @@  discard block
 block discarded – undo
311 311
 			} catch (StorageInvalidException $e) {
312 312
 				Util::writeLog(
313 313
 					'federatedfilesharing',
314
-					'Invalid remote storage: ' . get_class($e) . ': ' . $e->getMessage(),
314
+					'Invalid remote storage: '.get_class($e).': '.$e->getMessage(),
315 315
 					Util::DEBUG
316 316
 				);
317 317
 				return new JSONResponse(['message' => $this->l->t('Storage not valid')], Http::STATUS_BAD_REQUEST);
318 318
 			} catch (\Exception $e) {
319 319
 				Util::writeLog(
320 320
 					'federatedfilesharing',
321
-					'Invalid remote storage: ' . get_class($e) . ': ' . $e->getMessage(),
321
+					'Invalid remote storage: '.get_class($e).': '.$e->getMessage(),
322 322
 					Util::DEBUG
323 323
 				);
324 324
 				return new JSONResponse(['message' => $this->l->t('Couldn\'t add remote share')], Http::STATUS_BAD_REQUEST);
Please login to merge, or discard this patch.
apps/files_external/lib/Controller/UserStoragesController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -198,7 +198,7 @@
 block discarded – undo
198 198
 		} catch (NotFoundException $e) {
199 199
 			return new DataResponse(
200 200
 				[
201
-					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
201
+					'message' => (string) $this->l10n->t('Storage with ID "%d" not found', array($id))
202 202
 				],
203 203
 				Http::STATUS_NOT_FOUND
204 204
 			);
Please login to merge, or discard this patch.
apps/files_external/lib/Controller/StoragesController.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 			$this->logger->logException($e);
128 128
 			return new DataResponse(
129 129
 				[
130
-					'message' => (string)$this->l10n->t('Invalid backend or authentication mechanism class')
130
+					'message' => (string) $this->l10n->t('Invalid backend or authentication mechanism class')
131 131
 				],
132 132
 				Http::STATUS_UNPROCESSABLE_ENTITY
133 133
 			);
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 		if ($mountPoint === '') {
147 147
 			return new DataResponse(
148 148
 				array(
149
-					'message' => (string)$this->l10n->t('Invalid mount point')
149
+					'message' => (string) $this->l10n->t('Invalid mount point')
150 150
 				),
151 151
 				Http::STATUS_UNPROCESSABLE_ENTITY
152 152
 			);
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 			// objectstore must not be sent from client side
157 157
 			return new DataResponse(
158 158
 				array(
159
-					'message' => (string)$this->l10n->t('Objectstore forbidden')
159
+					'message' => (string) $this->l10n->t('Objectstore forbidden')
160 160
 				),
161 161
 				Http::STATUS_UNPROCESSABLE_ENTITY
162 162
 			);
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 			// invalid backend
171 171
 			return new DataResponse(
172 172
 				array(
173
-					'message' => (string)$this->l10n->t('Invalid storage backend "%s"', [
173
+					'message' => (string) $this->l10n->t('Invalid storage backend "%s"', [
174 174
 						$backend->getIdentifier()
175 175
 					])
176 176
 				),
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 			// not permitted to use backend
183 183
 			return new DataResponse(
184 184
 				array(
185
-					'message' => (string)$this->l10n->t('Not permitted to use backend "%s"', [
185
+					'message' => (string) $this->l10n->t('Not permitted to use backend "%s"', [
186 186
 						$backend->getIdentifier()
187 187
 					])
188 188
 				),
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
 			// not permitted to use auth mechanism
194 194
 			return new DataResponse(
195 195
 				array(
196
-					'message' => (string)$this->l10n->t('Not permitted to use authentication mechanism "%s"', [
196
+					'message' => (string) $this->l10n->t('Not permitted to use authentication mechanism "%s"', [
197 197
 						$authMechanism->getIdentifier()
198 198
 					])
199 199
 				),
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
 			// unsatisfied parameters
206 206
 			return new DataResponse(
207 207
 				array(
208
-					'message' => (string)$this->l10n->t('Unsatisfied backend parameters')
208
+					'message' => (string) $this->l10n->t('Unsatisfied backend parameters')
209 209
 				),
210 210
 				Http::STATUS_UNPROCESSABLE_ENTITY
211 211
 			);
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 			// unsatisfied parameters
215 215
 			return new DataResponse(
216 216
 				[
217
-					'message' => (string)$this->l10n->t('Unsatisfied authentication mechanism parameters')
217
+					'message' => (string) $this->l10n->t('Unsatisfied authentication mechanism parameters')
218 218
 				],
219 219
 				Http::STATUS_UNPROCESSABLE_ENTITY
220 220
 			);
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 	 * @param StorageConfig $storage storage configuration
242 242
 	 * @param bool $testOnly whether to storage should only test the connection or do more things
243 243
 	 */
244
-	protected function updateStorageStatus(StorageConfig &$storage, $testOnly = true) {
244
+	protected function updateStorageStatus(StorageConfig & $storage, $testOnly = true) {
245 245
 		try {
246 246
 			$this->manipulateStorageConfig($storage);
247 247
 
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 		} catch (NotFoundException $e) {
307 307
 			return new DataResponse(
308 308
 				[
309
-					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
309
+					'message' => (string) $this->l10n->t('Storage with ID "%d" not found', array($id))
310 310
 				],
311 311
 				Http::STATUS_NOT_FOUND
312 312
 			);
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
 		} catch (NotFoundException $e) {
332 332
 			return new DataResponse(
333 333
 				[
334
-					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
334
+					'message' => (string) $this->l10n->t('Storage with ID "%d" not found', array($id))
335 335
 				],
336 336
 				Http::STATUS_NOT_FOUND
337 337
 			);
Please login to merge, or discard this patch.
apps/user_ldap/templates/part.wizard-groupfilter.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <fieldset id="ldapWizard4">
2 2
 	<div>
3 3
 		<p>
4
-			<?php p($l->t('Groups meeting these criteria are available in %s:', $theme->getName()));?>
4
+			<?php p($l->t('Groups meeting these criteria are available in %s:', $theme->getName())); ?>
5 5
 		</p>
6 6
 		<p>
7 7
 			<label for="ldap_groupfilter_objectclass">
8
-				<?php p($l->t('Only these object classes:'));?>
8
+				<?php p($l->t('Only these object classes:')); ?>
9 9
 			</label>
10 10
 
11 11
 			<select id="ldap_groupfilter_objectclass" multiple="multiple"
@@ -14,10 +14,10 @@  discard block
 block discarded – undo
14 14
 		</p>
15 15
 		<p>
16 16
 			<label for="ldap_groupfilter_groups">
17
-				<?php p($l->t('Only from these groups:'));?>
17
+				<?php p($l->t('Only from these groups:')); ?>
18 18
 			</label>
19 19
 
20
-			<input type="text" class="ldapManyGroupsSupport ldapManyGroupsSearch hidden" placeholder="<?php p($l->t('Search groups'));?>" />
20
+			<input type="text" class="ldapManyGroupsSupport ldapManyGroupsSearch hidden" placeholder="<?php p($l->t('Search groups')); ?>" />
21 21
 
22 22
 			<select id="ldap_groupfilter_groups" multiple="multiple"
23 23
 			 name="ldap_groupfilter_groups" class="multiSelectPlugin">
@@ -27,25 +27,25 @@  discard block
 block discarded – undo
27 27
 		<p class="ldapManyGroupsSupport hidden">
28 28
 			<label></label>
29 29
 			<select class="ldapGroupList ldapGroupListAvailable" multiple="multiple"
30
-					title="<?php p($l->t('Available groups'));?>"></select>
30
+					title="<?php p($l->t('Available groups')); ?>"></select>
31 31
 			<span class="buttonSpan">
32 32
 				<button class="ldapGroupListSelect" type="button">&gt;</button><br/>
33 33
 				<button class="ldapGroupListDeselect" type="button">&lt;</button>
34 34
 			</span>
35 35
 			<select class="ldapGroupList ldapGroupListSelected" multiple="multiple"
36
-					title="<?php p($l->t('Selected groups'));?>"></select>
36
+					title="<?php p($l->t('Selected groups')); ?>"></select>
37 37
 		</p>
38 38
 		<p>
39
-			<label><a id='toggleRawGroupFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query'));?></a></label>
39
+			<label><a id='toggleRawGroupFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query')); ?></a></label>
40 40
 		</p>
41 41
 		<p id="ldapReadOnlyGroupFilterContainer" class="hidden ldapReadOnlyFilterContainer">
42
-			<label><?php p($l->t('LDAP Filter:'));?></label>
42
+			<label><?php p($l->t('LDAP Filter:')); ?></label>
43 43
 			<span class="ldapFilterReadOnlyElement ldapInputColElement"></span>
44 44
 		</p>
45 45
 		<p id="rawGroupFilterContainer" class="invisible">
46 46
 			<textarea type="text" id="ldap_group_filter" name="ldap_group_filter"
47
-					  placeholder="<?php p($l->t('Edit LDAP Query'));?>"
48
-					  title="<?php p($l->t('The filter specifies which LDAP groups shall have access to the %s instance.', $theme->getName()));?>">
47
+					  placeholder="<?php p($l->t('Edit LDAP Query')); ?>"
48
+					  title="<?php p($l->t('The filter specifies which LDAP groups shall have access to the %s instance.', $theme->getName())); ?>">
49 49
 			</textarea>
50 50
 		</p>
51 51
 		<p>
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 		</p>
54 54
 		<p class="ldap_count">
55 55
 			<button class="ldapGetEntryCount ldapGetGroupCount" name="ldapGetEntryCount" type="button">
56
-				<?php p($l->t('Verify settings and count the groups'));?>
56
+				<?php p($l->t('Verify settings and count the groups')); ?>
57 57
 			</button>
58 58
 			<span id="ldap_group_count"></span>
59 59
 		</p>
Please login to merge, or discard this patch.
apps/files_external/lib/Controller/UserGlobalStoragesController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 		} catch (NotFoundException $e) {
123 123
 			return new DataResponse(
124 124
 				[
125
-					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
125
+					'message' => (string) $this->l10n->t('Storage with ID "%d" not found', array($id))
126 126
 				],
127 127
 				Http::STATUS_NOT_FOUND
128 128
 			);
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 			} else {
163 163
 				return new DataResponse(
164 164
 					[
165
-						'message' => (string)$this->l10n->t('Storage with ID "%d" is not user editable', array($id))
165
+						'message' => (string) $this->l10n->t('Storage with ID "%d" is not user editable', array($id))
166 166
 					],
167 167
 					Http::STATUS_FORBIDDEN
168 168
 				);
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 		} catch (NotFoundException $e) {
171 171
 			return new DataResponse(
172 172
 				[
173
-					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
173
+					'message' => (string) $this->l10n->t('Storage with ID "%d" not found', array($id))
174 174
 				],
175 175
 				Http::STATUS_NOT_FOUND
176 176
 			);
Please login to merge, or discard this patch.
apps/files_external/lib/Controller/GlobalStoragesController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -198,7 +198,7 @@
 block discarded – undo
198 198
 		} catch (NotFoundException $e) {
199 199
 			return new DataResponse(
200 200
 				[
201
-					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
201
+					'message' => (string) $this->l10n->t('Storage with ID "%d" not found', array($id))
202 202
 				],
203 203
 				Http::STATUS_NOT_FOUND
204 204
 			);
Please login to merge, or discard this patch.