diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php index 03444d5d17f..9f03cebfd1b 100644 --- a/htdocs/admin/ldap_groups.php +++ b/htdocs/admin/ldap_groups.php @@ -56,7 +56,7 @@ if ($_GET["action"] == 'setvalue' && $user->admin) if (! dolibarr_set_const($db, 'LDAP_GROUP_FIELD_FULLNAME',$_POST["fieldfullname"],'chaine',0,'',$conf->entity)) $error++; if (! dolibarr_set_const($db, 'LDAP_GROUP_FIELD_NAME',$_POST["fieldname"],'chaine',0,'',$conf->entity)) $error++; if (! dolibarr_set_const($db, 'LDAP_GROUP_FIELD_DESCRIPTION',$_POST["fielddescription"],'chaine',0,'',$conf->entity)) $error++; - if (! dolibarr_set_const($db, 'LDAP_GROUP_FIELD_USERGROUP',$_POST["fieldusergroup"],'chaine',0,'',$conf->entity)) $error++; + if (! dolibarr_set_const($db, 'LDAP_GROUP_FIELD_GROUPMEMBERS',$_POST["fieldgroupmembers"],'chaine',0,'',$conf->entity)) $error++; if ($error) { @@ -164,10 +164,10 @@ print ''; // User group $var=!$var; -print ''.$langs->trans("LDAPFieldUserGroup").''; -print ''; -print ''.$langs->trans("LDAPFieldUserGroupExample").''; -print 'global->LDAP_KEY_GROUPS==$conf->global->LDAP_GROUP_FIELD_USERGROUP?' checked="true"':'').">"; +print ''.$langs->trans("LDAPFieldGroupMembers").''; +print ''; +print ''.$langs->trans("LDAPFieldGroupMembersExample").''; +print 'global->LDAP_KEY_GROUPS==$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS?' checked="true"':'').">"; print ''; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 39525b3a0c5..fde126f8b77 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -948,8 +948,8 @@ LDAPFieldCountry=Country LDAPFieldCountryExample=Example : c LDAPFieldDescription=Description LDAPFieldDescriptionExample=Example : description -LDAPFieldUserGroup = Group members -LDAPFieldUserGroupExample = Example : uniqueMember +LDAPFieldGroupMembers = Group members +LDAPFieldGroupMembersExample = Example : uniqueMember LDAPFieldBirthdate=Birthdate LDAPFieldBirthdateExample=Example : LDAPFieldCompany=Company diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 07d3489dab3..ccb9264d152 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -949,8 +949,8 @@ LDAPFieldCountry = Pays LDAPFieldCountryExample = Exemple : c LDAPFieldDescription = Description LDAPFieldDescriptionExample = Exemple : description -LDAPFieldUserGroup = Membres du groupe -LDAPFieldUserGroupExample = Exemple : uniqueMember +LDAPFieldGroupMembers = Membres du groupe +LDAPFieldGroupMembersExample = Exemple : uniqueMember LDAPFieldBirthdate = Date de naissance LDAPFieldBirthdateExample = Exemple : LDAPFieldCompany = Société diff --git a/htdocs/usergroup.class.php b/htdocs/usergroup.class.php index b8421282143..a73d39c3eb8 100644 --- a/htdocs/usergroup.class.php +++ b/htdocs/usergroup.class.php @@ -43,7 +43,7 @@ class UserGroup extends CommonObject var $entity; // Entity of group var $nom; // Name of group var $note; // Note on group - var $user; // Users of group + var $member; // Group member var $datec; // Creation date of group var $datem; // Modification date of group @@ -562,7 +562,7 @@ class UserGroup extends CommonObject if ($this->nom && $conf->global->LDAP_GROUP_FIELD_FULLNAME) $info[$conf->global->LDAP_GROUP_FIELD_FULLNAME] = $this->nom; if ($this->nom && $conf->global->LDAP_GROUP_FIELD_NAME) $info[$conf->global->LDAP_GROUP_FIELD_NAME] = $this->nom; if ($this->note && $conf->global->LDAP_GROUP_FIELD_DESCRIPTION) $info[$conf->global->LDAP_GROUP_FIELD_DESCRIPTION] = $this->note; - if ($this->user && $conf->global->LDAP_GROUP_FIELD_USERGROUP) $info[$conf->global->LDAP_GROUP_FIELD_USERGROUP] = $this->user; + if ($this->member && $conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS) $info[$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS] = $this->member; return $info; } @@ -582,7 +582,7 @@ class UserGroup extends CommonObject $this->nom='DOLIBARR GROUP SPECIMEN'; $this->note='This is a note'; - $this->user=$conf->global->LDAP_KEY_USERS.'=DOLIBARR USER,'.$conf->global->LDAP_USER_DN; + $this->member=$conf->global->LDAP_KEY_USERS.'=DOLIBARR USER,'.$conf->global->LDAP_USER_DN; $this->datec=time(); $this->datem=time(); }