@@ -63,9 +63,9 @@ |
||
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 | } |
@@ -67,9 +67,9 @@ discard block |
||
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 |
||
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 |
||
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); |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | */ |
102 | 102 | public function __construct($configPrefix, $autoRead = true) { |
103 | 103 | $this->configPrefix = $configPrefix; |
104 | - if($autoRead) { |
|
104 | + if ($autoRead) { |
|
105 | 105 | $this->readConfiguration(); |
106 | 106 | } |
107 | 107 | } |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | * @return mixed|null |
112 | 112 | */ |
113 | 113 | public function __get($name) { |
114 | - if(isset($this->config[$name])) { |
|
114 | + if (isset($this->config[$name])) { |
|
115 | 115 | return $this->config[$name]; |
116 | 116 | } |
117 | 117 | return null; |
@@ -142,22 +142,22 @@ discard block |
||
142 | 142 | * @return false|null |
143 | 143 | */ |
144 | 144 | public function setConfiguration($config, &$applied = null) { |
145 | - if(!is_array($config)) { |
|
145 | + if (!is_array($config)) { |
|
146 | 146 | return false; |
147 | 147 | } |
148 | 148 | |
149 | 149 | $cta = $this->getConfigTranslationArray(); |
150 | - foreach($config as $inputKey => $val) { |
|
151 | - if(strpos($inputKey, '_') !== false && array_key_exists($inputKey, $cta)) { |
|
150 | + foreach ($config as $inputKey => $val) { |
|
151 | + if (strpos($inputKey, '_') !== false && array_key_exists($inputKey, $cta)) { |
|
152 | 152 | $key = $cta[$inputKey]; |
153 | - } elseif(array_key_exists($inputKey, $this->config)) { |
|
153 | + } elseif (array_key_exists($inputKey, $this->config)) { |
|
154 | 154 | $key = $inputKey; |
155 | 155 | } else { |
156 | 156 | continue; |
157 | 157 | } |
158 | 158 | |
159 | 159 | $setMethod = 'setValue'; |
160 | - switch($key) { |
|
160 | + switch ($key) { |
|
161 | 161 | case 'ldapAgentPassword': |
162 | 162 | $setMethod = 'setRawValue'; |
163 | 163 | break; |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | break; |
182 | 182 | } |
183 | 183 | $this->$setMethod($key, $val); |
184 | - if(is_array($applied)) { |
|
184 | + if (is_array($applied)) { |
|
185 | 185 | $applied[] = $inputKey; |
186 | 186 | } |
187 | 187 | } |
@@ -189,15 +189,15 @@ discard block |
||
189 | 189 | } |
190 | 190 | |
191 | 191 | public function readConfiguration() { |
192 | - if(!$this->configRead && !is_null($this->configPrefix)) { |
|
192 | + if (!$this->configRead && !is_null($this->configPrefix)) { |
|
193 | 193 | $cta = array_flip($this->getConfigTranslationArray()); |
194 | - foreach($this->config as $key => $val) { |
|
195 | - if(!isset($cta[$key])) { |
|
194 | + foreach ($this->config as $key => $val) { |
|
195 | + if (!isset($cta[$key])) { |
|
196 | 196 | //some are determined |
197 | 197 | continue; |
198 | 198 | } |
199 | 199 | $dbKey = $cta[$key]; |
200 | - switch($key) { |
|
200 | + switch ($key) { |
|
201 | 201 | case 'ldapBase': |
202 | 202 | case 'ldapBaseUsers': |
203 | 203 | case 'ldapBaseGroups': |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | */ |
241 | 241 | public function saveConfiguration() { |
242 | 242 | $cta = array_flip($this->getConfigTranslationArray()); |
243 | - foreach($this->config as $key => $value) { |
|
243 | + foreach ($this->config as $key => $value) { |
|
244 | 244 | switch ($key) { |
245 | 245 | case 'ldapAgentPassword': |
246 | 246 | $value = base64_encode($value); |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | case 'ldapGroupFilterObjectclass': |
256 | 256 | case 'ldapGroupFilterGroups': |
257 | 257 | case 'ldapLoginFilterAttributes': |
258 | - if(is_array($value)) { |
|
258 | + if (is_array($value)) { |
|
259 | 259 | $value = implode("\n", $value); |
260 | 260 | } |
261 | 261 | break; |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | case 'ldapUuidGroupAttribute': |
267 | 267 | continue 2; |
268 | 268 | } |
269 | - if(is_null($value)) { |
|
269 | + if (is_null($value)) { |
|
270 | 270 | $value = ''; |
271 | 271 | } |
272 | 272 | $this->saveValue($cta[$key], $value); |
@@ -279,7 +279,7 @@ discard block |
||
279 | 279 | */ |
280 | 280 | protected function getMultiLine($varName) { |
281 | 281 | $value = $this->getValue($varName); |
282 | - if(empty($value)) { |
|
282 | + if (empty($value)) { |
|
283 | 283 | $value = ''; |
284 | 284 | } else { |
285 | 285 | $value = preg_split('/\r\n|\r|\n/', $value); |
@@ -295,21 +295,21 @@ discard block |
||
295 | 295 | * @param array|string $value to set |
296 | 296 | */ |
297 | 297 | protected function setMultiLine($varName, $value) { |
298 | - if(empty($value)) { |
|
298 | + if (empty($value)) { |
|
299 | 299 | $value = ''; |
300 | 300 | } else if (!is_array($value)) { |
301 | 301 | $value = preg_split('/\r\n|\r|\n|;/', $value); |
302 | - if($value === false) { |
|
302 | + if ($value === false) { |
|
303 | 303 | $value = ''; |
304 | 304 | } |
305 | 305 | } |
306 | 306 | |
307 | - if(!is_array($value)) { |
|
307 | + if (!is_array($value)) { |
|
308 | 308 | $finalValue = trim($value); |
309 | 309 | } else { |
310 | 310 | $finalValue = []; |
311 | - foreach($value as $key => $val) { |
|
312 | - if(is_string($val)) { |
|
311 | + foreach ($value as $key => $val) { |
|
312 | + if (is_string($val)) { |
|
313 | 313 | $val = trim($val); |
314 | 314 | if ($val !== '') { |
315 | 315 | //accidental line breaks are not wanted and can cause |
@@ -356,7 +356,7 @@ discard block |
||
356 | 356 | */ |
357 | 357 | protected function getValue($varName) { |
358 | 358 | static $defaults; |
359 | - if(is_null($defaults)) { |
|
359 | + if (is_null($defaults)) { |
|
360 | 360 | $defaults = $this->getDefaults(); |
361 | 361 | } |
362 | 362 | return \OCP\Config::getAppValue('user_ldap', |
@@ -371,7 +371,7 @@ discard block |
||
371 | 371 | * @param mixed $value to set |
372 | 372 | */ |
373 | 373 | protected function setValue($varName, $value) { |
374 | - if(is_string($value)) { |
|
374 | + if (is_string($value)) { |
|
375 | 375 | $value = trim($value); |
376 | 376 | } |
377 | 377 | $this->config[$varName] = $value; |
@@ -62,7 +62,7 @@ |
||
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 |
@@ -47,7 +47,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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(); |
@@ -41,7 +41,7 @@ |
||
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 | ] |
@@ -22,7 +22,7 @@ |
||
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 |
@@ -7,7 +7,7 @@ discard block |
||
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 |
||
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"> |
@@ -24,7 +24,7 @@ discard block |
||
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 |
||
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 |
||
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'])); |