Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge branch 'MDL-61296-34' of git://github.com/cescobedo/moodle into…
Loading branch information
Showing
2 changed files
with
12 additions
and
2 deletions .
+11
−2
auth/ldap/auth.php
+1
−0
auth/ldap/lang/en/auth_ldap.php
@@ -1289,9 +1289,18 @@ function user_update($olduser, $newuser) {
$ nuvalue = core_text::convert ($ newvalue , 'utf-8' , $ this ->config ->ldapencoding );
empty ($ nuvalue ) ? $ nuvalue = array () : $ nuvalue ;
$ ouvalue = core_text::convert ($ oldvalue , 'utf-8' , $ this ->config ->ldapencoding );
foreach ($ ldapkeys as $ ldapkey ) {
$ ldapkey = $ ldapkey ;
// Skip update if $ldapkey does not exist in LDAP.
if (!isset ($ user_entry [$ ldapkey ][0 ])) {
$ success = false ;
error_log ($ this ->errorlogtag .get_string ('updateremfailfield' , 'auth_ldap' ,
array ('ldapkey' => $ ldapkey ,
'key' => $ key ,
'ouvalue' => $ ouvalue ,
'nuvalue' => $ nuvalue )));
continue ;
}
$ ldapvalue = $ user_entry [$ ldapkey ][0 ];
if (!$ ambiguous ) {
// Skip update if the values already match
@@ -149,6 +149,7 @@
$ string ['start_tls_key' ] = 'Use TLS' ;
$ string ['updateremfail' ] = 'Error updating LDAP record. Error code: {$a->errno}; Error string: {$a->errstring}<br/>Key ({$a->key}) - old moodle value: \'{$a->ouvalue}\' new value: \'{$a->nuvalue}\'' ;
$ string ['updateremfailamb' ] = 'Failed to update LDAP with ambiguous field {$a->key}; old moodle value: \'{$a->ouvalue}\', new value: \'{$a->nuvalue}\'' ;
$ string ['updateremfailfield' ] = 'Failed to update LDAP with non-existent field (\'{$a->ldapkey}\'). Key ({$a->key}) - old moodle value: \'{$a->ouvalue}\' new value: \'{$a->nuvalue}\'' ;
$ string ['updatepasserror' ] = 'Error in user_update_password(). Error code: {$a->errno}; Error string: {$a->errstring}' ;
$ string ['updatepasserrorexpire' ] = 'Error in user_update_password() when reading password expiry time. Error code: {$a->errno}; Error string: {$a->errstring}' ;
$ string ['updatepasserrorexpiregrace' ] = 'Error in user_update_password() when modifying expirationtime and/or gracelogins. Error code: {$a->errno}; Error string: {$a->errstring}' ;
Toggle all file notes
Toggle all file annotations