Peter M. Groen / knowledgetree

Commit df0685bc21b755a2fa5879ced8ab308ef7513b1b

Authored by nbm
1 parent 726b6329

Use the CN LDAP attribute for the user's name. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4917 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
plugins/ktstandard/ldap/ldapbaseauthenticationprovider.inc.php
  View file @df0685b
@@ -172,7 +172,7 @@ class KTLDAPBaseAuthenticationProvider extends KTAuthenticationProvider { @@ -172,7 +172,7 @@ class KTLDAPBaseAuthenticationProvider extends KTAuthenticationProvider {
172 $fields = array(); 172 $fields = array();
173 $fields[] = new KTStaticTextWidget(_('LDAP DN'), _('The location of the user within the LDAP directory.'), 'dn', $id, $this->oPage); 173 $fields[] = new KTStaticTextWidget(_('LDAP DN'), _('The location of the user within the LDAP directory.'), 'dn', $id, $this->oPage);
174 $fields[] = new KTStringWidget(_('Username'), _('The username the user will enter to gain access to KnowledgeTree. e.g. <strong>jsmith</strong>'), 'ldap_username', $aResults[$this->aAttributes[1]], $this->oPage, true); 174 $fields[] = new KTStringWidget(_('Username'), _('The username the user will enter to gain access to KnowledgeTree. e.g. <strong>jsmith</strong>'), 'ldap_username', $aResults[$this->aAttributes[1]], $this->oPage, true);
175 - $fields[] = new KTStringWidget(_('Name'), _('The full name of the user. This is shown in reports and listings. e.g. <strong>John Smith</strong>'), 'name', join(" ", array($aResults[$this->aAttributes[2]], $aResults[$this->aAttributes[3]])), $this->oPage, true); 175 + $fields[] = new KTStringWidget(_('Name'), _('The full name of the user. This is shown in reports and listings. e.g. <strong>John Smith</strong>'), 'name', $aResults[$this->aAttributes[0]], $this->oPage, true);
176 $fields[] = new KTStringWidget(_('Email Address'), _('The email address of the user. Notifications and alerts are mailed to this address if <strong>email notifications</strong> is set below. e.g. <strong>jsmith@acme.com</strong>'), 'email_address', $aResults[$this->aAttributes[4]], $this->oPage, false); 176 $fields[] = new KTStringWidget(_('Email Address'), _('The email address of the user. Notifications and alerts are mailed to this address if <strong>email notifications</strong> is set below. e.g. <strong>jsmith@acme.com</strong>'), 'email_address', $aResults[$this->aAttributes[4]], $this->oPage, false);
177 $fields[] = new KTCheckboxWidget(_('Email Notifications'), _('If this is specified then the user will have notifications sent to the email address entered above. If it is not set, then the user will only see notifications on the <strong>Dashboard</strong>'), 'email_notifications', true, $this->oPage, false); 177 $fields[] = new KTCheckboxWidget(_('Email Notifications'), _('If this is specified then the user will have notifications sent to the email address entered above. If it is not set, then the user will only see notifications on the <strong>Dashboard</strong>'), 'email_notifications', true, $this->oPage, false);
178 $fields[] = new KTStringWidget(_('Mobile Number'), _('The mobile phone number of the user. If the system is configured to send notifications to cellphones, then this number will have an SMS delivered to it with notifications. e.g. <strong>999 9999 999</strong>'), 'mobile_number', $aResults[$this->aAttributes[5]], $this->oPage, false); 178 $fields[] = new KTStringWidget(_('Mobile Number'), _('The mobile phone number of the user. If the system is configured to send notifications to cellphones, then this number will have an SMS delivered to it with notifications. e.g. <strong>999 9999 999</strong>'), 'mobile_number', $aResults[$this->aAttributes[5]], $this->oPage, false);
@@ -241,7 +241,7 @@ class KTLDAPBaseAuthenticationProvider extends KTAuthenticationProvider { @@ -241,7 +241,7 @@ class KTLDAPBaseAuthenticationProvider extends KTAuthenticationProvider {
241 $aResults = $oAuthenticator->getUser($sId); 241 $aResults = $oAuthenticator->getUser($sId);
242 $dn = $sId; 242 $dn = $sId;
243 $sUserName = $aResults[$this->aAttributes[1]]; 243 $sUserName = $aResults[$this->aAttributes[1]];
244 - $sName = join(" ", array($aResults[$this->aAttributes[2]], $aResults[$this->aAttributes[3]])); 244 + $sName = $aResults[$this->aAttributes[0]];
245 $sEmailAddress = $aResults[$this->aAttributes[4]]; 245 $sEmailAddress = $aResults[$this->aAttributes[4]];
246 $sMobileNumber = $aResults[$this->aAttributes[5]]; 246 $sMobileNumber = $aResults[$this->aAttributes[5]];
247 247