From b0b02794ee5df988347faed59e2bc3ebfdcdb89a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 11 Jan 2025 11:55:12 +0100
Subject: [PATCH 01/13] fix phpstan and phan

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

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 6a0e5de24da..b5ed5542749 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -245,7 +245,7 @@ function dolDecrypt($chain, $key = '')
  * 										Use 'md5' if hash is not needed for security purpose. For security need, prefer 'auto'.
  * 	@param 		int 		$nosalt		Do not include any salt
  *  @param		int			$mode		0=Return encoded password, 1=Return array with encoding password + encoding algorithm
- * 	@return		string|array<pass_encrypted:string,pass_encoding:string>			Hash of string or array with pass_encrypted and pass_encoding
+ * 	@return		string|array{pass_encrypted:string,pass_encoding:string}	Hash of string or array with pass_encrypted and pass_encoding
  *  @see getRandomPassword(), dol_verifyHash()
  */
 function dol_hash($chain, $type = '0', $nosalt = 0, $mode = 0)

From be6869f388c1ea7029a2df6b180b6ce953a89725 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 13 Jan 2025 01:05:34 +0100
Subject: [PATCH 02/13] Fix date selector html

---
 htdocs/core/class/html.form.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index d148f8fd784..7a7ebef6936 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7287,7 +7287,7 @@ class Form
 		// You can set MAIN_POPUP_CALENDAR to 'eldy' or 'jquery'
 		$usecalendar = 'combo';
 		if (!empty($conf->use_javascript_ajax) && (!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') != "none")) {
-			$usecalendar = ((!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') == 'eldy') ? 'jquery' : $conf->global->MAIN_POPUP_CALENDAR);
+			$usecalendar = ((!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') == 'eldy') ? 'jquery' : getDolGlobalString("MAIN_POPUP_CALENDAR"));
 		}
 		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			// If we use a text browser or screen reader, we use the 'combo' date selector
@@ -7317,7 +7317,7 @@ class Form
 					if (!$disabled) {
 						$retstringbuttom = '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons"';
 						$base = DOL_URL_ROOT . '/core/';
-						$retstringbuttom .= ' onClick="showDP(\'' . $base . '\',\'' . $prefix . '\',\'' . $langs->trans("FormatDateShortJavaInput") . '\',\'' . $langs->defaultlang . '\');"';
+						$retstringbuttom .= ' onClick="showDP(\'' . dol_escape_js($base) . '\',\'' . dol_escape_js($prefix) . '\',\'' . dol_escape_js($langs->trans("FormatDateShortJavaInput")) . '\',\'' . dol_escape_js($langs->defaultlang) . '\');"';
 						$retstringbuttom .= '>' . img_object($langs->trans("SelectDate"), 'calendarday', 'class="datecallink"') . '</button>';
 					} else {
 						$retstringbuttom = '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons">' . img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"') . '</button>';
@@ -7364,7 +7364,7 @@ class Form
 
 					// Input area to enter date manually
 					$retstring .= '<div class="nowraponall inline-block divfordateinput">';
-					$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidthdate center" maxlength="11" value="'.$formated_date.'"';
+					$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="'.($usecalendar == 'html' ? "date" : "text").'" class="maxwidthdate center" maxlength="11" value="'.$formated_date.'"';
 					$retstring .= ($disabled ? ' disabled' : '');
 					$retstring .= ($placeholder ? ' placeholder="' . dol_escape_htmltag($placeholder) . '"' : '');
 					$retstring .= ' onChange="dpChangeDay(\'' . dol_escape_js($prefix) . '\',\'' . dol_escape_js($langs->trans("FormatDateShortJavaInput")) . '\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript

From 0a80d437dec235b3796a2d51014846e0237dcef3 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 13 Jan 2025 12:31:08 +0100
Subject: [PATCH 03/13] Doc

---
 htdocs/theme/eldy/badges.inc.php             | 3 +++
 htdocs/theme/eldy/btn.inc.php                | 3 ++-
 htdocs/theme/eldy/dropdown.inc.php           | 4 +++-
 htdocs/theme/eldy/emaillayout.inc.php        | 2 ++
 htdocs/theme/eldy/flags-sprite.inc.php       | 2 +-
 htdocs/theme/eldy/global.inc.php             | 2 +-
 htdocs/theme/eldy/info-box.inc.php           | 2 +-
 htdocs/theme/eldy/main_menu_fa_icons.inc.php | 2 +-
 htdocs/theme/eldy/manifest.json.php          | 1 +
 htdocs/theme/eldy/progress.inc.php           | 5 +++--
 htdocs/theme/eldy/timeline.inc.php           | 3 ++-
 htdocs/theme/md/badges.inc.php               | 4 +++-
 htdocs/theme/md/btn.inc.php                  | 3 ++-
 htdocs/theme/md/dropdown.inc.php             | 4 +++-
 htdocs/theme/md/flags-sprite.inc.php         | 3 ++-
 htdocs/theme/md/info-box.inc.php             | 3 ++-
 htdocs/theme/md/main_menu_fa_icons.inc.php   | 3 ++-
 htdocs/theme/md/progress.inc.php             | 3 ---
 htdocs/theme/md/style.css.php                | 3 ++-
 19 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/htdocs/theme/eldy/badges.inc.php b/htdocs/theme/eldy/badges.inc.php
index afd7e020886..01a3f1d4824 100644
--- a/htdocs/theme/eldy/badges.inc.php
+++ b/htdocs/theme/eldy/badges.inc.php
@@ -28,6 +28,9 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 @phan-var-force string $colorblind_deuteranopes_badgeWarning
 ';
 ?>
+
+/* IDE Hack <style type="text/css"> */
+
 /* Badge style is based on bootstrap framework */
 
 .badge {
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index 956ddd43e82..60c7cf2d04d 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -16,7 +16,8 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
  * @var string $left
  */
 ?>
-/* <style type="text/css" > */
+
+/* IDE Hack <style type="text/css"> */
 
 :root {
 			--btncolortext: rgb(<?php print $colortextlink; ?>);
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index 976b48977b5..23ea6c34f74 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -4,7 +4,9 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 }
 include_once DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php";
 ?>
-/* <style type="text/css" > don't remove this line it's an ide hack */
+
+/* IDE Hack <style type="text/css"> */
+
 /*
  * Dropdown of user popup
  */
diff --git a/htdocs/theme/eldy/emaillayout.inc.php b/htdocs/theme/eldy/emaillayout.inc.php
index 4d3ef94e84e..486efe15acc 100644
--- a/htdocs/theme/eldy/emaillayout.inc.php
+++ b/htdocs/theme/eldy/emaillayout.inc.php
@@ -3,6 +3,8 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 	die('Must be call by steelsheet');
 }
 ?>
+/* IDE Hack <style type="text/css"> */
+
 .template-container {
 	display: flex;
 	justify-content: space-between;
diff --git a/htdocs/theme/eldy/flags-sprite.inc.php b/htdocs/theme/eldy/flags-sprite.inc.php
index 83396574ee4..6eac21c83ee 100644
--- a/htdocs/theme/eldy/flags-sprite.inc.php
+++ b/htdocs/theme/eldy/flags-sprite.inc.php
@@ -28,7 +28,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
  * @var string $path
  */
 ?>
-/* <style type="text/css" > */ /* don't remove this line it's an ide hack */
+/* IDE Hack <style type="text/css"> */
 
 .flag-sprite {
 	background:url(<?php echo dol_buildpath($path.'/theme/common/flags/flag-sprite.png', 1) ?>) no-repeat top left; display:inline-block;
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index c1f309ad643..92b1b7df0e0 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -153,7 +153,7 @@ $leftmenuwidth = 240;
 $borderradius = getDolGlobalString('THEME_ELDY_USEBORDERONTABLE') ? getDolGlobalInt('THEME_ELDY_BORDER_RADIUS', 6) : 0;
 
 ?>
-/* <style type="text/css" > */
+/* IDE Hack <style type="text/css"> */
 
 /* ============================================================================== */
 /* Default styles                                                                 */
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 14b631fe9e3..44f1ff7ddd8 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -14,7 +14,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 @phan-var-force string $left
 ';
 ?>
-/* <style type="text/css" > */
+/* IDE Hack <style type="text/css"> */
 
 /*
  * Component: Info Box
diff --git a/htdocs/theme/eldy/main_menu_fa_icons.inc.php b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
index 4e03ea60ce3..6c2a509b648 100644
--- a/htdocs/theme/eldy/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
@@ -25,7 +25,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 	die('Must be call by stylesheet');
 }
 ?>
-/* <style type="text/css" > */
+/* IDE Hack <style type="text/css"> */
 
 .mainmenu::before{
 	/* font part */
diff --git a/htdocs/theme/eldy/manifest.json.php b/htdocs/theme/eldy/manifest.json.php
index 9ebbc88aa4f..1b01f5c6991 100644
--- a/htdocs/theme/eldy/manifest.json.php
+++ b/htdocs/theme/eldy/manifest.json.php
@@ -55,6 +55,7 @@ if (!defined('NOSESSION')) {
 }
 
 require_once __DIR__.'/../../main.inc.php';
+
 /**
  * @var Conf $conf
  */
diff --git a/htdocs/theme/eldy/progress.inc.php b/htdocs/theme/eldy/progress.inc.php
index 03cee9e6a94..ce8fc4f6362 100644
--- a/htdocs/theme/eldy/progress.inc.php
+++ b/htdocs/theme/eldy/progress.inc.php
@@ -2,7 +2,9 @@
 if (!defined('ISLOADEDBYSTEELSHEET')) {
 	die('Must be call by steelsheet');
 } ?>
-/* <style type="text/css" > */
+
+/* IDE Hack <style type="text/css"> */
+
 /*
  progress style is based on bootstrap and admin lte framework
  */
@@ -198,4 +200,3 @@ body[class*="colorblind-"] .progress-bar-red, body[class*="colorblind-"] .progre
 .progress-bar-consumed-late {
 	background-color: <?php echo colorAgressiveness($badgeDanger, -95, +70) ?>;
 }
-
diff --git a/htdocs/theme/eldy/timeline.inc.php b/htdocs/theme/eldy/timeline.inc.php
index cee089a246f..abd5b4dda3d 100644
--- a/htdocs/theme/eldy/timeline.inc.php
+++ b/htdocs/theme/eldy/timeline.inc.php
@@ -11,7 +11,8 @@
 if (!defined('ISLOADEDBYSTEELSHEET')) {
 	die('Must be call by steelsheet');
 } ?>
-/* <style type="text/css" > */
+
+/* IDE Hack <style type="text/css"> */
 
 
 /*
diff --git a/htdocs/theme/md/badges.inc.php b/htdocs/theme/md/badges.inc.php
index 616cc26cf96..c69673d5d97 100644
--- a/htdocs/theme/md/badges.inc.php
+++ b/htdocs/theme/md/badges.inc.php
@@ -18,7 +18,9 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 @phan-var-force string $colorblind_deuteranopes_badgeWarning
 ';
 ?>
-/* <style type="text/css" > */
+
+/* IDE Hack <style type="text/css"> */
+
 /*
  Badge style is based on bootstrap framework
  */
diff --git a/htdocs/theme/md/btn.inc.php b/htdocs/theme/md/btn.inc.php
index e85281e1e96..0177bb20f2f 100644
--- a/htdocs/theme/md/btn.inc.php
+++ b/htdocs/theme/md/btn.inc.php
@@ -13,7 +13,8 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
  * @var string $textbutaction
  */
 ?>
-/* <style type="text/css" > */
+
+/* IDE Hack <style type="text/css"> */
 
 :root {
 			--btncolortext:rgb(<?php print $colortextlink; ?>);
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index 1b14f471c65..dfb51191ae4 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -7,7 +7,9 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 $atoploginusername = empty($user->photo) ? 52 : 0;
 
 ?>
-/* <style type="text/css" > don't remove this line it's an ide hack */
+
+/* IDE Hack <style type="text/css"> */
+
 /*
  * Dropdown of user popup
  */
diff --git a/htdocs/theme/md/flags-sprite.inc.php b/htdocs/theme/md/flags-sprite.inc.php
index dbc1328a902..2a0bf194c3a 100644
--- a/htdocs/theme/md/flags-sprite.inc.php
+++ b/htdocs/theme/md/flags-sprite.inc.php
@@ -2,7 +2,8 @@
 if (!defined('ISLOADEDBYSTEELSHEET')) {
 	die('Must be call by steelsheet');
 } ?>
-/* <style type="text/css" > don't remove this line it's an ide hack */
+
+/* IDE Hack <style type="text/css"> */
 
 .flag-sprite {
 	background:url(<?php echo dol_buildpath($path.'/theme/common/flags/flag-sprite.png', 1) ?>) no-repeat top left; display:inline-block;
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index 2e9a50e7406..f2afc753cf4 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -16,7 +16,8 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 @phan-var-force string $left
 ';
 ?>
-/* <style type="text/css" > */
+
+/* IDE Hack <style type="text/css"> */
 
 
 /*
diff --git a/htdocs/theme/md/main_menu_fa_icons.inc.php b/htdocs/theme/md/main_menu_fa_icons.inc.php
index a08b85c27c1..3168d1766e9 100644
--- a/htdocs/theme/md/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/md/main_menu_fa_icons.inc.php
@@ -1,7 +1,8 @@
 <?php if (!defined('ISLOADEDBYSTEELSHEET')) {
 	die('Must be call by steelsheet');
 } ?>
-/* <style type="text/css" > */
+
+/* IDE Hack <style type="text/css"> */
 
 .mainmenu::before{
 	/* font part */
diff --git a/htdocs/theme/md/progress.inc.php b/htdocs/theme/md/progress.inc.php
index 979f8b8034e..9f6a436c016 100644
--- a/htdocs/theme/md/progress.inc.php
+++ b/htdocs/theme/md/progress.inc.php
@@ -4,6 +4,3 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 }
 
 include dol_buildpath($path.'/theme/eldy/progress.inc.php', 0); // actually md use same style as eldy theme
-
-?>
-/* <style type="text/css" > */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 2a76da44afa..73c8d8f4e2b 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -396,7 +396,8 @@ print '*/'."\n";
 $leftmenuwidth = 242;
 
 ?>
-/* <style type="text/css" > */
+
+/* IDE Hack <style type="text/css"> */
 
 
 /* ============================================================================== */

From b05478b2738f2971fdc47d20417cb160cfebb51b Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 13 Jan 2025 12:59:37 +0100
Subject: [PATCH 04/13] Debug v21

---
 htdocs/core/lib/website.lib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 86737d3defc..8c6673a2bbc 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -33,7 +33,7 @@
  */
 function dolStripPhpCode($str, $replacewith = '')
 {
-	$str = str_replace('<?=', '<?php', $str);
+	$str = str_replace('<?=', '<?php echo', $str);	// replace a bad practive
 
 	$newstr = '';
 
@@ -77,9 +77,9 @@ function dolStripPhpCode($str, $replacewith = '')
  */
 function dolKeepOnlyPhpCode($str)
 {
-	$str = str_replace('<?=', '<?php', $str);
+	$str = str_replace('<?=', '<?php echo', $str);
 	$str = str_replace('<?php', '__LTINTPHP__', $str);
-	$str = str_replace('<?', '<?php', $str);			// replace the short_open_tag. It is recommended to set this is Off in php.ini
+	$str = str_replace('<?', '<?php', $str);			// replace the short_open_tag. It is recommended to set this to Off in php.ini
 	$str = str_replace('__LTINTPHP__', '<?php', $str);
 
 	$newstr = '';

From 188070729ac5424fc3f5671c51c7bb2a67d08df0 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 13 Jan 2025 14:10:34 +0100
Subject: [PATCH 05/13] FIX avoid php8 warning

---
 htdocs/core/modules/DolibarrModules.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index b440a0bd1bc..0f401ef70a8 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -2753,8 +2753,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 					$tmpfieldsofline = explode(';', $line);
 					$modulekey = strtolower($tmpfieldsofline[0]);
 					$conf->cache['noncompliantmodules'][$modulekey]['name'] = $tmpfieldsofline[0];
-					$conf->cache['noncompliantmodules'][$modulekey]['id'] = $tmpfieldsofline[1];
-					$conf->cache['noncompliantmodules'][$modulekey]['signature'] = $tmpfieldsofline[2];
+					$conf->cache['noncompliantmodules'][$modulekey]['id'] = (isset($tmpfieldsofline[1]) ? $tmpfieldsofline[1] : '');
+					$conf->cache['noncompliantmodules'][$modulekey]['signature'] = (isset($tmpfieldsofline[2]) ? $tmpfieldsofline[2] : '');
 					$conf->cache['noncompliantmodules'][$modulekey]['message'] = $langs->trans(empty($tmpfieldsofline[3]) ? 'WarningModuleAffiliatedToAReportedCompany' : $tmpfieldsofline[3]);
 					if (!empty($tmpfieldsofline[4])) {
 						$message2 = $langs->trans("WarningModuleAffiliatedToAPiratPlatform", '{s}');

From e5a6f5f9cea60980c6905cacea5f3badc61a0b52 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 13 Jan 2025 14:24:17 +0100
Subject: [PATCH 06/13] FIX avoid "Undefined array key" warning

---
 htdocs/core/actions_setmoduleoptions.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
index 8439660f6c8..26e15b7692e 100644
--- a/htdocs/core/actions_setmoduleoptions.inc.php
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -58,13 +58,13 @@ if ($action == 'update' && !empty($arrayofparameters) && is_array($arrayofparame
 	foreach ($arrayofparameters as $key => $val) {
 		// Modify constant only if key was posted (avoid resetting key to the null value)
 		if (GETPOSTISSET($key)) {
-			if (!empty($val['type']) && preg_match('/category:/', $val['type'])) {
+			if (isset($val['type']) && preg_match('/category:/', $val['type'])) {
 				if (GETPOSTINT($key) == '-1') {
 					$val_const = '';
 				} else {
 					$val_const = GETPOSTINT($key);
 				}
-			} elseif ($val['type'] == 'html') {
+			} elseif (isset($val['type']) && $val['type'] == 'html') {
 				$val_const = GETPOST($key, 'restricthtml');
 			} else {
 				$val_const = GETPOST($key, 'alpha');

From 3406aebf0f2fd883240478d82f732a595785b8b5 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 13 Jan 2025 16:35:47 +0100
Subject: [PATCH 07/13] Debug v21

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

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 4e46f88bb23..f6719809fbb 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -664,7 +664,7 @@ class Contact extends CommonObject
 		$sql .= ", phone = ".(isset($this->phone_pro) ? "'".$this->db->escape($this->phone_pro)."'" : "NULL");
 		$sql .= ", phone_perso = ".(isset($this->phone_perso) ? "'".$this->db->escape($this->phone_perso)."'" : "NULL");
 		$sql .= ", phone_mobile = ".(isset($this->phone_mobile) ? "'".$this->db->escape($this->phone_mobile)."'" : "NULL");
-		$sql .= ", priv = '".$this->db->escape($this->priv)."'";
+		$sql .= ", priv = ".((int) $this->priv);
 		$sql .= ", fk_prospectlevel = '".$this->db->escape($this->fk_prospectlevel)."'";
 		if (isset($this->stcomm_id)) {
 			$sql .= ", fk_stcommcontact = ".($this->stcomm_id > 0 || $this->stcomm_id == -1 ? $this->stcomm_id : "0");

From d618c3ce73e4d24e89eee57d4ec3dd12520cb560 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 13 Jan 2025 20:01:43 +0100
Subject: [PATCH 08/13] Trans

---
 htdocs/langs/fr_FR/website.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index c8aece70148..24e56e6ac0b 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -257,6 +257,7 @@ logOutFromYourCustomerAccount=Déconnectez-vous de votre compte client
 filteredByVersion=Filtré par version
 removeFilter=Supprimer filtre
 viewMyCart=Voir mon panier
+Shipping=Expédition
 freeShipping=Expédition gratuite !
 noProducts=Aucun produits
 nbrItemsInCart=Il y a <span class="ajax_cart_quantity">0</span> articles dans votre panier.

From 44a5c320fc0a5fe6dccde90db460fe19127de7cc Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 13 Jan 2025 21:20:16 +0100
Subject: [PATCH 09/13] Clean code

---
 .../class/conferenceorboothattendee.class.php             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 8512701a0bb..514218d1d09 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -489,15 +489,15 @@ class ConferenceOrBoothAttendee extends CommonObject
 			if (count($filter) > 0) {
 				foreach ($filter as $key => $value) {
 					if ($key == 't.rowid' || $key == 't.fk_soc' || $key == 't.fk_project' || $key == 't.fk_actioncomm') {
-						$sqlwhere[] = $key.'='.((int) $value);
+						$sqlwhere[] = $this->db->sanitize($key).' = '.((int) $value);
 					} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-						$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
+						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
 					} elseif ($key == 'customsql') {
 						$sqlwhere[] = $value;
 					} elseif (strpos($value, '%') === false) {
-						$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
+						$sqlwhere[] = $this->db->sanitize($key).' IN ('.$this->db->sanitize($this->db->escape($value)).')';
 					} else {
-						$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+						$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($value)."%'";
 					}
 				}
 			}

From f35c23253055aa9230609eea75b2005dced8bda3 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 13 Jan 2025 21:25:36 +0100
Subject: [PATCH 10/13] Debug v21

---
 .../eventorganization/class/conferenceorboothattendee.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 514218d1d09..ccdb2ade31a 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -490,7 +490,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 				foreach ($filter as $key => $value) {
 					if ($key == 't.rowid' || $key == 't.fk_soc' || $key == 't.fk_project' || $key == 't.fk_actioncomm') {
 						$sqlwhere[] = $this->db->sanitize($key).' = '.((int) $value);
-					} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+					} elseif (!empty($this->fields[$key]) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
 					} elseif ($key == 'customsql') {
 						$sqlwhere[] = $value;

From 620dea9e29e09f2b9ed1f791fd2fb85a687bbe95 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 13 Jan 2025 00:28:00 +0100
Subject: [PATCH 11/13] Qual: Fix ci by correcting PHPDoc typing

# Qual: Fix ci by correcting PHPDoc typing

Fix the return type, while reviewing the typing, also made some
PHPDoc more specific
---
 htdocs/core/lib/security.lib.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index b5ed5542749..92afd4da700 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -1,8 +1,9 @@
 <?php
+
 /* Copyright (C) 2008-2021 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2008-2021 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2020	   Ferran Marcet        <fmarcet@2byte.es>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  *
  * 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
@@ -234,15 +235,15 @@ function dolDecrypt($chain, $key = '')
  *  If constant MAIN_SECURITY_SALT is defined, we use it as a salt (used only if hashing algorithm is something else than 'password_hash').
  *
  * 	@param 		string		$chain		String to hash
- * 	@param		string		$type		Type of hash:
- *                                      'auto' or '0': will use MAIN_SECURITY_HASH_ALGO else md5
- *                                      'sha1' or '1': sha1
- *                                      'sha1md5' or '2': sha1md5
- *                                      'md5' or '3': md5
- *                                      'openldapxxx' or '4': for OpenLdap
- *                                      'sha256' or '5': sha256
- *                                      'password_hash' or '6': password_hash
- * 										Use 'md5' if hash is not needed for security purpose. For security need, prefer 'auto'.
+ * 	@param		'auto'|'0'|'sha1'|'1'|'sha1md5'|'2'|'md5'|'3'|'openldap'|'4'|'sha256'|'5'|'password_hash'|'6'	$type		Type of hash:
+ *                                                                                                                          'auto' or '0': will use MAIN_SECURITY_HASH_ALGO else md5
+ *                                                                                                                          'sha1' or '1': sha1
+ *                                                                                                                          'sha1md5' or '2': sha1md5
+ *                                                                                                                          'md5' or '3': md5
+ *                                                                                                                          'openldapxxx' or '4': for OpenLdap
+ *                                                                                                                          'sha256' or '5': sha256
+ *                                                                                                                          'password_hash' or '6': password_hash
+ *                                                                                                                          Use 'md5' if hash is not needed for security purpose. For security need, prefer 'auto'.
  * 	@param 		int 		$nosalt		Do not include any salt
  *  @param		int			$mode		0=Return encoded password, 1=Return array with encoding password + encoding algorithm
  * 	@return		string|array{pass_encrypted:string,pass_encoding:string}	Hash of string or array with pass_encrypted and pass_encoding

From d32ba0f1e161775ffb4c408b88741754f39b8581 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 13 Jan 2025 02:10:37 +0100
Subject: [PATCH 12/13] Fix: Correct $search_ref typo into $search_ref_ext

---
 htdocs/contact/list.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 48d54d40f5f..9661927d240 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2019-2024	Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2019		Josep Lluís Amador			<joseplluis@lliuretic.cat>
  * Copyright (C) 2020		Open-Dsi					<support@open-dsi.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Benjamin Falière			<benjamin.faliere@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -368,7 +368,7 @@ if (empty($reshook)) {
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {	// All tests are required to be compatible with all browsers
 		$search_all = "";
 		$search_id = '';
-		$search_ref = '';
+		$search_ref_ext = '';
 		$search_firstlast_only = "";
 		$search_lastname = "";
 		$search_firstname = "";
@@ -866,8 +866,8 @@ if ($search_all != '') {
 if ($search_id > 0) {
 	$param .= "&search_id=".((int) $search_id);
 }
-if ($search_ref) {
-	$param .= "&search_ref=".urlencode($search_ref);
+if ($search_ref_ext) {
+	$param .= "&search_ref_ext=".urlencode($search_ref_ext);
 }
 if ($search_lastname != '') {
 	$param .= '&search_lastname='.urlencode($search_lastname);

From d8824dd141136bfeb0cf31182675745e273c54de Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 13 Jan 2025 02:15:26 +0100
Subject: [PATCH 13/13] Fix: Change hash type to 'md5' which was used for
 invalid 'master' type

---
 htdocs/public/eventorganization/attendee_new.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php
index d3099bbc36b..fa7613e14db 100644
--- a/htdocs/public/eventorganization/attendee_new.php
+++ b/htdocs/public/eventorganization/attendee_new.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2021		Dorian Vabre			<dorian.vabre@gmail.com>
  * Copyright (C) 2023		Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -362,7 +362,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 
 		// If the registration has already been paid for this attendee
 		if (!empty($confattendee->date_subscription) && !empty($confattendee->amount)) {
-			$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 'master');
+			$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 'md5');
 			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.((int) $id).'&securekey='.urlencode($securekeyurl);
 
 			$mesg = $langs->trans("RegistrationAndPaymentWereAlreadyRecorded", $email);