Completed
Pull Request — master (#5568)
by Blizzz
27:19 queued 11:19
created
apps/user_ldap/lib/Command/SetConfig.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
 		$helper = new Helper(\OC::$server->getConfig());
61 61
 		$availableConfigs = $helper->getServerConfigurationPrefixes();
62 62
 		$configID = $input->getArgument('configID');
63
-		if(!in_array($configID, $availableConfigs)) {
63
+		if (!in_array($configID, $availableConfigs)) {
64 64
 			$output->writeln("Invalid configID");
65 65
 			return;
66 66
 		}
Please login to merge, or discard this patch.
apps/user_ldap/lib/Command/ShowRemnants.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
 			'Dir', 'Sharer'));
72 72
 		$rows = array();
73 73
 		$resultSet = $this->dui->getUsers();
74
-		foreach($resultSet as $user) {
74
+		foreach ($resultSet as $user) {
75 75
 			$hAS = $user->getHasActiveShares() ? 'Y' : 'N';
76 76
 			$lastLogin = ($user->getLastLogin() > 0) ?
77 77
 				$this->dateFormatter->formatDate($user->getLastLogin()) : '-';
Please login to merge, or discard this patch.
apps/user_ldap/lib/Command/CreateEmptyConfig.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -63,9 +63,9 @@
 block discarded – undo
63 63
 		$configHolder->saveConfiguration();
64 64
 
65 65
 		$prose = '';
66
-		if(!$input->getOption('only-print-prefix')) {
66
+		if (!$input->getOption('only-print-prefix')) {
67 67
 			$prose = 'Created new configuration with configID ';
68 68
 		}
69
-		$output->writeln($prose . "{$configPrefix}");
69
+		$output->writeln($prose."{$configPrefix}");
70 70
 	}
71 71
 }
Please login to merge, or discard this patch.
apps/user_ldap/lib/Command/ShowConfig.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -67,9 +67,9 @@  discard block
 block discarded – undo
67 67
 	protected function execute(InputInterface $input, OutputInterface $output) {
68 68
 		$availableConfigs = $this->helper->getServerConfigurationPrefixes();
69 69
 		$configID = $input->getArgument('configID');
70
-		if(!is_null($configID)) {
70
+		if (!is_null($configID)) {
71 71
 			$configIDs[] = $configID;
72
-			if(!in_array($configIDs[0], $availableConfigs)) {
72
+			if (!in_array($configIDs[0], $availableConfigs)) {
73 73
 				$output->writeln("Invalid configID");
74 74
 				return;
75 75
 			}
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	 * @param bool $withPassword      Set to TRUE to show plaintext passwords in output
88 88
 	 */
89 89
 	protected function renderConfigs($configIDs, $output, $withPassword) {
90
-		foreach($configIDs as $id) {
90
+		foreach ($configIDs as $id) {
91 91
 			$configHolder = new Configuration($id);
92 92
 			$configuration = $configHolder->getConfiguration();
93 93
 			ksort($configuration);
@@ -95,11 +95,11 @@  discard block
 block discarded – undo
95 95
 			$table = new Table($output);
96 96
 			$table->setHeaders(array('Configuration', $id));
97 97
 			$rows = array();
98
-			foreach($configuration as $key => $value) {
99
-				if($key === 'ldapAgentPassword' && !$withPassword) {
98
+			foreach ($configuration as $key => $value) {
99
+				if ($key === 'ldapAgentPassword' && !$withPassword) {
100 100
 					$value = '***';
101 101
 				}
102
-				if(is_array($value)) {
102
+				if (is_array($value)) {
103 103
 					$value = implode(';', $value);
104 104
 				}
105 105
 				$rows[] = array($key, $value);
Please login to merge, or discard this patch.
apps/user_ldap/lib/Settings/Admin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@
 block discarded – undo
62 62
 		// assign default values
63 63
 		$config = new Configuration('', false);
64 64
 		$defaults = $config->getDefaults();
65
-		foreach($defaults as $key => $default) {
65
+		foreach ($defaults as $key => $default) {
66 66
 			$parameters[$key.'_default'] = $default;
67 67
 		}
68 68
 
Please login to merge, or discard this patch.
apps/user_ldap/lib/LDAPProvider.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 		$this->logger = $serverContainer->getLogger();
48 48
 		$this->helper = $helper;
49 49
 		$this->deletedUsersIndex = $deletedUsersIndex;
50
-		foreach ($serverContainer->getUserManager()->getBackends() as $backend){
50
+		foreach ($serverContainer->getUserManager()->getBackends() as $backend) {
51 51
 			$this->logger->debug('instance '.get_class($backend).' backend.', ['app' => 'user_ldap']);
52 52
 			if ($backend instanceof IUserLDAP) {
53 53
 				$this->backend = $backend;
@@ -64,11 +64,11 @@  discard block
 block discarded – undo
64 64
 	 * @throws \Exception if translation was unsuccessful
65 65
 	 */
66 66
 	public function getUserDN($uid) {
67
-		if(!$this->backend->userExists($uid)){
67
+		if (!$this->backend->userExists($uid)) {
68 68
 			throw new \Exception('User id not found in LDAP');
69 69
 		}
70 70
 		$result = $this->backend->getLDAPAccess($uid)->username2dn($uid);
71
-		if(!$result){
71
+		if (!$result) {
72 72
 			throw new \Exception('Translation to LDAP DN unsuccessful');
73 73
 		}
74 74
 		return $result;
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 	 */
84 84
 	public function getUserName($dn) {
85 85
 		$result = $this->backend->dn2UserName($dn);
86
-		if(!$result){
86
+		if (!$result) {
87 87
 			throw new \Exception('Translation to internal user name unsuccessful');
88 88
 		}
89 89
 		return $result;
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 	 * @throws \Exception if user id was not found in LDAP
116 116
 	 */
117 117
 	public function getLDAPConnection($uid) {
118
-		if(!$this->backend->userExists($uid)){
118
+		if (!$this->backend->userExists($uid)) {
119 119
 			throw new \Exception('User id not found in LDAP');
120 120
 		}
121 121
 		return $this->backend->getNewLDAPConnection($uid);
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 	 * @throws \Exception if user id was not found in LDAP
129 129
 	 */
130 130
 	public function getLDAPBaseUsers($uid) {
131
-		if(!$this->backend->userExists($uid)){
131
+		if (!$this->backend->userExists($uid)) {
132 132
 			throw new \Exception('User id not found in LDAP');
133 133
 		}	
134 134
 		return $this->backend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_users'];
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	 * @throws \Exception if user id was not found in LDAP
142 142
 	 */
143 143
 	public function getLDAPBaseGroups($uid) {
144
-		if(!$this->backend->userExists($uid)){
144
+		if (!$this->backend->userExists($uid)) {
145 145
 			throw new \Exception('User id not found in LDAP');
146 146
 		}
147 147
 		return $this->backend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_groups'];
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 	 * @throws \Exception if user id was not found in LDAP
154 154
 	 */
155 155
 	public function clearCache($uid) {
156
-		if(!$this->backend->userExists($uid)){
156
+		if (!$this->backend->userExists($uid)) {
157 157
 			throw new \Exception('User id not found in LDAP');
158 158
 		}
159 159
 		$this->backend->getLDAPAccess($uid)->getConnection()->clearCache();
Please login to merge, or discard this patch.
apps/user_ldap/appinfo/routes.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
 $application->registerRoutes($this, [
42 42
 	'ocs' => [
43 43
 		['name' => 'ConfigAPI#create', 'url' => '/api/v1/config', 'verb' => 'POST'],
44
-		['name' => 'ConfigAPI#show',   'url' => '/api/v1/config/{configID}', 'verb' => 'GET'],
44
+		['name' => 'ConfigAPI#show', 'url' => '/api/v1/config/{configID}', 'verb' => 'GET'],
45 45
 		['name' => 'ConfigAPI#modify', 'url' => '/api/v1/config/{configID}', 'verb' => 'PUT'],
46 46
 		['name' => 'ConfigAPI#delete', 'url' => '/api/v1/config/{configID}', 'verb' => 'DELETE'],
47 47
 	]
Please login to merge, or discard this patch.
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.