lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: group ldap test need "uniqueMember" field

Browse Source
This commit is contained in:
Regis Houssin 2009-12-19 14:33:26 +00:00
parent 556f34d38f
commit c026d9eaa8
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/admin/ldap_groups.php
View File

@ -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_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_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_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) if ($error)
{ {
@ -164,10 +164,10 @@ print '</tr>';
// User group // User group
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldUserGroup").'</td><td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldGroupMembers").'</td><td>';
print '<input size="25" type="text" name="fieldusergroup" value="'.$conf->global->LDAP_GROUP_FIELD_USERGROUP.'">'; print '<input size="25" type="text" name="fieldgroupmembers" value="'.$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS.'">';
print '</td><td>'.$langs->trans("LDAPFieldUserGroupExample").'</td>'; print '</td><td>'.$langs->trans("LDAPFieldGroupMembersExample").'</td>';
print '<td align="right"><input type="radio" name="key" value="'.$conf->global->LDAP_GROUP_FIELD_USERGROUP.'"'.($conf->global->LDAP_KEY_GROUPS==$conf->global->LDAP_GROUP_FIELD_USERGROUP?' checked="true"':'')."></td>"; print '<td align="right"><input type="radio" name="key" value="'.$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS.'"'.($conf->global->LDAP_KEY_GROUPS==$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS?' checked="true"':'')."></td>";
print '</tr>'; print '</tr>';

4
htdocs/langs/en_US/admin.lang
View File

@ -948,8 +948,8 @@ LDAPFieldCountry=Country
LDAPFieldCountryExample=Example : c LDAPFieldCountryExample=Example : c
LDAPFieldDescription=Description LDAPFieldDescription=Description
LDAPFieldDescriptionExample=Example : description LDAPFieldDescriptionExample=Example : description
LDAPFieldUserGroup = Group members LDAPFieldGroupMembers = Group members
LDAPFieldUserGroupExample = Example : uniqueMember LDAPFieldGroupMembersExample = Example : uniqueMember
LDAPFieldBirthdate=Birthdate LDAPFieldBirthdate=Birthdate
LDAPFieldBirthdateExample=Example : LDAPFieldBirthdateExample=Example :
LDAPFieldCompany=Company LDAPFieldCompany=Company

4
htdocs/langs/fr_FR/admin.lang
View File

@ -949,8 +949,8 @@ LDAPFieldCountry = Pays
LDAPFieldCountryExample = Exemple : c LDAPFieldCountryExample = Exemple : c
LDAPFieldDescription = Description LDAPFieldDescription = Description
LDAPFieldDescriptionExample = Exemple : description LDAPFieldDescriptionExample = Exemple : description
LDAPFieldUserGroup = Membres du groupe LDAPFieldGroupMembers = Membres du groupe
LDAPFieldUserGroupExample = Exemple : uniqueMember LDAPFieldGroupMembersExample = Exemple : uniqueMember
LDAPFieldBirthdate = Date de naissance LDAPFieldBirthdate = Date de naissance
LDAPFieldBirthdateExample = Exemple : LDAPFieldBirthdateExample = Exemple :
LDAPFieldCompany = Société LDAPFieldCompany = Société

6
htdocs/usergroup.class.php
View File

@ -43,7 +43,7 @@ class UserGroup extends CommonObject
var $entity; // Entity of group var $entity; // Entity of group
var $nom; // Name of group var $nom; // Name of group
var $note; // Note on group var $note; // Note on group
var $user; // Users of group var $member; // Group member
var $datec; // Creation date of group var $datec; // Creation date of group
var $datem; // Modification 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_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->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->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; return $info;
} }
@ -582,7 +582,7 @@ class UserGroup extends CommonObject
$this->nom='DOLIBARR GROUP SPECIMEN'; $this->nom='DOLIBARR GROUP SPECIMEN';
$this->note='This is a note'; $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->datec=time();
$this->datem=time(); $this->datem=time();
} }