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

dicos/70_lemonldap_ng.xml

@@ -61,6 +61,7 @@
 			<variable name='llResetPassword' type='oui/non' description="Permettre aux utilisateurs de réinitialiser leurs mots de passe">
 				<value>oui</value>
 			</variable>
+			<variable name='llResetUrl' type='string' description="Adresse de l'application pour réinitialiser leurs mots de passe" />
 			<variable name='llRegisterAccount' type='oui/non' description="Permettre aux utilisateurs de créer un compte">
 				<value>oui</value>
 			</variable>
@@ -115,6 +116,10 @@
 			<param>Custom</param>
 			<target type='variable'>llRegisterURL</target>
 		</condition>
+        <condition name='disabled_if_in' source='llResetPassword'>
+            <param>non</param>
+            <target type='variable'>llResetUrl</target>
+        </condition>		
 		<check name='valid_enum' target='llSkin'>
 			<param>['bootstrap','dark','impact','pastel']</param>
 			<param name="checkval">False</param>

tmpl/lmConf-1.js

@@ -392,7 +392,11 @@
     "oidcOPMetaDataJWKS": null,
     "webIDAuthnLevel": 1,
     "issuerDBOpenIDActivation": "1",
+%if %%is_empty(%%llResetUrl)    
     "mailUrl": "https://%%authWebName/mail.pl",
+%else
+    "mailUrl": "%%llResetUrl",
+%end if
     "maintenance": 0,
     "jsRedirect": 0,
     "cfgAuthor": "Cadoles",