@@ -87,16 +87,16 @@ discard block |
||
| 87 | 87 | * @throws \InvalidArgumentException |
| 88 | 88 | */ |
| 89 | 89 | protected function validateOffsetAndLimit($offset, $limit) { |
| 90 | - if($limit < 0) { |
|
| 90 | + if ($limit < 0) { |
|
| 91 | 91 | throw new \InvalidArgumentException('limit must be 0 or greater'); |
| 92 | 92 | } |
| 93 | - if($offset < 0) { |
|
| 93 | + if ($offset < 0) { |
|
| 94 | 94 | throw new \InvalidArgumentException('offset must be 0 or greater'); |
| 95 | 95 | } |
| 96 | - if($limit === 0 && $offset !== 0) { |
|
| 96 | + if ($limit === 0 && $offset !== 0) { |
|
| 97 | 97 | throw new \InvalidArgumentException('offset must be 0 if limit is also set to 0'); |
| 98 | 98 | } |
| 99 | - if($offset > 0 && ($offset % $limit !== 0)) { |
|
| 99 | + if ($offset > 0 && ($offset % $limit !== 0)) { |
|
| 100 | 100 | throw new \InvalidArgumentException('offset must be a multiple of limit'); |
| 101 | 101 | } |
| 102 | 102 | } |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | $limit = intval($input->getOption('limit')); |
| 111 | 111 | $this->validateOffsetAndLimit($offset, $limit); |
| 112 | 112 | |
| 113 | - if($input->getOption('group')) { |
|
| 113 | + if ($input->getOption('group')) { |
|
| 114 | 114 | $proxy = new Group_Proxy($configPrefixes, $ldapWrapper); |
| 115 | 115 | $getMethod = 'getGroups'; |
| 116 | 116 | $printID = false; |
@@ -121,8 +121,8 @@ discard block |
||
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | $result = $proxy->$getMethod($input->getArgument('search'), $limit, $offset); |
| 124 | - foreach($result as $id => $name) { |
|
| 125 | - $line = $name . ($printID ? ' ('.$id.')' : ''); |
|
| 124 | + foreach ($result as $id => $name) { |
|
| 125 | + $line = $name.($printID ? ' ('.$id.')' : ''); |
|
| 126 | 126 | $output->writeln($line); |
| 127 | 127 | } |
| 128 | 128 | } |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | |
| 63 | 63 | $success = $this->helper->deleteServerConfiguration($configPrefix); |
| 64 | 64 | |
| 65 | - if($success) { |
|
| 65 | + if ($success) { |
|
| 66 | 66 | $output->writeln("Deleted configuration with configID '{$configPrefix}'"); |
| 67 | 67 | } else { |
| 68 | 68 | $output->writeln("Cannot delete configuration with configID '{$configPrefix}'"); |
@@ -50,17 +50,17 @@ discard block |
||
| 50 | 50 | $helper = new Helper(\OC::$server->getConfig()); |
| 51 | 51 | $availableConfigs = $helper->getServerConfigurationPrefixes(); |
| 52 | 52 | $configID = $input->getArgument('configID'); |
| 53 | - if(!in_array($configID, $availableConfigs)) { |
|
| 53 | + if (!in_array($configID, $availableConfigs)) { |
|
| 54 | 54 | $output->writeln("Invalid configID"); |
| 55 | 55 | return; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | $result = $this->testConfig($configID); |
| 59 | - if($result === 0) { |
|
| 59 | + if ($result === 0) { |
|
| 60 | 60 | $output->writeln('The configuration is valid and the connection could be established!'); |
| 61 | - } else if($result === 1) { |
|
| 61 | + } else if ($result === 1) { |
|
| 62 | 62 | $output->writeln('The configuration is invalid. Please have a look at the logs for further details.'); |
| 63 | - } else if($result === 2) { |
|
| 63 | + } else if ($result === 2) { |
|
| 64 | 64 | $output->writeln('The configuration is valid, but the Bind failed. Please check the server settings and credentials.'); |
| 65 | 65 | } else { |
| 66 | 66 | $output->writeln('Your LDAP server was kidnapped by aliens.'); |
@@ -79,12 +79,12 @@ discard block |
||
| 79 | 79 | //ensure validation is run before we attempt the bind |
| 80 | 80 | $connection->getConfiguration(); |
| 81 | 81 | |
| 82 | - if(!$connection->setConfiguration(array( |
|
| 82 | + if (!$connection->setConfiguration(array( |
|
| 83 | 83 | 'ldap_configuration_active' => 1, |
| 84 | 84 | ))) { |
| 85 | 85 | return 1; |
| 86 | 86 | } |
| 87 | - if($connection->bind()) { |
|
| 87 | + if ($connection->bind()) { |
|
| 88 | 88 | return 0; |
| 89 | 89 | } |
| 90 | 90 | return 2; |
@@ -60,7 +60,7 @@ |
||
| 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 | } |
@@ -71,7 +71,7 @@ |
||
| 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()) : '-'; |
@@ -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 | |