fix: advanced target emailling missing case (#34715)

* fix: advanced target emailling missing case

* fix: travis for simple quote SQL

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
This commit is contained in:
HENRY Florian 2025-07-15 15:40:25 +02:00 committed by GitHub
parent 6f15da3537
commit 69f82e5cb6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -641,6 +641,27 @@ class AdvanceTargetingMailing extends CommonObject
if ($arrayquery['options_'.$key] > 0) {
$sqlwhere[] = " (te.".$key." = ".((int) $arrayquery["options_".$key]).")";
}
} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'chkbxlst'
&& is_array($arrayquery['options_'.$key])) {
if (count($arrayquery['options_'.$key])) {
$i2 = 0;
$field = "te.".$key;
$sqlwhereselllist="";
foreach ($arrayquery['options_'.$key] as $data) {
$data = trim($data);
if ($data) {
$sqlwhereselllist .= ($i2 > 0 ? " OR (" : "(").$field." LIKE '".$this->db->escape($data).",%'";
$sqlwhereselllist .= " OR ".$field." = '".$this->db->escape($data)."'";
$sqlwhereselllist .= " OR ".$field." LIKE '%,".$this->db->escape($data)."'";
$sqlwhereselllist .= " OR ".$field." LIKE '%,".$this->db->escape($data).",%'";
$sqlwhereselllist .= ")";
$i2++; // a criteria for 1 more field was added to string (we can add several criteria for the same field as it is a multiselect search criteria)
}
}
if (!empty($sqlwhereselllist)) {
$sqlwhere[] = "( ".$sqlwhereselllist." )";
}
}
} else {
if (is_array($arrayquery['options_'.$key])) {
$sqlwhere[] = " (te.".$key." IN (".$this->db->sanitize("'".implode("','", $arrayquery["options_".$key])."'", 1)."))";
@ -784,6 +805,31 @@ class AdvanceTargetingMailing extends CommonObject
$sqlwhere[] = " (te.".$key." = ".((int) $arrayquery["options_".$key."_cnct"]).")";
}
}
} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'link') {
if ($arrayquery['options_'.$key."_cnct"] > 0) {
$sqlwhere[]= " (te.".$key." = ".((int) $arrayquery["options_".$key."_cnct"]).")";
}
} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'chkbxlst'
&& is_array($arrayquery['options_'.$key.'_cnct'])) {
if (count($arrayquery['options_'.$key.'_cnct'])) {
$i2 = 0;
$field = "te.".$key;
$sqlwhereselllist="";
foreach ($arrayquery['options_'.$key.'_cnct'] as $data) {
$data = trim($data);
if ($data) {
$sqlwhereselllist .= ($i2 > 0 ? " OR (" : "(").$field." LIKE '".$this->db->escape($data).",%'";
$sqlwhereselllist .= " OR ".$field." = '".$this->db->escape($data)."'";
$sqlwhereselllist .= " OR ".$field." LIKE '%,".$this->db->escape($data)."'";
$sqlwhereselllist .= " OR ".$field." LIKE '%,".$this->db->escape($data).",%'";
$sqlwhereselllist .= ")";
$i2++; // a criteria for 1 more field was added to string (we can add several criteria for the same field as it is a multiselect search criteria)
}
}
if (!empty($sqlwhereselllist)) {
$sqlwhere[] = "( ".$sqlwhereselllist." )";
}
}
} else {
if (is_array($arrayquery['options_'.$key.'_cnct'])) {
$sqlwhere[] = " (te.".$key." IN (".$this->db->sanitize("'".implode("','", $arrayquery["options_".$key."_cnct"])."'", 1)."))";
@ -888,6 +934,31 @@ class AdvanceTargetingMailing extends CommonObject
if ($arrayquery['options_'.$key] != '') {
$sqlwhere[] = " (tse.".$key." = ".((int) $arrayquery["options_".$key]).")";
}
} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'link') {
if ($arrayquery['options_'.$key] > 0) {
$sqlwhere[]= " (te.".$key." = ".((int) $arrayquery["options_".$key]).")";
}
} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'chkbxlst'
&& is_array($arrayquery['options_'.$key])) {
if (count($arrayquery['options_'.$key])) {
$i2 = 0;
$field = "tse.".$key;
$sqlwhereselllist="";
foreach ($arrayquery['options_'.$key] as $data) {
$data = trim($data);
if ($data) {
$sqlwhereselllist .= ($i2 > 0 ? " OR (" : "(").$field." LIKE '".$this->db->escape($data).",%'";
$sqlwhereselllist .= " OR ".$field." = '".$this->db->escape($data)."'";
$sqlwhereselllist .= " OR ".$field." LIKE '%,".$this->db->escape($data)."'";
$sqlwhereselllist .= " OR ".$field." LIKE '%,".$this->db->escape($data).",%'";
$sqlwhereselllist .= ")";
$i2++; // a criteria for 1 more field was added to string (we can add several criteria for the same field as it is a multiselect search criteria)
}
}
if (!empty($sqlwhereselllist)) {
$sqlwhere[] = "( ".$sqlwhereselllist." )";
}
}
} else {
if (is_array($arrayquery['options_'.$key])) {
$sqlwhere[] = " (tse.".$key." IN (".$this->db->sanitize("'".implode("','", $arrayquery["options_".$key])."'", 1)."))";