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

Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Regis Houssin 2012-10-24 18:41:51 +02:00
commit abb5047979
11 changed files with 176 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/admin/ldap.php
View File

@ -245,6 +245,7 @@ print '</form>';
print '</div>'; print '</div>';
print '<br>';
/* /*

91
htdocs/admin/ldap_users.php
View File

@ -249,7 +249,7 @@ print '</tr>';
// Description // Description
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldDescription").'</td><td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("Note").'</td><td>';
print '<input size="25" type="text" name="fielddescription" value="'.$conf->global->LDAP_FIELD_DESCRIPTION.'">'; print '<input size="25" type="text" name="fielddescription" value="'.$conf->global->LDAP_FIELD_DESCRIPTION.'">';
print '</td><td>'.$langs->trans("LDAPFieldDescriptionExample").'</td>'; print '</td><td>'.$langs->trans("LDAPFieldDescriptionExample").'</td>';
print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_DESCRIPTION"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_DESCRIPTION)?' checked="checked"':'')."></td>"; print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_DESCRIPTION"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_DESCRIPTION)?' checked="checked"':'')."></td>";
@ -287,10 +287,19 @@ if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap')
show_ldap_test_button($butlabel,$testlabel,$key,$dn,$objectclass); show_ldap_test_button($butlabel,$testlabel,$key,$dn,$objectclass);
} }
elseif ($conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')
{
$butlabel=$langs->trans("LDAPTestSearch");
$testlabel='testsearchuser';
$key=$conf->global->LDAP_KEY_USERS;
$dn=$conf->global->LDAP_USER_DN;
$objectclass=$conf->global->LDAP_USER_OBJECT_CLASS;
show_ldap_test_button($butlabel,$testlabel,$key,$dn,$objectclass);
}
if (function_exists("ldap_connect")) if (function_exists("ldap_connect"))
{ {
if ($_GET["action"] == 'testuser') if ($action == 'testuser')
{ {
// Creation objet // Creation objet
$object=new User($db); $object=new User($db);
@ -339,6 +348,84 @@ if (function_exists("ldap_connect"))
print $langs->trans("ErrorLDAPMakeManualTest",$conf->ldap->dir_temp).'<br>'; print $langs->trans("ErrorLDAPMakeManualTest",$conf->ldap->dir_temp).'<br>';
} }
} }
if ($action == 'testsearchuser')
{
// Creation objet
$object=new User($db);
$object->initAsSpecimen();
// TODO Mutualize code following with other ldap_xxxx.php pages
// Test synchro
$ldap=new Ldap();
$result=$ldap->connect_bind();
if ($result > 0)
{
$required_fields = array(
$conf->global->LDAP_KEY_USERS,
$conf->global->LDAP_FIELD_FULLNAME,
$conf->global->LDAP_FIELD_NAME,
$conf->global->LDAP_FIELD_FIRSTNAME,
$conf->global->LDAP_FIELD_LOGIN,
$conf->global->LDAP_FIELD_LOGIN_SAMBA,
$conf->global->LDAP_FIELD_PASSWORD,
$conf->global->LDAP_FIELD_PASSWORD_CRYPTED,
$conf->global->LDAP_FIELD_PHONE,
$conf->global->LDAP_FIELD_FAX,
$conf->global->LDAP_FIELD_MOBILE,
$conf->global->LDAP_FIELD_MAIL,
$conf->global->LDAP_FIELD_SID);
// Remove from required_fields all entries not configured in LDAP (empty) and duplicated
$required_fields=array_unique(array_values(array_filter($required_fields, "dol_validElement")));
// Get from LDAP database an array of results
$ldapusers = $ldap->getRecords('*', $conf->global->LDAP_USER_DN, $conf->global->LDAP_KEY_USERS, $required_fields, 1);
//$ldapusers = $ldap->getRecords('*', $conf->global->LDAP_USER_DN, $conf->global->LDAP_KEY_USERS, '', 1);
if (is_array($ldapusers))
{
$liste=array();
foreach ($ldapusers as $key => $ldapuser)
{
// Define the label string for this user
$label='';
foreach ($required_fields as $value)
{
if ($value)
{
$label.=$value."=".$ldapuser[$value]." ";
}
}
$liste[$key] = $label;
}
}
else
{
$mesg='<div class="error">'.$ldap->error.'</div>';
}
print "<br>\n";
print "LDAP search for user:<br>\n";
print "search: *<br>\n";
print "userDN: ".$conf->global->LDAP_USER_DN."<br>\n";
print "useridentifier: ".$conf->global->LDAP_KEY_USERS."<br>\n";
print "required_fields: ".join(',',$required_fields)."<br>\n";
print "=> ".count($liste)." records<br>\n";
print "\n<br>";
}
else
{
print img_picto('','error').' ';
print '<font class="error">'.$langs->trans("LDAPSynchroKO");
print ': '.$ldap->error;
print '</font><br>';
print $langs->trans("ErrorLDAPMakeManualTest",$conf->ldap->dir_temp).'<br>';
}
}
} }
dol_htmloutput_mesg($mesg); dol_htmloutput_mesg($mesg);

62
htdocs/core/class/ldap.class.php
View File

@ -169,7 +169,7 @@ class Ldap
if ($this->serverType == "activedirectory") if ($this->serverType == "activedirectory")
{ {
$result=$this->setReferrals(); $result=$this->setReferrals();
dol_syslog("Ldap::connect_bind try bindauth for activedirectory on ".$host." user=".$this->searchUser,LOG_DEBUG); dol_syslog(get_class($this)."::connect_bind try bindauth for activedirectory on ".$host." user=".$this->searchUser,LOG_DEBUG);
$this->result=$this->bindauth($this->searchUser,$this->searchPassword); $this->result=$this->bindauth($this->searchUser,$this->searchPassword);
if ($this->result) if ($this->result)
{ {
@ -187,7 +187,7 @@ class Ldap
// Try in auth mode // Try in auth mode
if ($this->searchUser && $this->searchPassword) if ($this->searchUser && $this->searchPassword)
{ {
dol_syslog("Ldap::connect_bind try bindauth on ".$host." user=".$this->searchUser,LOG_DEBUG); dol_syslog(get_class($this)."::connect_bind try bindauth on ".$host." user=".$this->searchUser,LOG_DEBUG);
$this->result=$this->bindauth($this->searchUser,$this->searchPassword); $this->result=$this->bindauth($this->searchUser,$this->searchPassword);
if ($this->result) if ($this->result)
{ {
@ -203,7 +203,7 @@ class Ldap
// Try in anonymous // Try in anonymous
if (! $this->bind) if (! $this->bind)
{ {
dol_syslog("Ldap::connect_bind try bind on ".$host,LOG_DEBUG); dol_syslog(get_class($this)."::connect_bind try bind on ".$host,LOG_DEBUG);
$result=$this->bind(); $result=$this->bind();
if ($result) if ($result)
{ {
@ -225,13 +225,13 @@ class Ldap
if ($connected) if ($connected)
{ {
$return=$connected; $return=$connected;
dol_syslog("Ldap::connect_bind return=".$return, LOG_DEBUG); dol_syslog(get_class($this)."::connect_bind return=".$return, LOG_DEBUG);
} }
else else
{ {
$this->error='Failed to connect to LDAP'.($this->error?': '.$this->error:''); $this->error='Failed to connect to LDAP'.($this->error?': '.$this->error:'');
$return=-1; $return=-1;
dol_syslog("Ldap::connect_bind return=".$return.' - '.$this->error, LOG_WARNING); dol_syslog(get_class($this)."::connect_bind return=".$return.' - '.$this->error, LOG_WARNING);
} }
return $return; return $return;
} }
@ -419,7 +419,7 @@ class Ldap
{ {
global $conf; global $conf;
dol_syslog("Ldap::modify dn=".$dn." info=".join(',',$info)); dol_syslog(get_class($this)."::modify dn=".$dn." info=".join(',',$info));
// Check parameters // Check parameters
if (! $this->connection) if (! $this->connection)
@ -447,13 +447,13 @@ class Ldap
if ($result) if ($result)
{ {
dol_syslog("Ldap::modify successfull", LOG_DEBUG); dol_syslog(get_class($this)."::modify successfull", LOG_DEBUG);
return 1; return 1;
} }
else else
{ {
$this->error=@ldap_error($this->connection); $this->error=@ldap_error($this->connection);
dol_syslog("Ldap::modify failed: ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::modify failed: ".$this->error, LOG_ERR);
return -1; return -1;
} }
} }
@ -472,7 +472,7 @@ class Ldap
{ {
global $conf; global $conf;
dol_syslog("Ldap::update dn=".$dn." olddn=".$olddn); dol_syslog(get_class($this)."::update dn=".$dn." olddn=".$olddn);
// Check parameters // Check parameters
if (! $this->connection) if (! $this->connection)
@ -501,13 +501,13 @@ class Ldap
if ($result <= 0) if ($result <= 0)
{ {
$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection)." ".$this->error; $this->error = ldap_errno($this->connection)." ".ldap_error($this->connection)." ".$this->error;
dol_syslog("Ldap::update ".$this->error,LOG_ERR); dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
//print_r($info); //print_r($info);
return -1; return -1;
} }
else else
{ {
dol_syslog("Ldap::update done successfully"); dol_syslog(get_class($this)."::update done successfully");
return 1; return 1;
} }
} }
@ -524,7 +524,7 @@ class Ldap
{ {
global $conf; global $conf;
dol_syslog("Ldap::delete Delete LDAP entry dn=".$dn); dol_syslog(get_class($this)."::delete Delete LDAP entry dn=".$dn);
// Check parameters // Check parameters
if (! $this->connection) if (! $this->connection)
@ -638,7 +638,7 @@ class Ldap
{ {
global $conf; global $conf;
dol_syslog("Ldap::addAttribute dn=".$dn." info=".join(',',$info)); dol_syslog(get_class($this)."::addAttribute dn=".$dn." info=".join(',',$info));
// Check parameters // Check parameters
if (! $this->connection) if (! $this->connection)
@ -666,13 +666,13 @@ class Ldap
if ($result) if ($result)
{ {
dol_syslog("Ldap::add_attribute successfull", LOG_DEBUG); dol_syslog(get_class($this)."::add_attribute successfull", LOG_DEBUG);
return 1; return 1;
} }
else else
{ {
$this->error=@ldap_error($this->connection); $this->error=@ldap_error($this->connection);
dol_syslog("Ldap::add_attribute failed: ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::add_attribute failed: ".$this->error, LOG_ERR);
return -1; return -1;
} }
} }
@ -690,7 +690,7 @@ class Ldap
{ {
global $conf; global $conf;
dol_syslog("Ldap::updateAttribute dn=".$dn." info=".join(',',$info)); dol_syslog(get_class($this)."::updateAttribute dn=".$dn." info=".join(',',$info));
// Check parameters // Check parameters
if (! $this->connection) if (! $this->connection)
@ -718,13 +718,13 @@ class Ldap
if ($result) if ($result)
{ {
dol_syslog("Ldap::updateAttribute successfull", LOG_DEBUG); dol_syslog(get_class($this)."::updateAttribute successfull", LOG_DEBUG);
return 1; return 1;
} }
else else
{ {
$this->error=@ldap_error($this->connection); $this->error=@ldap_error($this->connection);
dol_syslog("Ldap::updateAttribute failed: ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::updateAttribute failed: ".$this->error, LOG_ERR);
return -1; return -1;
} }
} }
@ -742,7 +742,7 @@ class Ldap
{ {
global $conf; global $conf;
dol_syslog("Ldap::deleteAttribute dn=".$dn." info=".join(',',$info)); dol_syslog(get_class($this)."::deleteAttribute dn=".$dn." info=".join(',',$info));
// Check parameters // Check parameters
if (! $this->connection) if (! $this->connection)
@ -770,13 +770,13 @@ class Ldap
if ($result) if ($result)
{ {
dol_syslog("Ldap::deleteAttribute successfull", LOG_DEBUG); dol_syslog(get_class($this)."::deleteAttribute successfull", LOG_DEBUG);
return 1; return 1;
} }
else else
{ {
$this->error=@ldap_error($this->connection); $this->error=@ldap_error($this->connection);
dol_syslog("Ldap::deleteAttribute failed: ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::deleteAttribute failed: ".$this->error, LOG_ERR);
return -1; return -1;
} }
} }
@ -872,21 +872,21 @@ class Ldap
* @param string $search Valeur champ cle recherche, sinon '*' pour tous. * @param string $search Valeur champ cle recherche, sinon '*' pour tous.
* @param string $userDn DN (Ex: ou=adherents,ou=people,dc=parinux,dc=org) * @param string $userDn DN (Ex: ou=adherents,ou=people,dc=parinux,dc=org)
* @param string $useridentifier Name of key field (Ex: uid) * @param string $useridentifier Name of key field (Ex: uid)
* @param array $attributeArray Array of fields required (Ex: sn,userPassword) * @param array $attributeArray Array of fields required. Note this array must also contains field $useridentifier (Ex: sn,userPassword)
* @param int $activefilter 1=utilise le champ this->filter comme filtre * @param int $activefilter 1=use field this->filter as filter instead of parameter $search
* @return array Array of [id_record][ldap_field]=value * @return array Array of [id_record][ldap_field]=value
*/ */
function getRecords($search, $userDn, $useridentifier, $attributeArray, $activefilter=0) function getRecords($search, $userDn, $useridentifier, $attributeArray, $activefilter=0)
{ {
$fulllist=array(); $fulllist=array();
dol_syslog("Ldap::getRecords search=".$search." userDn=".$userDn." useridentifier=".$useridentifier." attributeArray=array(".join(',',$attributeArray).")"); dol_syslog(get_class($this)."::getRecords search=".$search." userDn=".$userDn." useridentifier=".$useridentifier." attributeArray=array(".join(',',$attributeArray).")");
// if the directory is AD, then bind first with the search user first // if the directory is AD, then bind first with the search user first
if ($this->serverType == "activedirectory") if ($this->serverType == "activedirectory")
{ {
$this->bindauth($this->searchUser, $this->searchPassword); $this->bindauth($this->searchUser, $this->searchPassword);
dol_syslog("Ldap::bindauth serverType=activedirectory searchUser=".$this->searchUser); dol_syslog(get_class($this)."::bindauth serverType=activedirectory searchUser=".$this->searchUser);
} }
// Define filter // Define filter
@ -909,13 +909,15 @@ class Ldap
if (is_array($attributeArray)) if (is_array($attributeArray))
{ {
// Return list with required fields // Return list with required fields
dol_syslog("Ldap::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter. " attributeArray=(".join(',',$attributeArray).")"); $attributeArray=array_values($attributeArray); // This is to force to have index reordered from 0 (not make ldap_search fails)
dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter. " attributeArray=(".join(',',$attributeArray).")");
//var_dump($attributeArray);
$this->result = @ldap_search($this->connection, $userDn, $filter, $attributeArray); $this->result = @ldap_search($this->connection, $userDn, $filter, $attributeArray);
} }
else else
{ {
// Return list with fields selected by default // Return list with fields selected by default
dol_syslog("Ldap::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter); dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter);
$this->result = @ldap_search($this->connection, $userDn, $filter); $this->result = @ldap_search($this->connection, $userDn, $filter);
} }
if (!$this->result) if (!$this->result)
@ -1073,7 +1075,7 @@ class Ldap
*/ */
function search($checkDn, $filter) function search($checkDn, $filter)
{ {
dol_syslog("Ldap::search checkDn=".$checkDn." filter=".$filter); dol_syslog(get_class($this)."::search checkDn=".$checkDn." filter=".$filter);
$checkDn=$this->convFromOutputCharset($checkDn,$this->ldapcharset); $checkDn=$this->convFromOutputCharset($checkDn,$this->ldapcharset);
$filter=$this->convFromOutputCharset($filter,$this->ldapcharset); $filter=$this->convFromOutputCharset($filter,$this->ldapcharset);
@ -1122,7 +1124,7 @@ class Ldap
$i=0; $i=0;
while ($i <= 2) while ($i <= 2)
{ {
dol_syslog("Ldap::fetch search with searchDN=".$searchDN." filter=".$filter); dol_syslog(get_class($this)."::fetch search with searchDN=".$searchDN." filter=".$filter);
$this->result = @ldap_search($this->connection, $searchDN, $filter); $this->result = @ldap_search($this->connection, $searchDN, $filter);
if ($this->result) if ($this->result)
{ {
@ -1134,7 +1136,7 @@ class Ldap
else else
{ {
$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection); $this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
dol_syslog("Ldap::fetch search fails"); dol_syslog(get_class($this)."::fetch search fails");
return -1; return -1;
} }

14
htdocs/langs/el_GR/admin.lang
View File

@ -487,12 +487,12 @@ LDAPServerUseTLS=Use TLS
LDAPServerUseTLSExample=Your LDAP server use TLS LDAPServerUseTLSExample=Your LDAP server use TLS
LDAPServerDn=Server DN LDAPServerDn=Server DN
LDAPAdminDn=Administrator DN LDAPAdminDn=Administrator DN
LDAPAdminDnExample=Complete DN (ex: cn=adminldap,dc=society,dc=com) LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
LDAPPassword=Administrator password LDAPPassword=Administrator password
LDAPUserDn=Users' DN LDAPUserDn=Users' DN
LDAPUserDnExample=Complete DN (ex: ou=users,dc=society,dc=com) LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
LDAPGroupDn=Groups' DN LDAPGroupDn=Groups' DN
LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=society,dc=com) LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/) LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
LDAPServerDnExample=Complete DN (ex: dc=company,dc=com) LDAPServerDnExample=Complete DN (ex: dc=company,dc=com)
LDAPPasswordExample=Admin password LDAPPasswordExample=Admin password
@ -504,9 +504,9 @@ LDAPDnContactActiveExample=Activated/Unactivated synchronization
LDAPDnMemberActive=Members' synchronization LDAPDnMemberActive=Members' synchronization
LDAPDnMemberActiveExample=Activated/Unactivated synchronization LDAPDnMemberActiveExample=Activated/Unactivated synchronization
LDAPContactDn=Dolibarr contacts' DN LDAPContactDn=Dolibarr contacts' DN
LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=society,dc=com) LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
LDAPMemberDn=Dolibarr member's DN LDAPMemberDn=Dolibarr member's DN
LDAPMemberDnExample=Complete DN (ex: ou=members,dc=society,dc=com) LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
LDAPMemberObjectClassList=List of objectClass LDAPMemberObjectClassList=List of objectClass
LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
LDAPUserObjectClassList=List of objectClass LDAPUserObjectClassList=List of objectClass
@ -516,7 +516,7 @@ LDAPGroupObjectClassListExample=List of objectClass defining record attributes (
LDAPContactObjectClassList=List of objectClass LDAPContactObjectClassList=List of objectClass
LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
LDAPMemberTypeDn=Dolibarr member's type DN LDAPMemberTypeDn=Dolibarr member's type DN
LDAPMemberTypeDnExample=Complete DN (ex: ou=type_members,dc=society,dc=com) LDAPMemberTypeDnExample=Complete DN (ex: ou=type_members,dc=example,dc=com)
LDAPTestConnect=Test LDAP connection LDAPTestConnect=Test LDAP connection
LDAPTestSynchroContact=Test contact's synchronization LDAPTestSynchroContact=Test contact's synchronization
LDAPTestSynchroUser=Test user's synchronization LDAPTestSynchroUser=Test user's synchronization
@ -550,7 +550,7 @@ LDAPFieldCommonNameExample=Example : cn
LDAPFieldName=Name LDAPFieldName=Name
LDAPFieldNameExample=Example : sn LDAPFieldNameExample=Example : sn
LDAPFieldFirstName=First name LDAPFieldFirstName=First name
LDAPFieldFirstNameExample=Example : givenname LDAPFieldFirstNameExample=Example : givenName
LDAPFieldMail=Email address LDAPFieldMail=Email address
LDAPFieldMailExample=Example : mail LDAPFieldMailExample=Example : mail
LDAPFieldPhone=Professional phone number LDAPFieldPhone=Professional phone number

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

@ -1049,14 +1049,14 @@ LDAPServerUseTLS=Use TLS
LDAPServerUseTLSExample=Your LDAP server use TLS LDAPServerUseTLSExample=Your LDAP server use TLS
LDAPServerDn=Server DN LDAPServerDn=Server DN
LDAPAdminDn=Administrator DN LDAPAdminDn=Administrator DN
LDAPAdminDnExample=Complete DN (ex: cn=adminldap,dc=society,dc=com) LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
LDAPPassword=Administrator password LDAPPassword=Administrator password
LDAPUserDn=Users' DN LDAPUserDn=Users' DN
LDAPUserDnExample=Complete DN (ex: ou=users,dc=society,dc=com) LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
LDAPGroupDn=Groups' DN LDAPGroupDn=Groups' DN
LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=society,dc=com) LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/) LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
LDAPServerDnExample=Complete DN (ex: dc=company,dc=com) LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
LDAPPasswordExample=Admin password LDAPPasswordExample=Admin password
LDAPDnSynchroActive=Users and groups synchronization LDAPDnSynchroActive=Users and groups synchronization
LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
@ -1066,9 +1066,9 @@ LDAPDnContactActiveExample=Activated/Unactivated synchronization
LDAPDnMemberActive=Members' synchronization LDAPDnMemberActive=Members' synchronization
LDAPDnMemberActiveExample=Activated/Unactivated synchronization LDAPDnMemberActiveExample=Activated/Unactivated synchronization
LDAPContactDn=Dolibarr contacts' DN LDAPContactDn=Dolibarr contacts' DN
LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=society,dc=com) LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
LDAPMemberDn=Dolibarr members DN LDAPMemberDn=Dolibarr members DN
LDAPMemberDnExample=Complete DN (ex: ou=members,dc=society,dc=com) LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
LDAPMemberObjectClassList=List of objectClass LDAPMemberObjectClassList=List of objectClass
LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
LDAPUserObjectClassList=List of objectClass LDAPUserObjectClassList=List of objectClass
@ -1078,12 +1078,13 @@ LDAPGroupObjectClassListExample=List of objectClass defining record attributes (
LDAPContactObjectClassList=List of objectClass LDAPContactObjectClassList=List of objectClass
LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
LDAPMemberTypeDn=Dolibarr members type DN LDAPMemberTypeDn=Dolibarr members type DN
LDAPMemberTypeDnExample=Complete DN (ex: ou=type_members,dc=society,dc=com) LDAPMemberTypeDnExample=Complete DN (ex: ou=type_members,dc=example,dc=com)
LDAPTestConnect=Test LDAP connection LDAPTestConnect=Test LDAP connection
LDAPTestSynchroContact=Test contacts synchronization LDAPTestSynchroContact=Test contacts synchronization
LDAPTestSynchroUser=Test user synchronization LDAPTestSynchroUser=Test user synchronization
LDAPTestSynchroGroup=Test group synchronization LDAPTestSynchroGroup=Test group synchronization
LDAPTestSynchroMember=Test member synchronization LDAPTestSynchroMember=Test member synchronization
LDAPTestSearch= Test a LDAP search
LDAPSynchroOK=Synchronization test successful LDAPSynchroOK=Synchronization test successful
LDAPSynchroKO=Failed synchronization test LDAPSynchroKO=Failed synchronization test
LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
@ -1093,8 +1094,8 @@ LDAPBindOK=Connect/Authentificate to LDAP server sucessfull (Server=%s, Port=%s,
LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s) LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
LDAPUnbindSuccessfull=Disconnect successfull LDAPUnbindSuccessfull=Disconnect successfull
LDAPUnbindFailed=Disconnect failed LDAPUnbindFailed=Disconnect failed
LDAPConnectToDNSuccessfull=Connection au DN (%s) r�ussie LDAPConnectToDNSuccessfull=Connection to DN (%s) successful
LDAPConnectToDNFailed=Connection au DN (%s) �chou�e LDAPConnectToDNFailed=Connection to DN (%s) failed
LDAPSetupForVersion3=LDAP server configured for version 3 LDAPSetupForVersion3=LDAP server configured for version 3
LDAPSetupForVersion2=LDAP server configured for version 2 LDAPSetupForVersion2=LDAP server configured for version 2
LDAPDolibarrMapping=Dolibarr Mapping LDAPDolibarrMapping=Dolibarr Mapping
@ -1105,7 +1106,7 @@ LDAPFilterConnection=Search filter
LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson) LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
LDAPFieldLoginSamba=Login (samba, activedirectory) LDAPFieldLoginSamba=Login (samba, activedirectory)
LDAPFieldLoginSambaExample=Example : samaccountname LDAPFieldLoginSambaExample=Example : samaccountname
LDAPFieldFullname=First name LDAPFieldFullname=Full name
LDAPFieldFullnameExample=Example : cn LDAPFieldFullnameExample=Example : cn
LDAPFieldPassword=Password LDAPFieldPassword=Password
LDAPFieldPasswordNotCrypted=Password not crypted LDAPFieldPasswordNotCrypted=Password not crypted
@ -1116,7 +1117,7 @@ LDAPFieldCommonNameExample=Example : cn
LDAPFieldName=Name LDAPFieldName=Name
LDAPFieldNameExample=Example : sn LDAPFieldNameExample=Example : sn
LDAPFieldFirstName=First name LDAPFieldFirstName=First name
LDAPFieldFirstNameExample=Example : givenname LDAPFieldFirstNameExample=Example : givenName
LDAPFieldMail=Email address LDAPFieldMail=Email address
LDAPFieldMailExample=Example : mail LDAPFieldMailExample=Example : mail
LDAPFieldPhone=Professional phone number LDAPFieldPhone=Professional phone number

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

@ -1091,6 +1091,7 @@ LDAPTestSynchroContact= Tester synchronisation contacts
LDAPTestSynchroUser= Tester synchronisation utilisateur LDAPTestSynchroUser= Tester synchronisation utilisateur
LDAPTestSynchroGroup= Tester synchronisation groupe LDAPTestSynchroGroup= Tester synchronisation groupe
LDAPTestSynchroMember= Tester synchronisation adhérent LDAPTestSynchroMember= Tester synchronisation adhérent
LDAPTestSearch= Tester une recherche LDAP
LDAPSynchroOK= Test de synchronisation réalisé avec succès LDAPSynchroOK= Test de synchronisation réalisé avec succès
LDAPSynchroKO= Échec du test de synchronisation LDAPSynchroKO= Échec du test de synchronisation
LDAPSynchroKOMayBePermissions= Echec du test de synchronisation. Vérifier que la connexion au serveur est correctement configurée et permet les mises à jour LDAP LDAPSynchroKOMayBePermissions= Echec du test de synchronisation. Vérifier que la connexion au serveur est correctement configurée et permet les mises à jour LDAP
@ -1123,7 +1124,7 @@ LDAPFieldCommonNameExample= Exemple : cn
LDAPFieldName= Nom LDAPFieldName= Nom
LDAPFieldNameExample= Exemple : sn LDAPFieldNameExample= Exemple : sn
LDAPFieldFirstName= Prénom LDAPFieldFirstName= Prénom
LDAPFieldFirstNameExample= Exemple : givenname LDAPFieldFirstNameExample= Exemple : givenName
LDAPFieldMail= Email LDAPFieldMail= Email
LDAPFieldMailExample= Exemple : mail LDAPFieldMailExample= Exemple : mail
LDAPFieldPhone= Téléphone professionnel LDAPFieldPhone= Téléphone professionnel

16
htdocs/langs/nb_NO/admin.lang
View File

@ -732,14 +732,14 @@ LDAPServerUseTLS=Use TLS
LDAPServerUseTLSExample=Your LDAP server use TLS LDAPServerUseTLSExample=Your LDAP server use TLS
LDAPServerDn=Server DN LDAPServerDn=Server DN
LDAPAdminDn=Administrator DN LDAPAdminDn=Administrator DN
LDAPAdminDnExample=Complete DN (ex: cn=adminldap,dc=society,dc=com) LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
LDAPPassword=Administrator password LDAPPassword=Administrator password
LDAPUserDn=Users' DN LDAPUserDn=Users' DN
LDAPUserDnExample=Complete DN (ex: ou=users,dc=society,dc=com) LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
LDAPGroupDn=Groups' DN LDAPGroupDn=Groups' DN
LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=society,dc=com) LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/) LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
LDAPServerDnExample=Complete DN (ex: dc=company,dc=com) LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
LDAPPasswordExample=Admin password LDAPPasswordExample=Admin password
LDAPDnSynchroActive=Users and groups synchronization LDAPDnSynchroActive=Users and groups synchronization
LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
@ -749,9 +749,9 @@ LDAPDnContactActiveExample=Activated/Unactivated synchronization
LDAPDnMemberActive=Members' synchronization LDAPDnMemberActive=Members' synchronization
LDAPDnMemberActiveExample=Activated/Unactivated synchronization LDAPDnMemberActiveExample=Activated/Unactivated synchronization
LDAPContactDn=Dolibarr contacts' DN LDAPContactDn=Dolibarr contacts' DN
LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=society,dc=com) LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
LDAPMemberDn=Dolibarr members' DN LDAPMemberDn=Dolibarr members' DN
LDAPMemberDnExample=Complete DN (ex: ou=members,dc=society,dc=com) LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
LDAPMemberObjectClassList=List of objectClass LDAPMemberObjectClassList=List of objectClass
LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
LDAPUserObjectClassList=List of objectClass LDAPUserObjectClassList=List of objectClass
@ -761,7 +761,7 @@ LDAPGroupObjectClassListExample=List of objectClass defining record attributes (
LDAPContactObjectClassList=List of objectClass LDAPContactObjectClassList=List of objectClass
LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
LDAPMemberTypeDn=Dolibarr member's type DN LDAPMemberTypeDn=Dolibarr member's type DN
LDAPMemberTypeDnExample=Complete DN (ex: ou=type_members,dc=society,dc=com) LDAPMemberTypeDnExample=Complete DN (ex: ou=type_members,dc=example,dc=com)
LDAPTestConnect=Test LDAP connection LDAPTestConnect=Test LDAP connection
LDAPTestSynchroContact=Test contact's synchronization LDAPTestSynchroContact=Test contact's synchronization
LDAPTestSynchroUser=Test user's synchronization LDAPTestSynchroUser=Test user's synchronization
@ -799,7 +799,7 @@ LDAPFieldCommonNameExample=Example : cn
LDAPFieldName=Name LDAPFieldName=Name
LDAPFieldNameExample=Example : sn LDAPFieldNameExample=Example : sn
LDAPFieldFirstName=Firstname LDAPFieldFirstName=Firstname
LDAPFieldFirstNameExample=Example : givenname LDAPFieldFirstNameExample=Example : givenName
LDAPFieldMail=Email address LDAPFieldMail=Email address
LDAPFieldMailExample=Example : mail LDAPFieldMailExample=Example : mail
LDAPFieldPhone=Professional phone number LDAPFieldPhone=Professional phone number

2
htdocs/langs/sl_SI/admin.lang
View File

@ -1046,7 +1046,7 @@ LDAPFieldCommonNameExample = Example : cn
LDAPFieldName = Name LDAPFieldName = Name
LDAPFieldNameExample = Example : sn LDAPFieldNameExample = Example : sn
LDAPFieldFirstName = First name LDAPFieldFirstName = First name
LDAPFieldFirstNameExample = Example : givenname LDAPFieldFirstNameExample = Example : givenName
LDAPFieldMail = Email address LDAPFieldMail = Email address
LDAPFieldMailExample = Example : mail LDAPFieldMailExample = Example : mail
LDAPFieldPhone = Professional phone number LDAPFieldPhone = Professional phone number

3
htdocs/user/class/user.class.php
View File

@ -87,9 +87,6 @@ class User extends CommonObject
var $photo; var $photo;
var $lang; var $lang;
//! Liste des entrepots auquel a acces l'utilisateur
var $entrepots;
var $rights; // Array of permissions user->rights->permx var $rights; // Array of permissions user->rights->permx
var $all_permissions_are_loaded; /**< \private all_permissions_are_loaded */ var $all_permissions_are_loaded; /**< \private all_permissions_are_loaded */
private $_tab_loaded=array(); // Array of cache of already loaded permissions private $_tab_loaded=array(); // Array of cache of already loaded permissions

42
htdocs/user/fiche.php
View File

@ -350,7 +350,7 @@ if ($action == 'update' && ! $_POST["cancel"])
$message.='<div class="error">'.$langs->trans("ErrorLoginAlreadyExists",$edituser->login).'</div>'; $message.='<div class="error">'.$langs->trans("ErrorLoginAlreadyExists",$edituser->login).'</div>';
} }
else else
{ {
$message.='<div class="error">'.$edituser->error.'</div>'; $message.='<div class="error">'.$edituser->error.'</div>';
} }
} }
@ -462,6 +462,7 @@ if ($action == 'adduserldap')
$selecteduser = $_POST['users']; $selecteduser = $_POST['users'];
$required_fields = array( $required_fields = array(
$conf->global->LDAP_KEY_USERS,
$conf->global->LDAP_FIELD_NAME, $conf->global->LDAP_FIELD_NAME,
$conf->global->LDAP_FIELD_FIRSTNAME, $conf->global->LDAP_FIELD_FIRSTNAME,
$conf->global->LDAP_FIELD_LOGIN, $conf->global->LDAP_FIELD_LOGIN,
@ -532,7 +533,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
print "<br>"; print "<br>";
print "<br>"; print "<br>";
dol_htmloutput_errors($message); dol_htmloutput_mesg($message);
if (! empty($conf->ldap->enabled) && (isset($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')) if (! empty($conf->ldap->enabled) && (isset($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr'))
{ {
@ -557,6 +558,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
// Get from LDAP database an array of results // Get from LDAP database an array of results
$ldapusers = $ldap->getRecords('*', $conf->global->LDAP_USER_DN, $conf->global->LDAP_KEY_USERS, $required_fields, 1); $ldapusers = $ldap->getRecords('*', $conf->global->LDAP_USER_DN, $conf->global->LDAP_KEY_USERS, $required_fields, 1);
if (is_array($ldapusers)) if (is_array($ldapusers))
{ {
$liste=array(); $liste=array();
@ -586,27 +588,27 @@ if (($action == 'create') || ($action == 'adduserldap'))
} }
// Si la liste des users est rempli, on affiche la liste deroulante // Si la liste des users est rempli, on affiche la liste deroulante
if (is_array($liste)) print "\n\n<!-- Form liste LDAP debut -->\n";
print '<form name="add_user_ldap" action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table width="100%" class="border"><tr>';
print '<td width="160">';
print $langs->trans("LDAPUsers");
print '</td>';
print '<td>';
print '<input type="hidden" name="action" value="adduserldap">';
if (is_array($liste) && count($liste))
{ {
print "\n\n<!-- Form liste LDAP debut -->\n";
print '<form name="add_user_ldap" action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table width="100%" class="border"><tr>';
print '<td width="160">';
print $langs->trans("LDAPUsers");
print '</td>';
print '<td>';
print '<input type="hidden" name="action" value="adduserldap">';
print $form->selectarray('users', $liste, '', 1); print $form->selectarray('users', $liste, '', 1);
print '</td><td align="center">';
print '<input type="submit" class="button" value="'.$langs->trans('Get').'">';
print '</td></tr></table>';
print '</form>';
print "\n<!-- Form liste LDAP fin -->\n\n";
print '<br>';
} }
print '</td><td align="center">';
print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Get')).'"'.(count($liste)?'':' disabled="disabled"').'>';
print '</td></tr></table>';
print '</form>';
print "\n<!-- Form liste LDAP fin -->\n\n";
print '<br>';
} }
print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST" name="createuser">'; print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST" name="createuser">';

1
htdocs/webservices/server_user.php
View File

@ -220,7 +220,6 @@ function getUser($authentication,$id,$ref='',$ref_ext='')
'statut' => $user->statut, 'statut' => $user->statut,
'photo' => $user->photo, 'photo' => $user->photo,
'lang' => $user->lang, 'lang' => $user->lang,
'entrepots' => $user->entrepots,
//'rights' => $user->rights, //'rights' => $user->rights,
'canvas' => $user->canvas 'canvas' => $user->canvas
) )