tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

AuthenticationStep: Fix that the backend type 'msldap' is shown as external

Browse Source
This commit is contained in:
Johannes Meyer 2015-07-30 15:05:19 +02:00
parent 87deda86be
commit 171be7a436
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/setup/library/Setup/Steps/AuthenticationStep.php
View File

@ -124,7 +124,9 @@ class AuthenticationStep extends Step
$backendDesc = '<p>' . sprintf( $backendDesc = '<p>' . sprintf(
mt('setup', 'Users will authenticate using %s.', 'setup.summary.auth'), mt('setup', 'Users will authenticate using %s.', 'setup.summary.auth'),
$authType === 'db' ? mt('setup', 'a database', 'setup.summary.auth.type') : ( $authType === 'db' ? mt('setup', 'a database', 'setup.summary.auth.type') : (
$authType === 'ldap' ? 'LDAP' : mt('setup', 'webserver authentication', 'setup.summary.auth.type') $authType === 'ldap' || $authType === 'msldap' ? 'LDAP' : (
mt('setup', 'webserver authentication', 'setup.summary.auth.type')
)
) )
) . '</p>'; ) . '</p>';
@ -135,18 +137,20 @@ class AuthenticationStep extends Step
. '<td><strong>' . t('Backend Name') . '</strong></td>' . '<td><strong>' . t('Backend Name') . '</strong></td>'
. '<td>' . $this->data['backendConfig']['name'] . '</td>' . '<td>' . $this->data['backendConfig']['name'] . '</td>'
. '</tr>' . '</tr>'
. ($authType === 'ldap' ? ( . ($authType === 'ldap' || $authType === 'msldap' ? (
'<tr>' '<tr>'
. '<td><strong>' . mt('setup', 'User Object Class') . '</strong></td>' . '<td><strong>' . mt('setup', 'User Object Class') . '</strong></td>'
. '<td>' . $this->data['backendConfig']['user_class'] . '</td>' . '<td>' . ($authType === 'msldap' ? 'user' : $this->data['backendConfig']['user_class']) . '</td>'
. '</tr>' . '</tr>'
. '<tr>' . '<tr>'
. '<td><strong>' . mt('setup', 'Custom Filter') . '</strong></td>' . '<td><strong>' . mt('setup', 'Custom Filter') . '</strong></td>'
. '<td>' . trim($this->data['backendConfig']['filter']) ?: t('None', 'auth.ldap.filter') . '</td>' . '<td>' . (trim($this->data['backendConfig']['filter']) ?: t('None', 'auth.ldap.filter')) . '</td>'
. '</tr>' . '</tr>'
. '<tr>' . '<tr>'
. '<td><strong>' . mt('setup', 'User Name Attribute') . '</strong></td>' . '<td><strong>' . mt('setup', 'User Name Attribute') . '</strong></td>'
. '<td>' . $this->data['backendConfig']['user_name_attribute'] . '</td>' . '<td>' . ($authType === 'msldap'
? 'sAMAccountName'
: $this->data['backendConfig']['user_name_attribute']) . '</td>'
. '</tr>' . '</tr>'
) : ($authType === 'external' ? ( ) : ($authType === 'external' ? (
'<tr>' '<tr>'