From 8e4cf5a1adcc5a5a5d3a808371ca5a68622f7c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg?= <js@freie-experten.de>
Date: Sun, 27 Aug 2023 13:45:53 +0200
Subject: [PATCH 1/2] Update llx_c_forme_juridique.sql

add german association verein
---
 htdocs/install/mysql/data/llx_c_forme_juridique.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
index 353d8053dc9..78f37920d3b 100644
--- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql
+++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
@@ -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');

From cbdd080aa3229d38733808b1852ef3fafb0cd254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 27 Aug 2023 15:02:43 +0200
Subject: [PATCH 2/2] phpstan

---
 htdocs/core/class/ldap.class.php | 86 +++++++++++++++++++++++++++++---
 1 file changed, 79 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 343892769a9..deee8874f29 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -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 = "";