Passed
Push — master ( 32f79c...03cdff )
by Roeland
10:27 queued 11s
created
apps/user_ldap/templates/part.wizard-loginfilter.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,29 +1,29 @@  discard block
 block discarded – undo
1 1
 <fieldset id="ldapWizard3">
2 2
 	<div>
3 3
 		<p>
4
-			<?php p($l->t('When logging in, %s will find the user based on the following attributes:', [$theme->getName()]));?>
4
+			<?php p($l->t('When logging in, %s will find the user based on the following attributes:', [$theme->getName()])); ?>
5 5
 		</p>
6 6
 		<p>
7 7
 			<label for="ldap_loginfilter_username">
8
-				<?php p($l->t('LDAP / AD Username:'));?>
8
+				<?php p($l->t('LDAP / AD Username:')); ?>
9 9
 			</label>
10 10
 
11 11
 			<input type="checkbox" id="ldap_loginfilter_username"
12
-				   title="<?php p($l->t('Allows login against the LDAP / AD username, which is either "uid" or "sAMAccountName" and will be detected.'));?>"
12
+				   title="<?php p($l->t('Allows login against the LDAP / AD username, which is either "uid" or "sAMAccountName" and will be detected.')); ?>"
13 13
 				   name="ldap_loginfilter_username" value="1" />
14 14
 		</p>
15 15
 		<p>
16 16
 			<label for="ldap_loginfilter_email">
17
-				<?php p($l->t('LDAP / AD Email Address:'));?>
17
+				<?php p($l->t('LDAP / AD Email Address:')); ?>
18 18
 			</label>
19 19
 
20 20
 			<input type="checkbox" id="ldap_loginfilter_email"
21
-				   title="<?php p($l->t('Allows login against an email attribute. "mail" and "mailPrimaryAddress" allowed.'));?>"
21
+				   title="<?php p($l->t('Allows login against an email attribute. "mail" and "mailPrimaryAddress" allowed.')); ?>"
22 22
 				   name="ldap_loginfilter_email" value="1" />
23 23
 		</p>
24 24
 		<p>
25 25
 			<label for="ldap_loginfilter_attributes">
26
-				<?php p($l->t('Other Attributes:'));?>
26
+				<?php p($l->t('Other Attributes:')); ?>
27 27
 			</label>
28 28
 
29 29
 			<select id="ldap_loginfilter_attributes" multiple="multiple"
@@ -31,17 +31,17 @@  discard block
 block discarded – undo
31 31
 			</select>
32 32
 		</p>
33 33
 		<p>
34
-			<label><a id='toggleRawLoginFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query'));?></a></label>
34
+			<label><a id='toggleRawLoginFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query')); ?></a></label>
35 35
 		</p>
36 36
 		<p id="ldapReadOnlyLoginFilterContainer" class="hidden ldapReadOnlyFilterContainer">
37
-			<label><?php p($l->t('LDAP Filter:'));?></label>
37
+			<label><?php p($l->t('LDAP Filter:')); ?></label>
38 38
 			<span class="ldapFilterReadOnlyElement ldapInputColElement"></span>
39 39
 		</p>
40 40
 		<p id="rawLoginFilterContainer" class="invisible">
41 41
 			<textarea type="text" id="ldap_login_filter" name="ldap_login_filter"
42 42
 				class="ldapFilterInputElement"
43
-				placeholder="<?php p($l->t('Edit LDAP Query'));?>"
44
-				title="<?php p($l->t('Defines the filter to apply, when login is attempted. "%%uid" replaces the username in the login action. Example: "uid=%%uid"'));?>">
43
+				placeholder="<?php p($l->t('Edit LDAP Query')); ?>"
44
+				title="<?php p($l->t('Defines the filter to apply, when login is attempted. "%%uid" replaces the username in the login action. Example: "uid=%%uid"')); ?>">
45 45
 			</textarea>
46 46
 		</p>
47 47
 		<p>
@@ -49,11 +49,11 @@  discard block
 block discarded – undo
49 49
 		</p>
50 50
 		<p class="ldap_verify">
51 51
 			<input type="text" id="ldap_test_loginname" name="ldap_test_loginname"
52
-				   placeholder="<?php p($l->t('Test Loginname'));?>"
52
+				   placeholder="<?php p($l->t('Test Loginname')); ?>"
53 53
 				   class="ldapVerifyInput"
54 54
 				   title="Attempts to receive a DN for the given loginname and the current login filter"/>
55 55
 			<button class="ldapVerifyLoginName" name="ldapTestLoginSettings" type="button" disabled="disabled">
56
-				<?php p($l->t('Verify settings'));?>
56
+				<?php p($l->t('Verify settings')); ?>
57 57
 			</button>
58 58
 		</p>
59 59
 		<?php print_unescaped($_['wizardControls']); ?>
Please login to merge, or discard this patch.
core/templates/exception.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 	<ul>
15 15
 		<li><?php p($l->t('Remote Address: %s', [$_['remoteAddr']])) ?></li>
16 16
 		<li><?php p($l->t('Request ID: %s', [$_['requestID']])) ?></li>
17
-		<?php if($_['debugMode']): ?>
17
+		<?php if ($_['debugMode']): ?>
18 18
 			<li><?php p($l->t('Type: %s', [$_['errorClass']])) ?></li>
19 19
 			<li><?php p($l->t('Code: %s', [$_['errorCode']])) ?></li>
20 20
 			<li><?php p($l->t('Message: %s', [$_['errorMsg']])) ?></li>
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 		<?php endif; ?>
24 24
 	</ul>
25 25
 
26
-	<?php if($_['debugMode']): ?>
26
+	<?php if ($_['debugMode']): ?>
27 27
 		<br />
28 28
 		<h3><?php p($l->t('Trace')) ?></h3>
29 29
 		<pre><?php p($_['trace']) ?></pre>
Please login to merge, or discard this patch.
apps/systemtags/lib/Activity/Listener.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 		$activity->setApp('systemtags')
111 111
 			->setType('systemtags')
112 112
 			->setAuthor($actor)
113
-			->setObject('systemtag', (int)$tag->getId(), $tag->getName());
113
+			->setObject('systemtag', (int) $tag->getId(), $tag->getName());
114 114
 		if ($event->getEvent() === ManagerEvent::EVENT_CREATE) {
115 115
 			$activity->setSubject(Provider::CREATE_TAG, [
116 116
 				$actor,
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 	 */
151 151
 	public function mapperEvent(MapperEvent $event) {
152 152
 		$tagIds = $event->getTags();
153
-		if ($event->getObjectType() !== 'files' ||empty($tagIds)
153
+		if ($event->getObjectType() !== 'files' || empty($tagIds)
154 154
 			|| !in_array($event->getEvent(), [MapperEvent::EVENT_ASSIGN, MapperEvent::EVENT_UNASSIGN])
155 155
 			|| !$this->appManager->isInstalled('activity')) {
156 156
 			// System tags not for files, no tags, not (un-)assigning or no activity-app enabled (save the energy)
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 			->setObject($event->getObjectType(), (int) $event->getObjectId());
203 203
 
204 204
 		foreach ($users as $user => $path) {
205
-			$user = (string)$user; // numerical ids could be ints which are not accepted everywhere
205
+			$user = (string) $user; // numerical ids could be ints which are not accepted everywhere
206 206
 			$activity->setAffectedUser($user);
207 207
 
208 208
 			foreach ($tags as $tag) {
Please login to merge, or discard this patch.
apps/files_external/lib/Command/ListCommand.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -157,11 +157,11 @@  discard block
 block discarded – undo
157 157
 		}
158 158
 
159 159
 		if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
160
-			$keys = array_map(function ($header) {
160
+			$keys = array_map(function($header) {
161 161
 				return strtolower(str_replace(' ', '_', $header));
162 162
 			}, $headers);
163 163
 
164
-			$pairs = array_map(function (StorageConfig $config) use ($keys, $userId) {
164
+			$pairs = array_map(function(StorageConfig $config) use ($keys, $userId) {
165 165
 				$values = [
166 166
 					$config->getId(),
167 167
 					$config->getMountPoint(),
@@ -195,23 +195,23 @@  discard block
 block discarded – undo
195 195
 				'encoding_compatibility' => false,
196 196
 				'readonly' => false,
197 197
 			];
198
-			$rows = array_map(function (StorageConfig $config) use ($userId, $defaultMountOptions, $full) {
198
+			$rows = array_map(function(StorageConfig $config) use ($userId, $defaultMountOptions, $full) {
199 199
 				$storageConfig = $config->getBackendOptions();
200 200
 				$keys = array_keys($storageConfig);
201 201
 				$values = array_values($storageConfig);
202 202
 
203 203
 				if (!$full) {
204
-					$values = array_map(function ($value) {
204
+					$values = array_map(function($value) {
205 205
 						if (is_string($value) && strlen($value) > 32) {
206
-							return substr($value, 0, 6) . '...' . substr($value, -6, 6);
206
+							return substr($value, 0, 6).'...'.substr($value, -6, 6);
207 207
 						} else {
208 208
 							return $value;
209 209
 						}
210 210
 					}, $values);
211 211
 				}
212 212
 
213
-				$configStrings = array_map(function ($key, $value) {
214
-					return $key . ': ' . json_encode($value);
213
+				$configStrings = array_map(function($key, $value) {
214
+					return $key.': '.json_encode($value);
215 215
 				}, $keys, $values);
216 216
 				$configString = implode(', ', $configStrings);
217 217
 
@@ -225,8 +225,8 @@  discard block
 block discarded – undo
225 225
 				$keys = array_keys($mountOptions);
226 226
 				$values = array_values($mountOptions);
227 227
 
228
-				$optionsStrings = array_map(function ($key, $value) {
229
-					return $key . ': ' . json_encode($value);
228
+				$optionsStrings = array_map(function($key, $value) {
229
+					return $key.': '.json_encode($value);
230 230
 				}, $keys, $values);
231 231
 				$optionsString = implode(', ', $optionsStrings);
232 232
 
Please login to merge, or discard this patch.
apps/files_sharing/lib/Helper.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 		$dir = $pathinfo['dirname'];
59 59
 		$i = 2;
60 60
 		while ($view->file_exists($path) || in_array($path, $excludeList)) {
61
-			$path = Filesystem::normalizePath($dir . '/' . $name . ' ('.$i.')' . $ext);
61
+			$path = Filesystem::normalizePath($dir.'/'.$name.' ('.$i.')'.$ext);
62 62
 			$i++;
63 63
 		}
64 64
 
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 			$dir = '';
83 83
 			$subdirs = explode('/', $shareFolder);
84 84
 			foreach ($subdirs as $subdir) {
85
-				$dir = $dir . '/' . $subdir;
85
+				$dir = $dir.'/'.$subdir;
86 86
 				if (!$view->is_dir($dir)) {
87 87
 					$view->mkdir($dir);
88 88
 				}
Please login to merge, or discard this patch.
apps/encryption/lib/AppInfo/Application.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 		$container = $this->getContainer();
131 131
 
132 132
 		$container->registerService('Crypt',
133
-			function (IAppContainer $c) {
133
+			function(IAppContainer $c) {
134 134
 				$server = $c->getServer();
135 135
 				return new Crypt($server->getLogger(),
136 136
 					$server->getUserSession(),
@@ -139,14 +139,14 @@  discard block
 block discarded – undo
139 139
 			});
140 140
 
141 141
 		$container->registerService('Session',
142
-			function (IAppContainer $c) {
142
+			function(IAppContainer $c) {
143 143
 				$server = $c->getServer();
144 144
 				return new Session($server->getSession());
145 145
 			}
146 146
 		);
147 147
 
148 148
 		$container->registerService('KeyManager',
149
-			function (IAppContainer $c) {
149
+			function(IAppContainer $c) {
150 150
 				$server = $c->getServer();
151 151
 
152 152
 				return new KeyManager($server->getEncryptionKeyStorage(),
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
 			});
161 161
 
162 162
 		$container->registerService('Recovery',
163
-			function (IAppContainer $c) {
163
+			function(IAppContainer $c) {
164 164
 				$server = $c->getServer();
165 165
 
166 166
 				return new Recovery(
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
 					new View());
175 175
 			});
176 176
 
177
-		$container->registerService('RecoveryController', function (IAppContainer $c) {
177
+		$container->registerService('RecoveryController', function(IAppContainer $c) {
178 178
 			$server = $c->getServer();
179 179
 			return new RecoveryController(
180 180
 				$c->getAppName(),
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 				$c->query('Recovery'));
185 185
 		});
186 186
 
187
-		$container->registerService('StatusController', function (IAppContainer $c) {
187
+		$container->registerService('StatusController', function(IAppContainer $c) {
188 188
 			$server = $c->getServer();
189 189
 			return new StatusController(
190 190
 				$c->getAppName(),
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
 			);
196 196
 		});
197 197
 
198
-		$container->registerService('SettingsController', function (IAppContainer $c) {
198
+		$container->registerService('SettingsController', function(IAppContainer $c) {
199 199
 			$server = $c->getServer();
200 200
 			return new SettingsController(
201 201
 				$c->getAppName(),
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 		});
213 213
 
214 214
 		$container->registerService('UserSetup',
215
-			function (IAppContainer $c) {
215
+			function(IAppContainer $c) {
216 216
 				$server = $c->getServer();
217 217
 				return new Setup($server->getLogger(),
218 218
 					$server->getUserSession(),
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
 			});
222 222
 
223 223
 		$container->registerService('Util',
224
-			function (IAppContainer $c) {
224
+			function(IAppContainer $c) {
225 225
 				$server = $c->getServer();
226 226
 
227 227
 				return new Util(
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 			});
235 235
 
236 236
 		$container->registerService('EncryptAll',
237
-			function (IAppContainer $c) {
237
+			function(IAppContainer $c) {
238 238
 				$server = $c->getServer();
239 239
 				return new EncryptAll(
240 240
 					$c->query('UserSetup'),
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
 		);
253 253
 
254 254
 		$container->registerService('DecryptAll',
255
-			function (IAppContainer $c) {
255
+			function(IAppContainer $c) {
256 256
 				return new DecryptAll(
257 257
 					$c->query('Util'),
258 258
 					$c->query('KeyManager'),
Please login to merge, or discard this patch.
apps/encryption/lib/Controller/StatusController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -72,28 +72,28 @@
 block discarded – undo
72 72
 
73 73
 		$status = 'error';
74 74
 		$message = 'no valid init status';
75
-		switch( $this->session->getStatus()) {
75
+		switch ($this->session->getStatus()) {
76 76
 			case Session::INIT_EXECUTED:
77 77
 				$status = 'interactionNeeded';
78
-				$message = (string)$this->l->t(
78
+				$message = (string) $this->l->t(
79 79
 					'Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files.'
80 80
 				);
81 81
 				break;
82 82
 			case Session::NOT_INITIALIZED:
83 83
 				$status = 'interactionNeeded';
84 84
 				if ($this->encryptionManager->isEnabled()) {
85
-					$message = (string)$this->l->t(
85
+					$message = (string) $this->l->t(
86 86
 						'Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.'
87 87
 					);
88 88
 				} else {
89
-					$message = (string)$this->l->t(
89
+					$message = (string) $this->l->t(
90 90
 						'Please enable server side encryption in the admin settings in order to use the encryption module.'
91 91
 					);
92 92
 				}
93 93
 				break;
94 94
 			case Session::INIT_SUCCESSFUL:
95 95
 				$status = 'success';
96
-				$message = (string)$this->l->t('Encryption app is enabled and ready');
96
+				$message = (string) $this->l->t('Encryption app is enabled and ready');
97 97
 		}
98 98
 
99 99
 		return new DataResponse(
Please login to merge, or discard this patch.
core/Command/Encryption/ChangeKeyStorageRoot.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 		}
144 144
 
145 145
 		$result = $this->rootView->file_put_contents(
146
-			$newRoot . '/' . Storage::KEY_STORAGE_MARKER,
146
+			$newRoot.'/'.Storage::KEY_STORAGE_MARKER,
147 147
 			'Nextcloud will detect this folder as key storage root only if this file exists'
148 148
 		);
149 149
 
@@ -162,10 +162,10 @@  discard block
 block discarded – undo
162 162
 	 */
163 163
 	protected function moveSystemKeys($oldRoot, $newRoot) {
164 164
 		if (
165
-			$this->rootView->is_dir($oldRoot . '/files_encryption') &&
166
-			$this->targetExists($newRoot . '/files_encryption') === false
165
+			$this->rootView->is_dir($oldRoot.'/files_encryption') &&
166
+			$this->targetExists($newRoot.'/files_encryption') === false
167 167
 		) {
168
-			$this->rootView->rename($oldRoot . '/files_encryption', $newRoot . '/files_encryption');
168
+			$this->rootView->rename($oldRoot.'/files_encryption', $newRoot.'/files_encryption');
169 169
 		}
170 170
 	}
171 171
 
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 		$progress->start();
195 195
 
196 196
 
197
-		foreach($this->userManager->getBackends() as $backend) {
197
+		foreach ($this->userManager->getBackends() as $backend) {
198 198
 			$limit = 500;
199 199
 			$offset = 0;
200 200
 			do {
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
 					$this->moveUserEncryptionFolder($user, $oldRoot, $newRoot);
206 206
 				}
207 207
 				$offset += $limit;
208
-			} while(count($users) >= $limit);
208
+			} while (count($users) >= $limit);
209 209
 		}
210 210
 		$progress->finish();
211 211
 	}
@@ -222,13 +222,13 @@  discard block
 block discarded – undo
222 222
 
223 223
 		if ($this->userManager->userExists($user)) {
224 224
 
225
-			$source = $oldRoot . '/' . $user . '/files_encryption';
226
-			$target = $newRoot . '/' . $user . '/files_encryption';
225
+			$source = $oldRoot.'/'.$user.'/files_encryption';
226
+			$target = $newRoot.'/'.$user.'/files_encryption';
227 227
 			if (
228 228
 				$this->rootView->is_dir($source) &&
229 229
 				$this->targetExists($target) === false
230 230
 			) {
231
-				$this->prepareParentFolder($newRoot . '/' . $user);
231
+				$this->prepareParentFolder($newRoot.'/'.$user);
232 232
 				$this->rootView->rename($source, $target);
233 233
 			}
234 234
 		}
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
 			$sub_dirs = explode('/', ltrim($path, '/'));
247 247
 			$dir = '';
248 248
 			foreach ($sub_dirs as $sub_dir) {
249
-				$dir .= '/' . $sub_dir;
249
+				$dir .= '/'.$sub_dir;
250 250
 				if ($this->rootView->file_exists($dir) === false) {
251 251
 					$this->rootView->mkdir($dir);
252 252
 				}
Please login to merge, or discard this patch.
apps/user_ldap/lib/Proxy.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	public function __construct(ILDAPWrapper $ldap) {
50 50
 		$this->ldap = $ldap;
51 51
 		$memcache = \OC::$server->getMemCacheFactory();
52
-		if($memcache->isAvailable()) {
52
+		if ($memcache->isAvailable()) {
53 53
 			$this->cache = $memcache->createDistributed();
54 54
 		}
55 55
 	}
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 		static $db;
68 68
 		static $coreUserManager;
69 69
 		static $coreNotificationManager;
70
-		if($fs === null) {
70
+		if ($fs === null) {
71 71
 			$ocConfig = \OC::$server->getConfig();
72 72
 			$fs       = new FilesystemHelper();
73 73
 			$log      = new LogWrapper();
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 	 * @return mixed
94 94
 	 */
95 95
 	protected function getAccess($configPrefix) {
96
-		if(!isset(self::$accesses[$configPrefix])) {
96
+		if (!isset(self::$accesses[$configPrefix])) {
97 97
 			$this->addAccess($configPrefix);
98 98
 		}
99 99
 		return self::$accesses[$configPrefix];
@@ -147,8 +147,8 @@  discard block
 block discarded – undo
147 147
 	 * @return mixed, the result of the specified method
148 148
 	 */
149 149
 	protected function handleRequest($id, $method, $parameters, $passOnWhen = false) {
150
-		$result = $this->callOnLastSeenOn($id,  $method, $parameters, $passOnWhen);
151
-		if($result === $passOnWhen) {
150
+		$result = $this->callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
151
+		if ($result === $passOnWhen) {
152 152
 			$result = $this->walkBackends($id, $method, $parameters);
153 153
 		}
154 154
 		return $result;
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
 	 */
161 161
 	private function getCacheKey($key) {
162 162
 		$prefix = 'LDAP-Proxy-';
163
-		if($key === null) {
163
+		if ($key === null) {
164 164
 			return $prefix;
165 165
 		}
166 166
 		return $prefix.hash('sha256', $key);
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 	 * @return mixed|null
172 172
 	 */
173 173
 	public function getFromCache($key) {
174
-		if($this->cache === null) {
174
+		if ($this->cache === null) {
175 175
 			return null;
176 176
 		}
177 177
 
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 	 * @param mixed $value
190 190
 	 */
191 191
 	public function writeToCache($key, $value) {
192
-		if($this->cache === null) {
192
+		if ($this->cache === null) {
193 193
 			return;
194 194
 		}
195 195
 		$key   = $this->getCacheKey($key);
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
 	}
199 199
 
200 200
 	public function clearCache() {
201
-		if($this->cache === null) {
201
+		if ($this->cache === null) {
202 202
 			return;
203 203
 		}
204 204
 		$this->cache->clear($this->getCacheKey(null));
Please login to merge, or discard this patch.