@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | $keys = $this->getServersConfig($referenceConfigkey); |
| 97 | 97 | |
| 98 | 98 | $result = array(); |
| 99 | - foreach($keys as $key) { |
|
| 99 | + foreach ($keys as $key) { |
|
| 100 | 100 | $len = strlen($key) - strlen($referenceConfigkey); |
| 101 | 101 | $prefix = substr($key, 0, $len); |
| 102 | 102 | $result[$prefix] = $this->config->getAppValue('user_ldap', $key); |
@@ -113,19 +113,19 @@ discard block |
||
| 113 | 113 | public function getNextServerConfigurationPrefix() { |
| 114 | 114 | $serverConnections = $this->getServerConfigurationPrefixes(); |
| 115 | 115 | |
| 116 | - if(count($serverConnections) === 0) { |
|
| 116 | + if (count($serverConnections) === 0) { |
|
| 117 | 117 | return 's01'; |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | sort($serverConnections); |
| 121 | 121 | $lastKey = array_pop($serverConnections); |
| 122 | 122 | $lastNumber = intval(str_replace('s', '', $lastKey)); |
| 123 | - $nextPrefix = 's' . str_pad($lastNumber + 1, 2, '0', STR_PAD_LEFT); |
|
| 123 | + $nextPrefix = 's'.str_pad($lastNumber + 1, 2, '0', STR_PAD_LEFT); |
|
| 124 | 124 | return $nextPrefix; |
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | private function getServersConfig($value) { |
| 128 | - $regex = '/' . $value . '$/S'; |
|
| 128 | + $regex = '/'.$value.'$/S'; |
|
| 129 | 129 | |
| 130 | 130 | $keys = $this->config->getAppKeys('user_ldap'); |
| 131 | 131 | $result = []; |
@@ -144,12 +144,12 @@ discard block |
||
| 144 | 144 | * @return bool true on success, false otherwise |
| 145 | 145 | */ |
| 146 | 146 | public function deleteServerConfiguration($prefix) { |
| 147 | - if(!in_array($prefix, self::getServerConfigurationPrefixes())) { |
|
| 147 | + if (!in_array($prefix, self::getServerConfigurationPrefixes())) { |
|
| 148 | 148 | return false; |
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | $saveOtherConfigurations = ''; |
| 152 | - if(empty($prefix)) { |
|
| 152 | + if (empty($prefix)) { |
|
| 153 | 153 | $saveOtherConfigurations = 'AND `configkey` NOT LIKE \'s%\''; |
| 154 | 154 | } |
| 155 | 155 | |
@@ -163,11 +163,11 @@ discard block |
||
| 163 | 163 | '); |
| 164 | 164 | $delRows = $query->execute(array($prefix.'%')); |
| 165 | 165 | |
| 166 | - if(\OCP\DB::isError($delRows)) { |
|
| 166 | + if (\OCP\DB::isError($delRows)) { |
|
| 167 | 167 | return false; |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | - if($delRows === 0) { |
|
| 170 | + if ($delRows === 0) { |
|
| 171 | 171 | return false; |
| 172 | 172 | } |
| 173 | 173 | |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | $all = $this->getServerConfigurationPrefixes(false); |
| 184 | 184 | $active = $this->getServerConfigurationPrefixes(true); |
| 185 | 185 | |
| 186 | - if(!is_array($all) || !is_array($active)) { |
|
| 186 | + if (!is_array($all) || !is_array($active)) { |
|
| 187 | 187 | throw new \Exception('Unexpected Return Value'); |
| 188 | 188 | } |
| 189 | 189 | |
@@ -197,14 +197,14 @@ discard block |
||
| 197 | 197 | */ |
| 198 | 198 | public function getDomainFromURL($url) { |
| 199 | 199 | $uinfo = parse_url($url); |
| 200 | - if(!is_array($uinfo)) { |
|
| 200 | + if (!is_array($uinfo)) { |
|
| 201 | 201 | return false; |
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | $domain = false; |
| 205 | - if(isset($uinfo['host'])) { |
|
| 205 | + if (isset($uinfo['host'])) { |
|
| 206 | 206 | $domain = $uinfo['host']; |
| 207 | - } else if(isset($uinfo['path'])) { |
|
| 207 | + } else if (isset($uinfo['path'])) { |
|
| 208 | 208 | $domain = $uinfo['path']; |
| 209 | 209 | } |
| 210 | 210 | |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | */ |
| 219 | 219 | public function setLDAPProvider() { |
| 220 | 220 | $current = \OC::$server->getConfig()->getSystemValue('ldapProviderFactory', null); |
| 221 | - if(is_null($current)) { |
|
| 221 | + if (is_null($current)) { |
|
| 222 | 222 | \OC::$server->getConfig()->setSystemValue('ldapProviderFactory', '\\OCA\\User_LDAP\\LDAPProviderFactory'); |
| 223 | 223 | } |
| 224 | 224 | } |
@@ -230,9 +230,9 @@ discard block |
||
| 230 | 230 | */ |
| 231 | 231 | public function sanitizeDN($dn) { |
| 232 | 232 | //treating multiple base DNs |
| 233 | - if(is_array($dn)) { |
|
| 233 | + if (is_array($dn)) { |
|
| 234 | 234 | $result = array(); |
| 235 | - foreach($dn as $singleDN) { |
|
| 235 | + foreach ($dn as $singleDN) { |
|
| 236 | 236 | $result[] = $this->sanitizeDN($singleDN); |
| 237 | 237 | } |
| 238 | 238 | return $result; |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | * @throws \Exception |
| 284 | 284 | */ |
| 285 | 285 | public static function loginName2UserName($param) { |
| 286 | - if(!isset($param['uid'])) { |
|
| 286 | + if (!isset($param['uid'])) { |
|
| 287 | 287 | throw new \Exception('key uid is expected to be set in $param'); |
| 288 | 288 | } |
| 289 | 289 | |
@@ -294,11 +294,11 @@ discard block |
||
| 294 | 294 | $ldapWrapper = new LDAP(); |
| 295 | 295 | $ocConfig = \OC::$server->getConfig(); |
| 296 | 296 | |
| 297 | - $userBackend = new User_Proxy( |
|
| 297 | + $userBackend = new User_Proxy( |
|
| 298 | 298 | $configPrefixes, $ldapWrapper, $ocConfig |
| 299 | 299 | ); |
| 300 | - $uid = $userBackend->loginName2UserName($param['uid'] ); |
|
| 301 | - if($uid !== false) { |
|
| 300 | + $uid = $userBackend->loginName2UserName($param['uid']); |
|
| 301 | + if ($uid !== false) { |
|
| 302 | 302 | $param['uid'] = $uid; |
| 303 | 303 | } |
| 304 | 304 | } |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | public function __construct(ILDAPWrapper $ldap) { |
| 48 | 48 | $this->ldap = $ldap; |
| 49 | 49 | $memcache = \OC::$server->getMemCacheFactory(); |
| 50 | - if($memcache->isAvailable()) { |
|
| 50 | + if ($memcache->isAvailable()) { |
|
| 51 | 51 | $this->cache = $memcache->create(); |
| 52 | 52 | } |
| 53 | 53 | } |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | static $groupMap; |
| 65 | 65 | static $db; |
| 66 | 66 | static $coreUserManager; |
| 67 | - if(is_null($fs)) { |
|
| 67 | + if (is_null($fs)) { |
|
| 68 | 68 | $ocConfig = \OC::$server->getConfig(); |
| 69 | 69 | $fs = new FilesystemHelper(); |
| 70 | 70 | $log = new LogWrapper(); |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | * @return mixed |
| 89 | 89 | */ |
| 90 | 90 | protected function getAccess($configPrefix) { |
| 91 | - if(!isset(self::$accesses[$configPrefix])) { |
|
| 91 | + if (!isset(self::$accesses[$configPrefix])) { |
|
| 92 | 92 | $this->addAccess($configPrefix); |
| 93 | 93 | } |
| 94 | 94 | return self::$accesses[$configPrefix]; |
@@ -142,8 +142,8 @@ discard block |
||
| 142 | 142 | * @return mixed, the result of the specified method |
| 143 | 143 | */ |
| 144 | 144 | protected function handleRequest($id, $method, $parameters, $passOnWhen = false) { |
| 145 | - $result = $this->callOnLastSeenOn($id, $method, $parameters, $passOnWhen); |
|
| 146 | - if($result === $passOnWhen) { |
|
| 145 | + $result = $this->callOnLastSeenOn($id, $method, $parameters, $passOnWhen); |
|
| 146 | + if ($result === $passOnWhen) { |
|
| 147 | 147 | $result = $this->walkBackends($id, $method, $parameters); |
| 148 | 148 | } |
| 149 | 149 | return $result; |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | */ |
| 156 | 156 | private function getCacheKey($key) { |
| 157 | 157 | $prefix = 'LDAP-Proxy-'; |
| 158 | - if(is_null($key)) { |
|
| 158 | + if (is_null($key)) { |
|
| 159 | 159 | return $prefix; |
| 160 | 160 | } |
| 161 | 161 | return $prefix.md5($key); |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | * @return mixed|null |
| 167 | 167 | */ |
| 168 | 168 | public function getFromCache($key) { |
| 169 | - if(is_null($this->cache) || !$this->isCached($key)) { |
|
| 169 | + if (is_null($this->cache) || !$this->isCached($key)) { |
|
| 170 | 170 | return null; |
| 171 | 171 | } |
| 172 | 172 | $key = $this->getCacheKey($key); |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | * @return bool |
| 180 | 180 | */ |
| 181 | 181 | public function isCached($key) { |
| 182 | - if(is_null($this->cache)) { |
|
| 182 | + if (is_null($this->cache)) { |
|
| 183 | 183 | return false; |
| 184 | 184 | } |
| 185 | 185 | $key = $this->getCacheKey($key); |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | * @param mixed $value |
| 192 | 192 | */ |
| 193 | 193 | public function writeToCache($key, $value) { |
| 194 | - if(is_null($this->cache)) { |
|
| 194 | + if (is_null($this->cache)) { |
|
| 195 | 195 | return; |
| 196 | 196 | } |
| 197 | 197 | $key = $this->getCacheKey($key); |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | public function clearCache() { |
| 203 | - if(is_null($this->cache)) { |
|
| 203 | + if (is_null($this->cache)) { |
|
| 204 | 204 | return; |
| 205 | 205 | } |
| 206 | 206 | $this->cache->clear($this->getCacheKey(null)); |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | */ |
| 72 | 72 | public function run(IOutput $output) { |
| 73 | 73 | $installedVersion = $this->config->getAppValue('user_ldap', 'installed_version', '1.2.1'); |
| 74 | - if(version_compare($installedVersion, '1.2.1') !== -1) { |
|
| 74 | + if (version_compare($installedVersion, '1.2.1') !== -1) { |
|
| 75 | 75 | return; |
| 76 | 76 | } |
| 77 | 77 | |
@@ -82,14 +82,14 @@ discard block |
||
| 82 | 82 | do { |
| 83 | 83 | $retry = false; |
| 84 | 84 | $records = $mapper->getList($offset, $batchSize); |
| 85 | - if(count($records) === 0){ |
|
| 85 | + if (count($records) === 0) { |
|
| 86 | 86 | continue; |
| 87 | 87 | } |
| 88 | 88 | try { |
| 89 | 89 | $this->jobList->add($jobClass, ['records' => $records]); |
| 90 | 90 | $offset += $batchSize; |
| 91 | 91 | } catch (\InvalidArgumentException $e) { |
| 92 | - if(strpos($e->getMessage(), 'Background job arguments can\'t exceed 4000') !== false) { |
|
| 92 | + if (strpos($e->getMessage(), 'Background job arguments can\'t exceed 4000') !== false) { |
|
| 93 | 93 | $batchSize = intval(floor(count($records) * 0.8)); |
| 94 | 94 | $retry = true; |
| 95 | 95 | } |
@@ -38,14 +38,14 @@ |
||
| 38 | 38 | |
| 39 | 39 | public function run($argument) { |
| 40 | 40 | $isUser = $this->proxy instanceof User_Proxy; |
| 41 | - foreach($argument['records'] as $record) { |
|
| 41 | + foreach ($argument['records'] as $record) { |
|
| 42 | 42 | $access = $this->proxy->getLDAPAccess($record['name']); |
| 43 | 43 | $uuid = $access->getUUID($record['dn'], $isUser); |
| 44 | - if($uuid === false) { |
|
| 44 | + if ($uuid === false) { |
|
| 45 | 45 | // record not found, no prob, continue with the next |
| 46 | 46 | continue; |
| 47 | 47 | } |
| 48 | - if($uuid !== $record['uuid']) { |
|
| 48 | + if ($uuid !== $record['uuid']) { |
|
| 49 | 49 | $this->mapper->setUUIDbyDN($uuid, $record['dn']); |
| 50 | 50 | } |
| 51 | 51 | } |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | $this->isAllowed($input->getOption('force')); |
| 87 | 87 | $this->confirmUserIsMapped($uid); |
| 88 | 88 | $exists = $this->backend->userExistsOnLDAP($uid); |
| 89 | - if($exists === true) { |
|
| 89 | + if ($exists === true) { |
|
| 90 | 90 | $output->writeln('The user is still available on LDAP.'); |
| 91 | 91 | return; |
| 92 | 92 | } |
@@ -94,9 +94,9 @@ discard block |
||
| 94 | 94 | $this->dui->markUser($uid); |
| 95 | 95 | $output->writeln('The user does not exists on LDAP anymore.'); |
| 96 | 96 | $output->writeln('Clean up the user\'s remnants by: ./occ user:delete "' |
| 97 | - . $uid . '"'); |
|
| 97 | + . $uid.'"'); |
|
| 98 | 98 | } catch (\Exception $e) { |
| 99 | - $output->writeln('<error>' . $e->getMessage(). '</error>'); |
|
| 99 | + $output->writeln('<error>'.$e->getMessage().'</error>'); |
|
| 100 | 100 | } |
| 101 | 101 | } |
| 102 | 102 | |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | * @return true |
| 122 | 122 | */ |
| 123 | 123 | protected function isAllowed($force) { |
| 124 | - if($this->helper->haveDisabledConfigurations() && !$force) { |
|
| 124 | + if ($this->helper->haveDisabledConfigurations() && !$force) { |
|
| 125 | 125 | throw new \Exception('Cannot check user existence, because ' |
| 126 | 126 | . 'disabled LDAP configurations are present.'); |
| 127 | 127 | } |
@@ -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 | } |