Completed
Pull Request — master (#5231)
by Morris
16:38
created
apps/user_ldap/appinfo/install.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
  *
23 23
  */
24 24
 $state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'doSet');
25
-if($state === 'doSet') {
25
+if ($state === 'doSet') {
26 26
 	OCP\Config::setSystemValue('ldapIgnoreNamingRules', false);
27 27
 }
28 28
 
Please login to merge, or discard this patch.
apps/files_external/templates/list.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
 <div id="emptycontent" class="hidden">
8 8
 	<div class="icon-external"></div>
9 9
 	<h2><?php p($l->t('No external storage configured')); ?></h2>
10
-	<p><a href="<?php p(link_to('', 'index.php/settings/personal#files_external' )); ?>"><?php p($l->t('You can add external storages in the personal settings')); ?></a></p>
10
+	<p><a href="<?php p(link_to('', 'index.php/settings/personal#files_external')); ?>"><?php p($l->t('You can add external storages in the personal settings')); ?></a></p>
11 11
 </div>
12 12
 
13 13
 <input type="hidden" name="dir" value="" id="dir">
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 		<tr>
18 18
 			<th id='headerName' class="hidden column-name">
19 19
 				<div id="headerName-container">
20
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
20
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
21 21
 				</div>
22 22
 			</th>
23 23
 			<th id="headerBackend" class="hidden column-backend">
Please login to merge, or discard this patch.
apps/files_external/ajax/oauth1.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
25 25
  *
26 26
  */
27
-require_once __DIR__ . '/../3rdparty/Dropbox/autoload.php';
27
+require_once __DIR__.'/../3rdparty/Dropbox/autoload.php';
28 28
 
29 29
 OCP\JSON::checkAppEnabled('files_external');
30 30
 OCP\JSON::checkLoggedIn();
@@ -33,13 +33,13 @@  discard block
 block discarded – undo
33 33
 
34 34
 // FIXME: currently hard-coded to Dropbox OAuth
35 35
 if (isset($_POST['app_key']) && isset($_POST['app_secret'])) {
36
-	$oauth = new Dropbox_OAuth_Curl((string)$_POST['app_key'], (string)$_POST['app_secret']);
36
+	$oauth = new Dropbox_OAuth_Curl((string) $_POST['app_key'], (string) $_POST['app_secret']);
37 37
 	if (isset($_POST['step'])) {
38 38
 		switch ($_POST['step']) {
39 39
 			case 1:
40 40
 				try {
41 41
 					if (isset($_POST['callback'])) {
42
-						$callback = (string)$_POST['callback'];
42
+						$callback = (string) $_POST['callback'];
43 43
 					} else {
44 44
 						$callback = null;
45 45
 					}
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 			case 2:
57 57
 				if (isset($_POST['request_token']) && isset($_POST['request_token_secret'])) {
58 58
 					try {
59
-						$oauth->setToken((string)$_POST['request_token'], (string)$_POST['request_token_secret']);
59
+						$oauth->setToken((string) $_POST['request_token'], (string) $_POST['request_token_secret']);
60 60
 						$token = $oauth->getAccessToken();
61 61
 						OCP\JSON::success(array('access_token' => $token['token'],
62 62
 												'access_token_secret' => $token['token_secret']));
Please login to merge, or discard this patch.
apps/files_external/ajax/oauth2.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -39,9 +39,9 @@  discard block
 block discarded – undo
39 39
 // FIXME: currently hard-coded to Google Drive
40 40
 if (isset($_POST['client_id']) && isset($_POST['client_secret']) && isset($_POST['redirect'])) {
41 41
 	$client = new Google_Client();
42
-	$client->setClientId((string)$_POST['client_id']);
43
-	$client->setClientSecret((string)$_POST['client_secret']);
44
-	$client->setRedirectUri((string)$_POST['redirect']);
42
+	$client->setClientId((string) $_POST['client_id']);
43
+	$client->setClientSecret((string) $_POST['client_secret']);
44
+	$client->setRedirectUri((string) $_POST['redirect']);
45 45
 	$client->setScopes(array('https://www.googleapis.com/auth/drive'));
46 46
 	$client->setApprovalPrompt('force');
47 47
 	$client->setAccessType('offline');
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 			}
61 61
 		} else if ($step == 2 && isset($_POST['code'])) {
62 62
 			try {
63
-				$token = $client->authenticate((string)$_POST['code']);
63
+				$token = $client->authenticate((string) $_POST['code']);
64 64
 				OCP\JSON::success(array('data' => array(
65 65
 					'token' => $token
66 66
 				)));
Please login to merge, or discard this patch.
apps/files_external/ajax/applicable.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -30,13 +30,13 @@
 block discarded – undo
30 30
 $limit = null;
31 31
 $offset = null;
32 32
 if (isset($_GET['pattern'])) {
33
-	$pattern = (string)$_GET['pattern'];
33
+	$pattern = (string) $_GET['pattern'];
34 34
 }
35 35
 if (isset($_GET['limit'])) {
36
-	$limit = (int)$_GET['limit'];
36
+	$limit = (int) $_GET['limit'];
37 37
 }
38 38
 if (isset($_GET['offset'])) {
39
-	$offset = (int)$_GET['offset'];
39
+	$offset = (int) $_GET['offset'];
40 40
 }
41 41
 
42 42
 $groups = [];
Please login to merge, or discard this patch.
apps/files_external/lib/Service/UserGlobalStoragesService.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 
115 115
 		$result = [];
116 116
 		foreach ($storagesByMountpoint as $storageList) {
117
-			$storage = array_reduce($storageList, function ($carry, $item) {
117
+			$storage = array_reduce($storageList, function($carry, $item) {
118 118
 				if (isset($carry)) {
119 119
 					$carryPriorityType = $this->getPriorityType($carry);
120 120
 					$itemPriorityType = $this->getPriorityType($item);
@@ -186,11 +186,11 @@  discard block
 block discarded – undo
186 186
 		$groupIds = $this->groupManager->getUserGroupIds($this->getUser());
187 187
 		$mounts = $this->dbConfig->getMountsForUser($this->getUser()->getUID(), $groupIds);
188 188
 		$configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts);
189
-		$configs = array_filter($configs, function ($config) {
189
+		$configs = array_filter($configs, function($config) {
190 190
 			return $config instanceof StorageConfig;
191 191
 		});
192 192
 
193
-		$keys = array_map(function (StorageConfig $config) {
193
+		$keys = array_map(function(StorageConfig $config) {
194 194
 			return $config->getId();
195 195
 		}, $configs);
196 196
 
Please login to merge, or discard this patch.
apps/files_external/lib/Service/GlobalStoragesService.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -172,11 +172,11 @@
 block discarded – undo
172 172
 	public function getStorageForAllUsers() {
173 173
 		$mounts = $this->dbConfig->getAllMounts();
174 174
 		$configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts);
175
-		$configs = array_filter($configs, function ($config) {
175
+		$configs = array_filter($configs, function($config) {
176 176
 			return $config instanceof StorageConfig;
177 177
 		});
178 178
 
179
-		$keys = array_map(function (StorageConfig $config) {
179
+		$keys = array_map(function(StorageConfig $config) {
180 180
 			return $config->getId();
181 181
 		}, $configs);
182 182
 
Please login to merge, or discard this patch.
apps/files_external/lib/Service/DBConfigService.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 	 */
179 179
 	public function getAdminMountsForMultiple($type, array $values) {
180 180
 		$builder = $this->connection->getQueryBuilder();
181
-		$params = array_map(function ($value) use ($builder) {
181
+		$params = array_map(function($value) use ($builder) {
182 182
 			return $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR);
183 183
 		}, $values);
184 184
 
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
 				'type' => $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)
232 232
 			]);
233 233
 		$query->execute();
234
-		return (int)$this->connection->lastInsertId('*PREFIX*external_mounts');
234
+		return (int) $this->connection->lastInsertId('*PREFIX*external_mounts');
235 235
 	}
236 236
 
237 237
 	/**
@@ -367,7 +367,7 @@  discard block
 block discarded – undo
367 367
 		}
368 368
 		$uniqueMounts = array_values($uniqueMounts);
369 369
 
370
-		$mountIds = array_map(function ($mount) {
370
+		$mountIds = array_map(function($mount) {
371 371
 			return $mount['mount_id'];
372 372
 		}, $uniqueMounts);
373 373
 		$mountIds = array_values(array_unique($mountIds));
@@ -376,9 +376,9 @@  discard block
 block discarded – undo
376 376
 		$config = $this->getConfigForMounts($mountIds);
377 377
 		$options = $this->getOptionsForMounts($mountIds);
378 378
 
379
-		return array_map(function ($mount, $applicable, $config, $options) {
380
-			$mount['type'] = (int)$mount['type'];
381
-			$mount['priority'] = (int)$mount['priority'];
379
+		return array_map(function($mount, $applicable, $config, $options) {
380
+			$mount['type'] = (int) $mount['type'];
381
+			$mount['priority'] = (int) $mount['priority'];
382 382
 			$mount['applicable'] = $applicable;
383 383
 			$mount['config'] = $config;
384 384
 			$mount['options'] = $options;
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
 		}
401 401
 		$builder = $this->connection->getQueryBuilder();
402 402
 		$fields[] = 'mount_id';
403
-		$placeHolders = array_map(function ($id) use ($builder) {
403
+		$placeHolders = array_map(function($id) use ($builder) {
404 404
 			return $builder->createPositionalParameter($id, IQueryBuilder::PARAM_INT);
405 405
 		}, $mountIds);
406 406
 		$query = $builder->select($fields)
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
 		}
415 415
 		foreach ($rows as $row) {
416 416
 			if (isset($row['type'])) {
417
-				$row['type'] = (int)$row['type'];
417
+				$row['type'] = (int) $row['type'];
418 418
 			}
419 419
 			$result[$row['mount_id']][] = $row;
420 420
 		}
@@ -445,8 +445,8 @@  discard block
 block discarded – undo
445 445
 	public function getOptionsForMounts($mountIds) {
446 446
 		$mountOptions = $this->selectForMounts('external_options', ['key', 'value'], $mountIds);
447 447
 		$optionsMap = array_map([$this, 'createKeyValueMap'], $mountOptions);
448
-		return array_map(function (array $options) {
449
-			return array_map(function ($option) {
448
+		return array_map(function(array $options) {
449
+			return array_map(function($option) {
450 450
 				return json_decode($option);
451 451
 			}, $options);
452 452
 		}, $optionsMap);
@@ -457,16 +457,16 @@  discard block
 block discarded – undo
457 457
 	 * @return array ['key1' => $value1, ...]
458 458
 	 */
459 459
 	private function createKeyValueMap(array $keyValuePairs) {
460
-		$decryptedPairts = array_map(function ($pair) {
460
+		$decryptedPairts = array_map(function($pair) {
461 461
 			if ($pair['key'] === 'password') {
462 462
 				$pair['value'] = $this->decryptValue($pair['value']);
463 463
 			}
464 464
 			return $pair;
465 465
 		}, $keyValuePairs);
466
-		$keys = array_map(function ($pair) {
466
+		$keys = array_map(function($pair) {
467 467
 			return $pair['key'];
468 468
 		}, $decryptedPairts);
469
-		$values = array_map(function ($pair) {
469
+		$values = array_map(function($pair) {
470 470
 			return $pair['value'];
471 471
 		}, $decryptedPairts);
472 472
 
Please login to merge, or discard this patch.
apps/files_external/lib/Service/LegacyStoragesService.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 	) {
59 59
 		$backend = $this->backendService->getBackend($storageOptions['backend']);
60 60
 		if (!$backend) {
61
-			throw new \UnexpectedValueException('Invalid backend ' . $storageOptions['backend']);
61
+			throw new \UnexpectedValueException('Invalid backend '.$storageOptions['backend']);
62 62
 		}
63 63
 		$storageConfig->setBackend($backend);
64 64
 		if (isset($storageOptions['authMechanism']) && $storageOptions['authMechanism'] !== 'builtin::builtin') {
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 			$storageOptions['authMechanism'] = 'null'; // to make error handling easier
69 69
 		}
70 70
 		if (!$authMechanism) {
71
-			throw new \UnexpectedValueException('Invalid authentication mechanism ' . $storageOptions['authMechanism']);
71
+			throw new \UnexpectedValueException('Invalid authentication mechanism '.$storageOptions['authMechanism']);
72 72
 		}
73 73
 		$storageConfig->setAuthMechanism($authMechanism);
74 74
 		$storageConfig->setBackendOptions($storageOptions['options']);
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 						// something went wrong, skip
143 143
 						\OCP\Util::writeLog(
144 144
 							'files_external',
145
-							'Could not parse mount point "' . $rootMountPath . '"',
145
+							'Could not parse mount point "'.$rootMountPath.'"',
146 146
 							\OCP\Util::ERROR
147 147
 						);
148 148
 						continue;
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 						$storageOptions['authMechanism'] = null; // ensure config hash works
159 159
 					}
160 160
 					if (isset($storageOptions['id'])) {
161
-						$configId = (int)$storageOptions['id'];
161
+						$configId = (int) $storageOptions['id'];
162 162
 						if (isset($storages[$configId])) {
163 163
 							$currentStorage = $storages[$configId];
164 164
 						}
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 						// don't die if a storage backend doesn't exist
195 195
 						\OCP\Util::writeLog(
196 196
 							'files_external',
197
-							'Could not load storage: "' . $e->getMessage() . '"',
197
+							'Could not load storage: "'.$e->getMessage().'"',
198 198
 							\OCP\Util::ERROR
199 199
 						);
200 200
 					}
Please login to merge, or discard this patch.