From 1b82b6af4d35b528d2ab6fa2f4d43884b5162120 Mon Sep 17 00:00:00 2001
From: Alfredo Altamirano <Ahuahuachi@users.noreply.github.com>
Date: Sun, 25 Oct 2020 22:16:42 -0600
Subject: [PATCH 1/6] FIX #15111 Fix special characters output in PDF

---
 htdocs/core/modules/livraison/doc/pdf_typhon.modules.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
index 51fd70c9fa1..02ed2369acd 100644
--- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
@@ -660,11 +660,11 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		$larg_sign = ($this->page_largeur-$this->marge_gauche-$this->marge_droite)/3;
 		$pdf->Rect($this->marge_gauche, $posy + 1, $larg_sign, 25);
 		$pdf->SetXY($this->marge_gauche + 2, $posy + 2);
-		$pdf->MultiCell($larg_sign, 2, $outputlangs->trans("For").' '.$outputlangs->convToOutputCharset($mysoc->name).":", '', 'L');
+		$pdf->MultiCell($larg_sign, 2, $outputlangs->transnoentities("For") . ' ' . $outputlangs->convToOutputCharset($mysoc->name) . ":", '', 'L');
 
 		$pdf->Rect(2*$larg_sign+$this->marge_gauche, $posy + 1, $larg_sign, 25);
 		$pdf->SetXY(2*$larg_sign+$this->marge_gauche + 2, $posy + 2);
-		$pdf->MultiCell($larg_sign, 2, $outputlangs->trans("ForCustomer").':', '', 'L');
+		$pdf->MultiCell($larg_sign, 2, $outputlangs->transnoentities("ForCustomer") . ':', '', 'L');
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

From 5694a19c6a315aa1373b8a61d257e93744d8ec79 Mon Sep 17 00:00:00 2001
From: quentin <quentin.vial-gouteyron@atm-consulting.fr>
Date: Mon, 26 Oct 2020 14:51:13 +0100
Subject: [PATCH 2/6] FIX table making extrafield input too small
 advtargetmailing

---
 htdocs/core/tpl/advtarget.tpl.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php
index b6c9033cad4..893832b32ac 100644
--- a/htdocs/core/tpl/advtarget.tpl.php
+++ b/htdocs/core/tpl/advtarget.tpl.php
@@ -75,7 +75,7 @@ print '<script type="text/javascript" language="javascript">
 		print '<input type="button" name="savefilter" id="savefilter" value="' . $langs->trans('AdvTgtSaveFilter') . '" class="butAction"/>';
 		print '</td><td>' . "\n";
 		print '</td></tr>' . "\n";
-		
+
 		print '<tr><td>' . $langs->trans('AdvTgtOrCreateNewFilter') . '</td><td>';
 		print '<input type="text" name="template_name" id="template_name" value=""/>';
 		print '<input type="button" name="createfilter" id="createfilter" value="' . $langs->trans('AdvTgtCreateFilter') . '" class="butAction"/>';
@@ -512,16 +512,11 @@ print '<script type="text/javascript" language="javascript">
 					print $formadvtargetemaling->advMultiselectarraySelllist('options_' . $key . '_cnct', $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key . '_cnct']);
 					print '</td><td>' . "\n";
 				} else {
-
-					print '<table class="nobordernopadding"><tr>';
-					print '<td></td><td>';
 					if (is_array($array_query['options_' . $key . '_cnct'])) {
 						print $extrafields->showInputField($key, implode(',', $array_query['options_' . $key . '_cnct']), '', '_cnct');
 					} else {
 						print $extrafields->showInputField($key, $array_query['options_' . $key . '_cnct'], '', '_cnct');
 					}
-					print '</td></tr></table>';
-
 					print '</td><td>' . "\n";
 				}
 				print '</td></tr>' . "\n";

From fd1f5bbe0140cd4dbfd5d861d247b2e214503392 Mon Sep 17 00:00:00 2001
From: quentin <quentin.vial-gouteyron@atm-consulting.fr>
Date: Mon, 26 Oct 2020 15:03:32 +0100
Subject: [PATCH 3/6] FIX table making extrafield too small advtagertmailing

---
 htdocs/core/tpl/advtarget.tpl.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php
index 893832b32ac..4a6b69971de 100644
--- a/htdocs/core/tpl/advtarget.tpl.php
+++ b/htdocs/core/tpl/advtarget.tpl.php
@@ -312,14 +312,11 @@ print '<script type="text/javascript" language="javascript">
 						print $formadvtargetemaling->advMultiselectarraySelllist('options_' . $key, $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key]);
 						print '</td><td>' . "\n";
 					} else {
-						print '<table class="nobordernopadding"><tr>';
-						print '<td></td><td>';
 						if (is_array($array_query['options_' . $key])) {
 							print $extrafields->showInputField($key, implode(',', $array_query['options_' . $key]));
 						} else {
 							print $extrafields->showInputField($key, $array_query['options_' . $key]);
 						}
-						print '</td></tr></table>';
 
 						print '</td><td>' . "\n";
 					}

From a4af2e94a9f550110997e86f37c582d5220d9e0f Mon Sep 17 00:00:00 2001
From: Florian Mortgat <florian.mortgat@atm-consulting.fr>
Date: Wed, 28 Oct 2020 17:08:09 +0100
Subject: [PATCH 4/6] FIX 10.0 - make formConfirm an addreplace-type hook

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

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index f1abc148291..8c29ebad1bb 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -160,6 +160,7 @@ class HookManager
 				'doActions',
 				'doMassActions',
 				'formatEvent',
+				'formConfirm',
 				'formCreateThirdpartyOptions',
 				'formObjectOptions',
 				'formattachOptions',

From 20c00d0c434bdc6e19a322f593e1c9d43edbe60e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 28 Oct 2020 17:54:45 +0100
Subject: [PATCH 5/6] Update timeline.inc.php

---
 htdocs/theme/eldy/timeline.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/theme/eldy/timeline.inc.php b/htdocs/theme/eldy/timeline.inc.php
index 21e683e42f0..f767bed594f 100644
--- a/htdocs/theme/eldy/timeline.inc.php
+++ b/htdocs/theme/eldy/timeline.inc.php
@@ -112,7 +112,7 @@ a.timeline-btn:hover
 {
     background-color: #e7e7e7;
     color: #333;
-    border-color: #adadad;;
+    border-color: #adadad;
 }
 
 

From f22017080d46bd284d2513db5dd71ac43bc5abf6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Oct 2020 03:25:33 +0100
Subject: [PATCH 6/6] Fix for php8

---
 htdocs/core/ajax/check_notifications.php |  2 +-
 htdocs/core/lib/security2.lib.php        | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index 346b17e3288..77245c22494 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -75,7 +75,7 @@ if ($time >= $_SESSION['auto_check_events_not_before'])
     require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
 
-    dol_syslog('NEW $_SESSION[auto_check_events_not_before]='.$_SESSION['auto_check_events_not_before']);
+    dol_syslog('NEW $_SESSION[auto_check_events_not_before]='.(empty($_SESSION['auto_check_events_not_before']) ? '' : $_SESSION['auto_check_events_not_before']));
 
     $sql = 'SELECT id';
     $sql .= ' FROM ' . MAIN_DB_PREFIX . 'actioncomm a, ' . MAIN_DB_PREFIX . 'actioncomm_resources ar';
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 18d1e9c680a..aa53a5b71d7 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -467,15 +467,18 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 		{
 			$max = strlen($lowercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $lowercase{random_int(0, $max)};
+				$tmp = random_int(0, $max);
+				$randomCode .= $lowercase[$tmp];
 			}
 			$max = strlen($uppercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $uppercase{random_int(0, $max)};
+				$tmp = random_int(0, $max);
+				$randomCode .= $uppercase[$tmp];
 			}
 			$max = strlen($numbers) - 1;
 			for ($x = 0; $x < $nbofcharlast; $x++) {
-				$randomCode .= $numbers{random_int(0, $max)};
+				$tmp = random_int(0, $max);
+				$randomCode .= $numbers[$tmp];
 			}
 
 			$generated_password=str_shuffle($randomCode);
@@ -484,15 +487,18 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 		{
 			$max = strlen($lowercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $lowercase{mt_rand(0, $max)};
+				$tmp = mt_rand(0, $max);
+				$randomCode .= $lowercase[$tmp];
 			}
 			$max = strlen($uppercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $uppercase{mt_rand(0, $max)};
+				$tmp = mt_rand(0, $max);
+				$randomCode .= $uppercase[$tmp];
 			}
 			$max = strlen($numbers) - 1;
 			for ($x = 0; $x < $nbofcharlast; $x++) {
-				$randomCode .= $numbers{mt_rand(0, $max)};
+				$tmp = mt_rand(0, $max);
+				$randomCode .= $numbers[$tmp];
 			}
 
 			$generated_password=str_shuffle($randomCode);
@@ -516,11 +522,13 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 		$max = strlen($numbers) - 1;
 		if (function_exists('random_int'))	// Cryptographic random
 		{
-			$generated_password=str_replace($replaceambiguouschars, $numbers{random_int(0, $max)}, $generated_password);
+			$tmp = random_int(0, $max);
+			$generated_password=str_replace($replaceambiguouschars, $numbers[$tmp], $generated_password);
 		}
 		else
 		{
-			$generated_password=str_replace($replaceambiguouschars, $numbers{mt_rand(0, $max)}, $generated_password);
+			$tmp = random_int(0, $max);
+			$generated_password=str_replace($replaceambiguouschars, $numbers[$tmp], $generated_password);
 		}
 	}