Couple of improvements:

* Fix breaking foreach loop over mails
* Store user data in session on sendtoken
* Retrieve user data from session on resetbytoken
* Use `$ldap_login_attribute` to retrieve the username from user data
* `$ldap_filter_reset` for ldap search on sendtoken (allow non-unique
search criteria)
* Add message type for login field on sendtoken

Author: myrho

conf/config.inc.php

@@ -42,6 +42,7 @@
 $ldap_login_attribute = "uid";
 $ldap_fullname_attribute = "cn";
 $ldap_filter = "(&(objectClass=person)($ldap_login_attribute={login}))";
+$ldap_filter_reset = $ldap_filter;
 
 # Active Directory mode
 # true: use unicodePwd as password field

lang/ca.inc.php

@@ -38,7 +38,8 @@
 $messages['badcredentials'] = "El nom d'usuari o la contrasenya són incorrectes";
 $messages['passworderror'] = "El servidor ha refusat la contrasenya";
 $messages['title'] = "Autoservei de canvi de contrasenyes";
-$messages['login'] = "Nom d'usuari";
+$messages['login'] = "Nom d'usuari"; // coheres with $ldap_filter
+$messages['login_reset'] = $messages['login']; // coheres with $ldap_filter_reset
 $messages['oldpassword'] = "Contrasenya anterior";
 $messages['newpassword'] = "Contrasenya nova";
 $messages['confirmpassword'] = "Confirmeu la nova contrasenya";

lang/cn.inc.php

@@ -36,7 +36,8 @@
 $messages['badcredentials'] = "用户名或密码不正确";
 $messages['passworderror'] = "密码被拒";
 $messages['title'] = "统一登录平台自助改密";
-$messages['login'] = "用户名";
+$messages['login'] = "用户名"; // coheres with $ldap_filter
+$messages['login_reset'] = $messages['login']; // coheres with $ldap_filter_reset
 $messages['oldpassword'] = "旧密码";
 $messages['newpassword'] = "新密码";
 $messages['confirmpassword'] = "新密码";

lang/cs.inc.php

@@ -36,7 +36,8 @@
 $messages['badcredentials'] = "Zadali jste špatné jméno nebo heslo";
 $messages['passworderror'] = "Heslo bylo odmítnuto serverem LDAP";
 $messages['title'] = "Změna hesla";
-$messages['login'] = "Přihlašovací jméno";
+$messages['login'] = "Přihlašovací jméno"; // coheres with $ldap_filter
+$messages['login_reset'] = $messages['login']; // coheres with $ldap_filter_reset
 $messages['oldpassword'] = "Staré heslo";
 $messages['newpassword'] = "Nové heslo";
 $messages['confirmpassword'] = "Potvrďte";

lang/de.inc.php

@@ -36,7 +36,8 @@
 $messages['badcredentials'] = "Login oder Passwort inkorrekt";
 $messages['passworderror'] = "Passwort wurde vom LDAP nicht akzeptiert";
 $messages['title'] = "Passwortverwaltung";
-$messages['login'] = "Login";
+$messages['login'] = "Login"; // coheres with $ldap_filter
+$messages['login_reset'] = $messages['login']; // coheres with $ldap_filter_reset
 $messages['oldpassword'] = "Altes Passwort";
 $messages['newpassword'] = "Neues Passwort";
 $messages['confirmpassword'] = "Bestätigen";

lang/ee.inc.php

@@ -40,7 +40,8 @@
 $messages['passworderror'] = "Parooli muudatus lükati tagasi LDAP kataloogi poolt";
 $messages['sshkeyerror'] = "SSH võtme muudatus lükati tagasi LDAP kataloogi poolt";
 $messages['title'] = "Iseteenindus";
-$messages['login'] = "Kasutajanimi";
+$messages['login'] = "Kasutajanimi"; // coheres with $ldap_filter
+$messages['login_reset'] = $messages['login']; // coheres with $ldap_filter_reset
 $messages['oldpassword'] = "Vana parool";
 $messages['newpassword'] = "Uus parool";
 $messages['confirmpassword'] = "Kinnita uus parool";

lang/el.inc.php

@@ -36,7 +36,8 @@
 $messages['badcredentials'] = "Το όνομα χρήστη ή ο κωδικός είναι λάθος";
 $messages['passworderror'] = "Ο κωδικός δεν έγινε δεκτός από την υπηρεσία καταλόγου";
 $messages['title'] = "Αλλαγή/Ανάκτηση Κωδικού";
-$messages['login'] = "Όνομα χρήστη";
+$messages['login'] = "Όνομα χρήστη"; // coheres with $ldap_filter
+$messages['login_reset'] = $messages['login']; // coheres with $ldap_filter_reset
 $messages['oldpassword'] = "Ισχύων κωδικός";
 $messages['newpassword'] = "Νέος κωδικός";
 $messages['confirmpassword'] = "Επιβεβαίωση";

lang/en.inc.php

@@ -38,7 +38,8 @@
 $messages['passworderror'] = "Password was refused by the LDAP directory";
 $messages['sshkeyerror'] = "SSH Key was refused by the LDAP directory";
 $messages['title'] = "Self service password";
-$messages['login'] = "Login";
+$messages['login'] = "Login"; // coheres with $ldap_filter
+$messages['login_reset'] = $messages['login']; // coheres with $ldap_filter_reset
 $messages['oldpassword'] = "Old password";
 $messages['newpassword'] = "New password";
 $messages['confirmpassword'] = "Confirm";

lang/es.inc.php

@@ -36,7 +36,8 @@
 $messages['badcredentials'] = "Su nombre de usuario o su contraseña es incorrecta";
 $messages['passworderror'] = "Su contraseña fue rechazada";
 $messages['title'] = "Autoservicio de cambio de contraseñas";
-$messages['login'] = "Nombre de usuario";
+$messages['login'] = "Nombre de usuario"; // coheres with $ldap_filter
+$messages['login_reset'] = $messages['login']; // coheres with $ldap_filter_reset
 $messages['oldpassword'] = "Contraseña anterior";
 $messages['newpassword'] = "Contraseña nueva";
 $messages['confirmpassword'] = "Confirme contraseña nueva";

lang/fr.inc.php

@@ -36,7 +36,8 @@
 $messages['badcredentials'] = "Identifiant ou mot de passe incorrect";
 $messages['passworderror'] = "Le mot de passe a été refusé";
 $messages['title'] = "Gestion du mot de passe";
-$messages['login'] = "Identifiant";
+$messages['login'] = "Identifiant"; // coheres with $ldap_filter
+$messages['login_reset'] = $messages['login']; // coheres with $ldap_filter_reset
 $messages['oldpassword'] = "Ancien mot de passe";
 $messages['newpassword'] = "Nouveau mot de passe";
 $messages['confirmpassword'] = "Confirmation";