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

This reverts commit f1a6fbfdfd.

README.md

@@ -10,7 +10,7 @@ LemonLDAP::NG EOLE integration
 
 GenConfig -> Mode Expert -> Dépôts tiers -> Libellé du dépôt
 
-#### LemonLDAP::NG repository (if you use EOLE 2.8.X this is not needed anymore)
+#### LemonLDAP::NG repository (if you use EOLE 2.7.2 this is not needed anymore)
  
 * deb     https://lemonldap-ng.org/deb stable main
 * deb-src https://lemonldap-ng.org/deb stable main

dicos/70_lemonldap_ng.xml

@@ -160,6 +160,7 @@
         <check name="valid_enum" target="llRegisterDB">
             <param>['LDAP','AD','Demo','Custom']</param>
         </check>
+
         <group master="casAttribute">
             <slave>casLDAPAttribute</slave>
         </group>

dicos/71_lemonldap_ng_scribe.xml

@@ -77,4 +77,4 @@
 
     <help />
 
-</creole>
+</creole>

tmpl/lmConf-1.json

@@ -1,19 +1,25 @@
 %set %%boolean = {'oui': 1, 'non': 0}
 %set %%ssoFilters = %%getSSOFilters
+%set %%ldapAttributes = {"uid": "uid", "mail": "mail", "cn":"cn"}
 %set %%exported_vars = ['"UA": "HTTP_USER_AGENT"']
 %set %%cas_attributes = []
-%set %%ldap_attributes = ['"uid": "uid"', '"mail": "mail"','"cn":"cn"']
+%set %%ldap_attributes = {}
 %for %%attr in %%casAttribute
     %silent %%exported_vars.append('"' + %%attr + '": "' + %%attr.casLDAPAttribute + '"')
     %silent %%cas_attributes.append('"' + %%attr + '": "' + %%attr.casLDAPAttribute + '"')
-    %silent %%ldap_attributes.append('"' + %%attr.casLDAPAttribute + '": "' + %%attr.casLDAPAttribute + '"')
+    %set %%ldap_attributes[%%attr.casLDAPAttribute] = %%attr.casLDAPAttribute
 %end for
 %for %%key, %%value in %%ssoFilters
     %silent %%exported_vars.append('"' + %%key + '": "' + %%value + '"')
     %silent %%cas_attributes.append('"' + %%key + '": "' + %%value + '"')
+    %set %%ldap_attributes[%%value] = %%value
 %end for
 %silent %%exported_vars.sort()
 %silent %%cas_attributes.sort()
+%set %%ldapAttr = []
+%for %%k, %%v in %%ldap_attributes.items()
+   %silent %%ldapAttr.append('"' + %%k + '": "' + %%v + '"')
+%end for
 {
 %if %%lemon_user_db == "AD"
     "ADPwdExpireWarning": %%llADPasswordExpireWarn,
@@ -175,7 +181,7 @@
     "ldapSearchDeref": "find",
     "ldapBase": "%%ldapUserBaseDN",
     "ldapExportedVars": {
-        %%custom_join(%%ldap_attributes, ',\n        ')
+        %%custom_join(%%ldapAttr, ',\n        ')
     },
     "ldapGroupAttributeName": "memberUid",
     "ldapGroupAttributeNameGroup": "dn",
@@ -190,9 +196,9 @@
     "ldapServer": "%%ldapScheme://%%ldapServer",
 %if %%ldapScheme == "ldaps"
    %if %%lmldapverify == "oui"
-    "ldapVerify": "required",
+    "ldapVerify": "Require",
    %else
-    "ldapVerify": "none",
+    "ldapVerify": "None",
    %end if
 %end if
     "ldapSetPassword": 0,