vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Laurent Destailleur 2023-08-27 15:45:45 +02:00
commit 9bd119c8fd
2 changed files with 80 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
htdocs/core/class/ldap.class.php
View file

@ -53,6 +53,11 @@ class Ldap
*/
public $connectedServer;
/**
* @var int server port
*/
public $serverPort;
/**
* Base DN (e.g. "dc=foo,dc=com")
*/
@ -72,6 +77,11 @@ class Ldap
public $domainFQDN;
/**
* @var int bind
*/
public $bind;
/**
* User administrateur Ldap
* Active Directory ne supporte pas les connexions anonymes
@ -99,6 +109,68 @@ class Ldap
*/
public $ldapErrorText;
/**
* @var string
*/
public $filter;
/**
* @var string
*/
public $filtergroup;
/**
* @var string
*/
public $filtermember;
/**
* @var string attr_login
*/
public $attr_login;
/**
* @var string attr_sambalogin
*/
public $attr_sambalogin;
/**
* @var string attr_name
*/
public $attr_name;
/**
* @var string attr_firstname
*/
public $attr_firstname;
/**
* @var string attr_mail
*/
public $attr_mail;
/**
* @var string attr_phone
*/
public $attr_phone;
/**
* @var string attr_fax
*/
public $attr_fax;
/**
* @var string attr_mobile
*/
public $attr_mobile;
/**
* @var int badpwdtime
*/
public $badpwdtime;
/**
* @var string ladpUserDN
*/
public $ldapUserDN;
//Fetch user
public $name;
@ -1387,13 +1459,13 @@ class Ldap
public function parseSAT($samtype)
{
$stypes = array(
805306368 => "NORMAL_ACCOUNT",
805306369 => "WORKSTATION_TRUST",
805306370 => "INTERDOMAIN_TRUST",
268435456 => "SECURITY_GLOBAL_GROUP",
268435457 => "DISTRIBUTION_GROUP",
536870912 => "SECURITY_LOCAL_GROUP",
536870913 => "DISTRIBUTION_LOCAL_GROUP"
805306368 => "NORMAL_ACCOUNT",
805306369 => "WORKSTATION_TRUST",
805306370 => "INTERDOMAIN_TRUST",
268435456 => "SECURITY_GLOBAL_GROUP",
268435457 => "DISTRIBUTION_GROUP",
536870912 => "SECURITY_LOCAL_GROUP",
536870913 => "DISTRIBUTION_LOCAL_GROUP"
);
$retval = "";

2
htdocs/install/mysql/data/llx_c_forme_juridique.sql
View file

@ -167,7 +167,7 @@ insert into llx_c_forme_juridique (fk_pays, code, libelle) values (5, '506', 'KG
insert into llx_c_forme_juridique (fk_pays, code, libelle) values (5, '507', 'Ltd. - Limited Company');
insert into llx_c_forme_juridique (fk_pays, code, libelle) values (5, '508', 'OHG - Offene Handelsgesellschaft');
insert into llx_c_forme_juridique (fk_pays, code, libelle) values (5, '509', 'eG - eingetragene Genossenschaft');
insert into llx_c_forme_juridique (fk_pays, code, libelle) values (5, '510', 'e.V. - eingetragener Verein');
-- Denmark
INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (80, '8001', 'Aktieselvskab A/S');