From d8cd6b6f557cbb099f91e0e8c04e2b9184cf7ea7 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 19 Oct 2021 15:54:25 +0200
Subject: [PATCH 1/2] Fix autoselect multilevel

---
 htdocs/core/class/html.formticket.class.php | 76 +++++++++++++--------
 1 file changed, 46 insertions(+), 30 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 5ce2dd0fca7..0061609ef01 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -755,7 +755,23 @@ class FormTicket
 		} elseif ($htmlname!='') {
 			$groupticket=GETPOST($htmlname, 'aZ09');
 			$child_id=GETPOST($htmlname.'_child_id', 'aZ09')?GETPOST($htmlname.'_child_id', 'aZ09'):0;
-
+			if (!empty($groupticket)) {
+				$tmpgroupticket = $groupticket;
+				$sql = "SELECT ctc.rowid, ctc.fk_parent, ctc.code FROM ".MAIN_DB_PREFIX."c_ticket_category as ctc WHERE ctc.code = '".$tmpgroupticket."'";
+				$resql = $this->db->query($sql);
+				if ($resql) {
+					$obj = $this->db->fetch_object($resql);
+					$selectedgroups[] = $obj->code;
+					while ($obj->fk_parent > 0) {
+						$sql = "SELECT ctc.rowid, ctc.fk_parent, ctc.code FROM ".MAIN_DB_PREFIX."c_ticket_category as ctc WHERE ctc.rowid ='".$obj->fk_parent."'";
+						$resql = $this->db->query($sql);
+						if ($resql) {
+							$obj = $this->db->fetch_object($resql);
+							$selectedgroups[] = $obj->code;
+						}
+					}
+				}
+			}
 			$arrayidused = array();
 			$arrayidusedconcat = array();
 			$arraycodenotparent = array();
@@ -794,7 +810,11 @@ class FormTicket
 						$grouplabel = $label;
 
 						$isparent = $obj->isparent;
-						$iselected = $groupticket == $obj->code ?'selected':'';
+						if (is_array($selectedgroups)) {
+							$iselected = in_array($obj->code, $selectedgroups) ?'selected':'';
+						} else {
+							$iselected = $groupticket == $obj->code ?'selected':'';
+						}
 						$stringtoprint .= '<option '.$iselected.' class="'.$htmlname.dol_escape_htmltag($grouprowid).'" value="'.dol_escape_htmltag($groupvalue).'" data-html="'.dol_escape_htmltag($grouplabel).'">'.dol_escape_htmltag($grouplabel).'</option>';
 						if ($isparent == 'NOTPARENT') {
 							$arraycodenotparent[] = $groupvalue;
@@ -868,10 +888,14 @@ class FormTicket
 							if ($isparent == 'NOTPARENT') {
 								$arraycodenotparent[] = $groupvalue;
 							}
-							$iselected = $groupticket == $obj->code ?'selected':'';
+							if (is_array($selectedgroups)) {
+								$iselected = in_array($obj->code, $selectedgroups) ?'selected':'';
+							} else {
+								$iselected = $groupticket == $obj->code ?'selected':'';
+							}
 							$stringtoprint .= '<option '.$iselected.' class="'.$htmlname.'_'.dol_escape_htmltag($fatherid).'_child_'.$levelid.'" value="'.dol_escape_htmltag($groupvalue).'" data-html="'.dol_escape_htmltag($grouplabel).'">'.dol_escape_htmltag($grouplabel).'</option>';
 							if (empty($tabscript[$groupcodefather])) {
-								$tabscript[$groupcodefather] = 'if ($("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid-1:'').'")[0].value == "'.dol_escape_js($groupcodefather).'"){
+								$tabscript[$groupcodefather] = 'if ($("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid-1:'').'").val() == "'.dol_escape_js($groupcodefather).'"){
 									$(".'.$htmlname.'_'.dol_escape_htmltag($fatherid).'_child_'.$levelid.'").show()
 									console.log("We show childs tickets of '.$groupcodefather.' group ticket")
 								}else{
@@ -889,23 +913,15 @@ class FormTicket
 
 				$stringtoprint .='<script>';
 				$stringtoprint .='arraynotparents = '.json_encode($arraycodenotparent).';';	// when the last visible combo list is number x, this is the array of group
-				$stringtoprint .='if (arraynotparents.includes($("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid-1:'').'")[0].value)){
+				$stringtoprint .='if (arraynotparents.includes($("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid-1:'').'").val())){
 					console.log("'.$htmlname.'_child_'.$levelid.'")
-					if($("#'.$htmlname.'_child_'.$levelid.'")[0].value == "" && ($("#'.$htmlname.'_child_'.$levelid.'").attr("child_id")>'.$child_id.')){
+					if($("#'.$htmlname.'_child_'.$levelid.'").val() == "" && ($("#'.$htmlname.'_child_'.$levelid.'").attr("child_id")>'.$child_id.')){
 						$("#'.$htmlname.'_child_'.$levelid.'").hide();
 						console.log("We hide '.$htmlname.'_child_'.$levelid.' input")
-					}else if(($("#'.$htmlname.'_child_'.$levelid.'").attr("child_id")!=0) && ($("#'.$htmlname.'_child_'.$levelid.'").attr("child_id")<'.$child_id.')){
-						$("#'.$htmlname.'_child_'.$levelid.'").attr("disabled",true);
-						console.log("We disable '.$htmlname.'_child_'.$levelid.' input");
-					}else{
-						$("#'.$htmlname.'_child_'.$levelid.'").attr("disabled",true);
-						$("#ticketcategory_select_child_id")[0].value = $("#'.$htmlname.'_child_'.$levelid.'").attr("child_id")
-						$("#ticketcategory_select")[0].value = $("#'.$htmlname.'_child_'.$levelid.'")[0].value;
-						console.log("We disable '.$htmlname.'_child_'.$levelid.' input and reload hidden input");
 					}
 					if(arraynotparents.includes("'.$groupticket.'") && '.$child_id.' == 0){
-						$("#ticketcategory_select_child_id")[0].value = $("#'.$htmlname.'").attr("child_id")
-						$("#ticketcategory_select")[0].value = $("#'.$htmlname.'")[0].value;
+						$("#ticketcategory_select_child_id").val($("#'.$htmlname.'").attr("child_id"))
+						$("#ticketcategory_select").val($("#'.$htmlname.'").val()) ;
 						console.log("We choose '.$htmlname.' input and reload hidden input");
 					}
 				}
@@ -913,19 +929,19 @@ class FormTicket
 					child_id = $("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid:'').'").attr("child_id");
 
 					/* Change of value to select this value*/
-					if (arraynotparents.includes(this.value) || $(this).attr("child_id") == '.$use_multilevel.') {
-						$("#ticketcategory_select")[0].value = this.value;
-						$("#ticketcategory_select_child_id")[0].value = $(this).attr("child_id");
-						console.log("We choose to select "+ this.value);
+					if (arraynotparents.includes($(this).val()) || $(this).attr("child_id") == '.$use_multilevel.') {
+						$("#ticketcategory_select").val($(this).val());
+						$("#ticketcategory_select_child_id").val($(this).attr("child_id")) ;
+						console.log("We choose to select "+ $(this).val());
 					}else{
 						if ($("#'.$htmlname.'_child_'.$levelid.' option").length <= 1) {
-							$("#ticketcategory_select")[0].value = this.value;
-							$("#ticketcategory_select_child_id")[0].value = $(this).attr("child_id");
-							console.log("We choose to select "+ this.value + " and next combo has no item, so we keep this selection");
+							$("#ticketcategory_select").val($(this).val());
+							$("#ticketcategory_select_child_id").val($(this).attr("child_id"));
+							console.log("We choose to select "+ $(this).val() + " and next combo has no item, so we keep this selection");
 						} else {
-							console.log("We choose to select "+ this.value + " but next combo has some item, so we clean selected item");
-							$("#ticketcategory_select")[0].value = "";
-							$("#ticketcategory_select_child_id")[0].value = "";
+							console.log("We choose to select "+ $(this).val() + " but next combo has some item, so we clean selected item");
+							$("#ticketcategory_select").val("");
+							$("#ticketcategory_select_child_id").val("");
 						}
 					}
 
@@ -942,7 +958,7 @@ class FormTicket
 
 					/* Now we enable the next combo */
 					$("#'.$htmlname.'_child_'.$levelid.'").val("");
-					if (!arraynotparents.includes(this.value) && $("#'.$htmlname.'_child_'.$levelid.' option").length > 1) {
+					if (!arraynotparents.includes($(this).val()) && $("#'.$htmlname.'_child_'.$levelid.' option").length > 1) {
 						console.log($("#'.$htmlname.'_child_'.$levelid.' option").length);
 						$("#'.$htmlname.'_child_'.$levelid.'").show()
 					} else {
@@ -958,9 +974,9 @@ class FormTicket
 			}
 			$stringtoprint .='<script>';
 			$stringtoprint .='$("#'.$htmlname.'_child_'.$use_multilevel.'").change(function() {
-				$("#ticketcategory_select")[0].value = this.value;
-				$("#ticketcategory_select_child_id")[0].value = $(this).attr("child_id");
-				console.log($("#ticketcategory_select")[0].value);
+				$("#ticketcategory_select").val($(this).val());
+				$("#ticketcategory_select_child_id").val($(this).attr("child_id"));
+				console.log($("#ticketcategory_select").val());
 			})';
 			$stringtoprint .='</script>';
 			$stringtoprint .= ajax_combobox($htmlname);

From f5942300e0f01b0317519734d4001a78788ac300 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 19 Oct 2021 16:09:06 +0200
Subject: [PATCH 2/2] fix CI bot error

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

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 0061609ef01..89260c35d03 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -757,13 +757,13 @@ class FormTicket
 			$child_id=GETPOST($htmlname.'_child_id', 'aZ09')?GETPOST($htmlname.'_child_id', 'aZ09'):0;
 			if (!empty($groupticket)) {
 				$tmpgroupticket = $groupticket;
-				$sql = "SELECT ctc.rowid, ctc.fk_parent, ctc.code FROM ".MAIN_DB_PREFIX."c_ticket_category as ctc WHERE ctc.code = '".$tmpgroupticket."'";
+				$sql = "SELECT ctc.rowid, ctc.fk_parent, ctc.code FROM ".MAIN_DB_PREFIX."c_ticket_category as ctc WHERE ctc.code = '".$this->db->escape($tmpgroupticket)."'";
 				$resql = $this->db->query($sql);
 				if ($resql) {
 					$obj = $this->db->fetch_object($resql);
 					$selectedgroups[] = $obj->code;
 					while ($obj->fk_parent > 0) {
-						$sql = "SELECT ctc.rowid, ctc.fk_parent, ctc.code FROM ".MAIN_DB_PREFIX."c_ticket_category as ctc WHERE ctc.rowid ='".$obj->fk_parent."'";
+						$sql = "SELECT ctc.rowid, ctc.fk_parent, ctc.code FROM ".MAIN_DB_PREFIX."c_ticket_category as ctc WHERE ctc.rowid ='".$this->db->escape($obj->fk_parent)."'";
 						$resql = $this->db->query($sql);
 						if ($resql) {
 							$obj = $this->db->fetch_object($resql);