tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix that the LDAP discovery page is shown for non-LDAP authentication 

refs #7163
This commit is contained in:
Johannes Meyer 2014-10-09 15:05:21 +02:00
parent c3404fdc67
commit 78b130a4f3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/Icinga/Application/WebSetup.php
View File

@ -92,9 +92,8 @@ class WebSetup extends Wizard implements SetupWizard
$page->populate($suggestions['backend']); $page->populate($suggestions['backend']);
} }
} }
} else if ($page->getName() === 'setup_ldap_discovery_confirm') { } elseif ($page->getName() === 'setup_ldap_discovery_confirm') {
$page->setResourceConfig($this->getPageData('setup_ldap_discovery')); $page->setResourceConfig($this->getPageData('setup_ldap_discovery'));
} elseif ($page->getName() === 'setup_admin_account') { } elseif ($page->getName() === 'setup_admin_account') {
$page->setBackendConfig($this->getPageData('setup_authentication_backend')); $page->setBackendConfig($this->getPageData('setup_authentication_backend'));
$authData = $this->getPageData('setup_authentication_type'); $authData = $this->getPageData('setup_authentication_type');
@ -148,8 +147,11 @@ class WebSetup extends Wizard implements SetupWizard
$prefData = $this->getPageData('setup_preferences_type'); $prefData = $this->getPageData('setup_preferences_type');
$authData = $this->getPageData('setup_authentication_type'); $authData = $this->getPageData('setup_authentication_type');
$skip = $prefData['type'] !== 'db' && $authData['type'] !== 'db'; $skip = $prefData['type'] !== 'db' && $authData['type'] !== 'db';
} elseif ($newPage->getname() === 'setup_ldap_discovery') {
$authData = $this->getPageData('setup_authentication_type');
$skip = $authData['type'] !== 'ldap';
} elseif ($newPage->getName() === 'setup_ldap_discovery_confirm') { } elseif ($newPage->getName() === 'setup_ldap_discovery_confirm') {
$skip = $this->getPageData('setup_ldap_discovery') === null; $skip = false === $this->hasPageData('setup_ldap_discovery');
} elseif ($newPage->getName() === 'setup_ldap_resource') { } elseif ($newPage->getName() === 'setup_ldap_resource') {
$authData = $this->getPageData('setup_authentication_type'); $authData = $this->getPageData('setup_authentication_type');
$skip = $authData['type'] !== 'ldap'; $skip = $authData['type'] !== 'ldap';