upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 17:23:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 58

Merge pull request #30997 from nextcloud/fix/noid/ldap-occ-test-config-accessor

Browse source 
fix overwriting of SUCCESS and INVALID consts
This commit is contained in:
blizzz 2022-02-09 10:35:46 +01:00 committed by GitHub
commit a353db2c31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/user_ldap/lib/Command/TestConfig.php
View file

@ -35,8 +35,8 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class TestConfig extends Command {
protected const SUCCESS = 0;
protected const INVALID = 1;
protected const ESTABLISHED = 0;
protected const CONF_INVALID = 1;
protected const BINDFAILURE = 2;
protected const SEARCHFAILURE = 3;
@ -71,10 +71,10 @@ class TestConfig extends Command {
$result = $this->testConfig($configID);
switch ($result) {
case static::SUCCESS:
case static::ESTABLISHED:
$output->writeln('The configuration is valid and the connection could be established!');
return 0;
case static::INVALID:
case static::CONF_INVALID:
$output->writeln('The configuration is invalid. Please have a look at the logs for further details.');
break;
case static::BINDFAILURE:
@ -103,7 +103,7 @@ class TestConfig extends Command {
if (!$connection->setConfiguration([
'ldap_configuration_active' => 1,
])) {
return static::INVALID;
return static::CONF_INVALID;
}
if (!$connection->bind()) {
return static::BINDFAILURE;
@ -113,6 +113,6 @@ class TestConfig extends Command {
if (!is_int($result) || ($result <= 0)) {
return static::SEARCHFAILURE;
}
return static::SUCCESS;
return static::ESTABLISHED;
}
}