From 9b6e0bab0004070575e4c653df295581cc51afad Mon Sep 17 00:00:00 2001
From: "yann.droniou" <yann.droniou@photospace.fr>
Date: Tue, 21 Feb 2023 14:26:29 +0100
Subject: [PATCH 1/3] Fix LDAP Authentification failure with error 500

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

diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index b2b5e2c6e93..38220f7a17b 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -344,12 +344,7 @@ class Ldap
 	 */
 	public function close()
 	{
-		$r_type = get_resource_type($this->connection);
-		if ($this->connection && ($r_type === "Unknown" || !@ldap_close($this->connection))) {
-			return false;
-		} else {
-			return true;
-		}
+		return $this->unbind();
 	}
 
 	/**
@@ -401,7 +396,7 @@ class Ldap
 	public function unbind()
 	{
 		$this->result = true;
-		if ($this->connection) {
+		if (is_resource($this->connection)) {
 			$this->result = @ldap_unbind($this->connection);
 		}
 		if ($this->result) {

From 67d9934aa1e63dff6a21dcf0054cd10fc664ae28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Fri, 24 Feb 2023 10:54:23 +0100
Subject: [PATCH 2/3] pagination works with any font

---
 htdocs/core/lib/pdf.lib.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index e4f6b169e93..d6b8365c730 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -13,6 +13,7 @@
  * Copyright (C) 2019       Lenin Rivas           	<lenin.rivas@servcom-it.com>
  * Copyright (C) 2020       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2021-2022	Anthony Berton       	<anthony.berton@bb2a.fr>
+ * Copyright (C) 2023       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1287,11 +1288,14 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 		}
 	}
 	// Show page nb only on iso languages (so default Helvetica font)
-	if (strtolower(pdf_getPDFFont($outputlangs)) == 'helvetica') {
+	// if (strtolower(pdf_getPDFFont($outputlangs)) == 'helvetica') {
 		$pdf->SetXY($dims['wk'] - $dims['rm'] - 18, -$posy);
-		//$pdf->MultiCell(18, 2, $pdf->getPageNumGroupAlias().' / '.$pdf->getPageGroupAlias(), 0, 'R', 0);
-		$pdf->MultiCell(18, 2, $pdf->PageNo().' / '.$pdf->getAliasNbPages(), 0, 'R', 0);
-	}
+		// $pdf->MultiCell(18, 2, $pdf->getPageNumGroupAlias().' / '.$pdf->getPageGroupAlias(), 0, 'R', 0);
+		// $pdf->MultiCell(18, 2, $pdf->PageNo().' / '.$pdf->getAliasNbPages(), 0, 'R', 0); // doesn't works with all fonts
+		// $pagination = $pdf->getAliasNumPage().' / '.$pdf->getAliasNbPages(); // works with $pdf->Cell
+		$pagination = $pdf->PageNo().' / '.$pdf->getNumPages();
+		$pdf->MultiCell(18, 2, $pagination, 0, 'R', 0);
+	// }
 
 	//  Show Draft Watermark
 	if (!empty($watermark)) {

From 1b64068fc8ea36b8ab0fc7784ced61a7c491b656 Mon Sep 17 00:00:00 2001
From: "yann.droniou" <yann.droniou@photospace.fr>
Date: Thu, 2 Mar 2023 16:20:32 +0100
Subject: [PATCH 3/3] Fix PR for ldap is_ressource or is_object in unbind()

---
 htdocs/core/class/ldap.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 38220f7a17b..1d6e51c633d 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -396,7 +396,7 @@ class Ldap
 	public function unbind()
 	{
 		$this->result = true;
-		if (is_resource($this->connection)) {
+		if (is_resource($this->connection) || is_object($this->connection)) {
 			$this->result = @ldap_unbind($this->connection);
 		}
 		if ($this->result) {