Completed
Pull Request — master (#3770)
by Thomas
25:54
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/user_ldap/appinfo/app.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 $configPrefixes = $helper->getServerConfigurationPrefixes(true);
32 32
 $ldapWrapper = new OCA\User_LDAP\LDAP();
33 33
 $ocConfig = \OC::$server->getConfig();
34
-if(count($configPrefixes) === 1) {
34
+if (count($configPrefixes) === 1) {
35 35
 	$dbc = \OC::$server->getDatabaseConnection();
36 36
 	$userManager = new OCA\User_LDAP\User\Manager($ocConfig,
37 37
 		new OCA\User_LDAP\FilesystemHelper(),
@@ -48,14 +48,14 @@  discard block
 block discarded – undo
48 48
 	$ldapAccess->setGroupMapper(new OCA\User_LDAP\Mapping\GroupMapping($dbc));
49 49
 	$userBackend  = new OCA\User_LDAP\User_LDAP($ldapAccess, $ocConfig);
50 50
 	$groupBackend = new \OCA\User_LDAP\Group_LDAP($ldapAccess);
51
-} else if(count($configPrefixes) > 1) {
51
+} else if (count($configPrefixes) > 1) {
52 52
 	$userBackend  = new OCA\User_LDAP\User_Proxy(
53 53
 		$configPrefixes, $ldapWrapper, $ocConfig
54 54
 	);
55
-	$groupBackend  = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper);
55
+	$groupBackend = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper);
56 56
 }
57 57
 
58
-if(count($configPrefixes) > 0) {
58
+if (count($configPrefixes) > 0) {
59 59
 	// register user backend
60 60
 	OC_User::useBackend($userBackend);
61 61
 	OC_Group::useBackend($groupBackend);
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 	'loginName2UserName'
69 69
 );
70 70
 
71
-if(OCP\App::isEnabled('user_webdavauth')) {
71
+if (OCP\App::isEnabled('user_webdavauth')) {
72 72
 	OCP\Util::writeLog('user_ldap',
73 73
 		'user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour',
74 74
 		OCP\Util::WARN);
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/templates/settings.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
 	}
88 88
 ?>
89 89
 
90
-<form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
90
+<form data-can-create="<?php echo $canCreateMounts ? 'true' : 'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled'] ? 'true' : 'false'; ?>">
91 91
 	<h2><?php p($l->t('External storage')); ?></h2>
92
-	<?php if (isset($_['dependencies']) and ($_['dependencies']<>'') and $canCreateMounts) print_unescaped(''.$_['dependencies'].''); ?>
92
+	<?php if (isset($_['dependencies']) and ($_['dependencies'] <> '') and $canCreateMounts) print_unescaped(''.$_['dependencies'].''); ?>
93 93
 	<table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['visibilityType'] === BackendService::VISIBILITY_ADMIN)); ?>'>
94 94
 		<thead>
95 95
 			<tr>
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.