Merge branch 'master' into dist/eole/2.7.2/master

Fix reset password bug
2020-11-24 11:08:57 +01:00 · 2020-11-24 11:08:33 +01:00
1 changed files with 4 additions and 2 deletions
--- a/tmpl/lmConf-1.json
+++ b/tmpl/lmConf-1.json
@ -392,10 +392,12 @@
    "oidcOPMetaDataJWKS": null,
    "webIDAuthnLevel": 1,
    "issuerDBOpenIDActivation": "1",
-%if %%is_empty(%%llResetUrl)    
+%if %%llResetPassword == "oui"
+  %if %%is_empty(%%llResetUrl)    
    "mailUrl": "https://%%authWebName/mail.pl",
-%else
+  %else
    "mailUrl": "%%llResetUrl",
+  %end if
 %end if
    "maintenance": 0,
    "jsRedirect": 0,
Author	SHA1	Message	Date
Philippe Caseiro	25f36f63a0	Merge branch 'master' into dist/eole/2.7.2/master	2020-11-24 11:08:57 +01:00
Philippe Caseiro	fd4ee5dc87	Fix reset password bug	2020-11-24 11:08:33 +01:00