@@ -147,12 +147,12 @@ discard block |
||
| 147 | 147 | public function delete($configID) { |
| 148 | 148 | try { |
| 149 | 149 | $this->ensureConfigIDExists($configID); |
| 150 | - if(!$this->ldapHelper->deleteServerConfiguration($configID)) { |
|
| 150 | + if (!$this->ldapHelper->deleteServerConfiguration($configID)) { |
|
| 151 | 151 | throw new OCSException('Could not delete configuration'); |
| 152 | 152 | } |
| 153 | - } catch(OCSException $e) { |
|
| 153 | + } catch (OCSException $e) { |
|
| 154 | 154 | throw $e; |
| 155 | - } catch(\Exception $e) { |
|
| 155 | + } catch (\Exception $e) { |
|
| 156 | 156 | $this->logger->logException($e); |
| 157 | 157 | throw new OCSException('An issue occurred when deleting the config.'); |
| 158 | 158 | } |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | try { |
| 188 | 188 | $this->ensureConfigIDExists($configID); |
| 189 | 189 | |
| 190 | - if(!is_array($configData)) { |
|
| 190 | + if (!is_array($configData)) { |
|
| 191 | 191 | throw new OCSBadRequestException('configData is not properly set'); |
| 192 | 192 | } |
| 193 | 193 | |
@@ -195,13 +195,13 @@ discard block |
||
| 195 | 195 | $configKeys = $configuration->getConfigTranslationArray(); |
| 196 | 196 | |
| 197 | 197 | foreach ($configKeys as $i => $key) { |
| 198 | - if(isset($configData[$key])) { |
|
| 198 | + if (isset($configData[$key])) { |
|
| 199 | 199 | $configuration->$key = $configData[$key]; |
| 200 | 200 | } |
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | $configuration->saveConfiguration(); |
| 204 | - } catch(OCSException $e) { |
|
| 204 | + } catch (OCSException $e) { |
|
| 205 | 205 | throw $e; |
| 206 | 206 | } catch (\Exception $e) { |
| 207 | 207 | $this->logger->logException($e); |
@@ -288,16 +288,16 @@ discard block |
||
| 288 | 288 | |
| 289 | 289 | $config = new Configuration($configID); |
| 290 | 290 | $data = $config->getConfiguration(); |
| 291 | - if(!boolval(intval($showPassword))) { |
|
| 291 | + if (!boolval(intval($showPassword))) { |
|
| 292 | 292 | $data['ldapAgentPassword'] = '***'; |
| 293 | 293 | } |
| 294 | 294 | foreach ($data as $key => $value) { |
| 295 | - if(is_array($value)) { |
|
| 295 | + if (is_array($value)) { |
|
| 296 | 296 | $value = implode(';', $value); |
| 297 | 297 | $data[$key] = $value; |
| 298 | 298 | } |
| 299 | 299 | } |
| 300 | - } catch(OCSException $e) { |
|
| 300 | + } catch (OCSException $e) { |
|
| 301 | 301 | throw $e; |
| 302 | 302 | } catch (\Exception $e) { |
| 303 | 303 | $this->logger->logException($e); |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | */ |
| 316 | 316 | private function ensureConfigIDExists($configID) { |
| 317 | 317 | $prefixes = $this->ldapHelper->getServerConfigurationPrefixes(); |
| 318 | - if(!in_array($configID, $prefixes, true)) { |
|
| 318 | + if (!in_array($configID, $prefixes, true)) { |
|
| 319 | 319 | throw new OCSNotFoundException('Config ID not found'); |
| 320 | 320 | } |
| 321 | 321 | } |
@@ -45,14 +45,14 @@ discard block |
||
| 45 | 45 | |
| 46 | 46 | static private $groupBE; |
| 47 | 47 | |
| 48 | - public function __construct(){ |
|
| 48 | + public function __construct() { |
|
| 49 | 49 | $this->interval = self::getRefreshInterval(); |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | /** |
| 53 | 53 | * @param mixed $argument |
| 54 | 54 | */ |
| 55 | - public function run($argument){ |
|
| 55 | + public function run($argument) { |
|
| 56 | 56 | self::updateGroups(); |
| 57 | 57 | } |
| 58 | 58 | |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | $knownGroups = array_keys(self::getKnownGroups()); |
| 63 | 63 | $actualGroups = self::getGroupBE()->getGroups(); |
| 64 | 64 | |
| 65 | - if(empty($actualGroups) && empty($knownGroups)) { |
|
| 65 | + if (empty($actualGroups) && empty($knownGroups)) { |
|
| 66 | 66 | \OCP\Util::writeLog('user_ldap', |
| 67 | 67 | 'bgJ "updateGroups" – groups do not seem to be configured properly, aborting.', |
| 68 | 68 | \OCP\Util::INFO); |
@@ -94,26 +94,26 @@ discard block |
||
| 94 | 94 | SET `owncloudusers` = ? |
| 95 | 95 | WHERE `owncloudname` = ? |
| 96 | 96 | '); |
| 97 | - foreach($groups as $group) { |
|
| 97 | + foreach ($groups as $group) { |
|
| 98 | 98 | //we assume, that self::$groupsFromDB has been retrieved already |
| 99 | 99 | $knownUsers = unserialize(self::$groupsFromDB[$group]['owncloudusers']); |
| 100 | 100 | $actualUsers = self::getGroupBE()->usersInGroup($group); |
| 101 | 101 | $hasChanged = false; |
| 102 | - foreach(array_diff($knownUsers, $actualUsers) as $removedUser) { |
|
| 102 | + foreach (array_diff($knownUsers, $actualUsers) as $removedUser) { |
|
| 103 | 103 | \OCP\Util::emitHook('OC_User', 'post_removeFromGroup', array('uid' => $removedUser, 'gid' => $group)); |
| 104 | 104 | \OCP\Util::writeLog('user_ldap', |
| 105 | 105 | 'bgJ "updateGroups" – "'.$removedUser.'" removed from "'.$group.'".', |
| 106 | 106 | \OCP\Util::INFO); |
| 107 | 107 | $hasChanged = true; |
| 108 | 108 | } |
| 109 | - foreach(array_diff($actualUsers, $knownUsers) as $addedUser) { |
|
| 109 | + foreach (array_diff($actualUsers, $knownUsers) as $addedUser) { |
|
| 110 | 110 | \OCP\Util::emitHook('OC_User', 'post_addToGroup', array('uid' => $addedUser, 'gid' => $group)); |
| 111 | 111 | \OCP\Util::writeLog('user_ldap', |
| 112 | 112 | 'bgJ "updateGroups" – "'.$addedUser.'" added to "'.$group.'".', |
| 113 | 113 | \OCP\Util::INFO); |
| 114 | 114 | $hasChanged = true; |
| 115 | 115 | } |
| 116 | - if($hasChanged) { |
|
| 116 | + if ($hasChanged) { |
|
| 117 | 117 | $query->execute(array(serialize($actualUsers), $group)); |
| 118 | 118 | } |
| 119 | 119 | } |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | INTO `*PREFIX*ldap_group_members` (`owncloudname`, `owncloudusers`) |
| 133 | 133 | VALUES (?, ?) |
| 134 | 134 | '); |
| 135 | - foreach($createdGroups as $createdGroup) { |
|
| 135 | + foreach ($createdGroups as $createdGroup) { |
|
| 136 | 136 | \OCP\Util::writeLog('user_ldap', |
| 137 | 137 | 'bgJ "updateGroups" – new group "'.$createdGroup.'" found.', |
| 138 | 138 | \OCP\Util::INFO); |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | FROM `*PREFIX*ldap_group_members` |
| 155 | 155 | WHERE `owncloudname` = ? |
| 156 | 156 | '); |
| 157 | - foreach($removedGroups as $removedGroup) { |
|
| 157 | + foreach ($removedGroups as $removedGroup) { |
|
| 158 | 158 | \OCP\Util::writeLog('user_ldap', |
| 159 | 159 | 'bgJ "updateGroups" – group "'.$removedGroup.'" was removed.', |
| 160 | 160 | \OCP\Util::INFO); |
@@ -169,13 +169,13 @@ discard block |
||
| 169 | 169 | * @return \OCA\User_LDAP\Group_LDAP|\OCA\User_LDAP\Group_Proxy |
| 170 | 170 | */ |
| 171 | 171 | static private function getGroupBE() { |
| 172 | - if(!is_null(self::$groupBE)) { |
|
| 172 | + if (!is_null(self::$groupBE)) { |
|
| 173 | 173 | return self::$groupBE; |
| 174 | 174 | } |
| 175 | 175 | $helper = new Helper(\OC::$server->getConfig()); |
| 176 | 176 | $configPrefixes = $helper->getServerConfigurationPrefixes(true); |
| 177 | 177 | $ldapWrapper = new LDAP(); |
| 178 | - if(count($configPrefixes) === 1) { |
|
| 178 | + if (count($configPrefixes) === 1) { |
|
| 179 | 179 | //avoid the proxy when there is only one LDAP server configured |
| 180 | 180 | $dbc = \OC::$server->getDatabaseConnection(); |
| 181 | 181 | $userManager = new Manager( |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | * @return array |
| 205 | 205 | */ |
| 206 | 206 | static private function getKnownGroups() { |
| 207 | - if(is_array(self::$groupsFromDB)) { |
|
| 207 | + if (is_array(self::$groupsFromDB)) { |
|
| 208 | 208 | return self::$groupsFromDB; |
| 209 | 209 | } |
| 210 | 210 | $query = \OCP\DB::prepare(' |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | '); |
| 214 | 214 | $result = $query->execute()->fetchAll(); |
| 215 | 215 | self::$groupsFromDB = array(); |
| 216 | - foreach($result as $dataset) { |
|
| 216 | + foreach ($result as $dataset) { |
|
| 217 | 217 | self::$groupsFromDB[$dataset['owncloudname']] = $dataset; |
| 218 | 218 | } |
| 219 | 219 | |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | * @param array|string $values |
| 53 | 53 | */ |
| 54 | 54 | public function addOptions($key, $values) { |
| 55 | - if(!is_array($values)) { |
|
| 55 | + if (!is_array($values)) { |
|
| 56 | 56 | $values = array($values); |
| 57 | 57 | } |
| 58 | 58 | $this->options[$key] = $values; |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | public function getResultArray() { |
| 72 | 72 | $result = array(); |
| 73 | 73 | $result['changes'] = $this->changes; |
| 74 | - if(count($this->options) > 0) { |
|
| 74 | + if (count($this->options) > 0) { |
|
| 75 | 75 | $result['options'] = $this->options; |
| 76 | 76 | } |
| 77 | 77 | return $result; |
@@ -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 | } |
@@ -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 | } |