diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php index 4cd2f0b9821..86032570e73 100644 --- a/htdocs/admin/ldap_contacts.php +++ b/htdocs/admin/ldap_contacts.php @@ -51,6 +51,7 @@ if ($_GET["action"] == 'setvalue' && $user->admin) if (! dolibarr_set_const($db, 'LDAP_KEY_CONTACTS',$_POST["key"])) $error++; if (! dolibarr_set_const($db, 'LDAP_CONTACT_DN',$_POST["contactdn"])) $error++; + if (! dolibarr_set_const($db, 'LDAP_CONTACT_OBJECT_CLASS',$_POST["objectclass"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_FULLNAME',$_POST["fieldfullname"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_NAME',$_POST["fieldname"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_FIRSTNAME',$_POST["fieldfirstname"])) $error++; @@ -113,6 +114,14 @@ print ''.$langs->trans("LDAPContactDnExample").''; print ' '; print ''; +// List of object class used to define attributes in structure +$var=!$var; +print ''.$langs->trans("LDAPContactObjectClassList").picto_required().''; +print ''; +print ''.$langs->trans("LDAPContactObjectClassListExample").''; +print ' '; +print ''; + print ''; print '
'; print ''; diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php index a69a1248515..4fc80a9fe58 100644 --- a/htdocs/admin/ldap_groups.php +++ b/htdocs/admin/ldap_groups.php @@ -52,6 +52,7 @@ if ($_GET["action"] == 'setvalue' && $user->admin) if (! dolibarr_set_const($db, 'LDAP_KEY_GROUPS',$_POST["key"])) $error++; if (! dolibarr_set_const($db, 'LDAP_GROUP_DN',$_POST["group"])) $error++; + if (! dolibarr_set_const($db, 'LDAP_GROUP_OBJECT_CLASS',$_POST["objectclass"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_FULLNAME',$_POST["fieldfullname"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_NAME',$_POST["fieldname"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_DESCRIPTION',$_POST["fielddescription"])) $error++; @@ -107,6 +108,14 @@ print ''; print ''; print ''; +// List of object class used to define attributes in structure +$var=!$var; +print ''; +print ''; +print ''; + print '
'.$langs->trans("LDAPGroupDnExample").' 
'.$langs->trans("LDAPGroupObjectClassList").picto_required().''; +print ''; +print ''.$langs->trans("LDAPGroupObjectClassListExample").' 
'; print '
'; print ''; diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php index 2b1292a69f5..2b1309e7994 100644 --- a/htdocs/admin/ldap_members.php +++ b/htdocs/admin/ldap_members.php @@ -52,9 +52,11 @@ if ($_GET["action"] == 'setvalue' && $user->admin) if (! dolibarr_set_const($db, 'LDAP_KEY_MEMBERS',$_POST["key"])) $error++; if (! dolibarr_set_const($db, 'LDAP_MEMBER_DN',$_POST["user"])) $error++; + if (! dolibarr_set_const($db, 'LDAP_MEMBER_OBJECT_CLASS',$_POST["objectclass"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_FULLNAME',$_POST["fieldfullname"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_LOGIN',$_POST["fieldlogin"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_LOGIN_SAMBA',$_POST["fieldloginsamba"])) $error++; + if (! dolibarr_set_const($db, 'LDAP_FIELD_PASSWORD',$_POST["fieldpassword"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_NAME',$_POST["fieldname"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_FIRSTNAME',$_POST["fieldfirstname"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_MAIL',$_POST["fieldmail"])) $error++; @@ -121,6 +123,14 @@ print ''; print ''; print ''; +// List of object class used to define attributes in structure +$var=!$var; +print ''; +print ''; +print ''; + print '
'.$langs->trans("LDAPMemberDnExample").' 
'.$langs->trans("LDAPMemberObjectClassList").picto_required().''; +print ''; +print ''.$langs->trans("LDAPMemberObjectClassListExample").' 
'; print '
'; print ''; @@ -181,6 +191,14 @@ print ''; print '"; print ''; +// Password +$var=!$var; +print ''; +print '"; +print ''; + // Mail $var=!$var; print ''; print ''; print ''; +// List of object class used to define attributes in structure +$var=!$var; +print ''; +print ''; +print ''; + // Filtre //Utilise pour filtrer la recherche $var=!$var; @@ -177,6 +187,14 @@ print ''; print '"; print ''; +// Password +$var=!$var; +print ''; +print '"; +print ''; + // Mail $var=!$var; print '
'.$langs->trans("LDAPFieldLoginSambaExample").'global->LDAP_KEY_MEMBERS==$conf->global->LDAP_FIELD_LOGIN_SAMBA?' checked="true"':'').">
'.$langs->trans("LDAPFieldPassword").''; +print ''; +print ''.$langs->trans("LDAPFieldPasswordExample").'global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_PASSWORD?' checked="true"':'').">
'.$langs->trans("LDAPFieldMail").''; diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php index 195ed791d82..bf6d6ca5668 100644 --- a/htdocs/admin/ldap_users.php +++ b/htdocs/admin/ldap_users.php @@ -52,10 +52,12 @@ if ($_GET["action"] == 'setvalue' && $user->admin) if (! dolibarr_set_const($db, 'LDAP_KEY_USERS',$_POST["key"])) $error++; if (! dolibarr_set_const($db, 'LDAP_USER_DN',$_POST["user"])) $error++; + if (! dolibarr_set_const($db, 'LDAP_USER_OBJECT_CLASS',$_POST["objectclass"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FILTER_CONNECTION',$_POST["filterconnection"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_FULLNAME',$_POST["fieldfullname"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_LOGIN',$_POST["fieldlogin"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_LOGIN_SAMBA',$_POST["fieldloginsamba"])) $error++; + if (! dolibarr_set_const($db, 'LDAP_FIELD_PASSWORD',$_POST["fieldpassword"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_NAME',$_POST["fieldname"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_FIRSTNAME',$_POST["fieldfirstname"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_MAIL',$_POST["fieldmail"])) $error++; @@ -117,6 +119,14 @@ print ''.$langs->trans("LDAPUserDnExample").' 
'.$langs->trans("LDAPUserObjectClassList").picto_required().''; +print ''; +print ''.$langs->trans("LDAPUserObjectClassListExample").' 
'.$langs->trans("LDAPFieldLoginSambaExample").'global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_LOGIN_SAMBA?' checked="true"':'').">
'.$langs->trans("LDAPFieldPassword").''; +print ''; +print ''.$langs->trans("LDAPFieldPasswordExample").'global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_PASSWORD?' checked="true"':'').">
'.$langs->trans("LDAPFieldMail").''; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 7078189c90f..e18c0a5ed63 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -556,6 +556,14 @@ LDAPContactDn=Dolibarr contacts' DN LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=society,dc=com) LDAPMemberDn=Dolibarr members' DN LDAPMemberDnExample=Complete DN (ex: ou=members,dc=society,dc=com) +LDAPMemberObjectClassList=List of objectClass +LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) +LDAPUserObjectClassList=List of objectClass +LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) +LDAPGroupObjectClassList=List of objectClass +LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames) +LDAPContactObjectClassList=List of objectClass +LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) LDAPMemberTypeDn=Dolibarr member's type DN LDAPMemberTypeDnExample=Complete DN (ex: ou=type_members,dc=society,dc=com) LDAPTestConnect=Test LDAP connection diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index b3f4ed8b8df..e74949de295 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -556,6 +556,14 @@ LDAPContactDn=DN des contacts Dolibarr LDAPContactDnExample=DN complet (ex: ou=contacts,dc=my-domain,dc=com) LDAPMemberDn=DN des adhérents LDAPMemberDnExample=DN complet (ex: ou=members,dc=society,dc=com) +LDAPMemberObjectClassList=Liste des objectClass +LDAPMemberObjectClassListExample=Liste des objectClass définissant les attributs d'un enregistrement (ex: top,inetOrgPerson ou top,user for active directory) +LDAPUserObjectClassList=Liste des objectClass +LDAPUserObjectClassListExample=Liste des objectClass définissant les attributs d'un enregistrement (ex: top,inetOrgPerson ou top,user for active directory) +LDAPGroupObjectClassList=Liste des objectClass +LDAPGroupObjectClassListExample=Liste des objectClass définissant les attributs d'un enregistrement (ex: top,groupOfUniqueNames) +LDAPContactObjectClassList=Liste des objectClass +LDAPContactObjectClassListExample=Liste des objectClass définissant les attributs d'un enregistrement (ex: top,inetOrgPerson ou top,user for active directory) LDAPMemberTypeDn=DN des types d'adhérents LDAPMemberTypeDnExample=DN complet (ex: ou=type_members,dc=society,dc=com) LDAPTestConnect=Tester la connexion LDAP