From 604b81b635b29ad5f83c145974d01ed6200105f7 Mon Sep 17 00:00:00 2001 From: shane Date: Tue, 12 Nov 2024 15:28:08 -0600 Subject: [PATCH 1/2] LEAF-4584 - Main adjustment is the email.php for the charset change. --- LEAF_Request_Portal/sources/Email.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LEAF_Request_Portal/sources/Email.php b/LEAF_Request_Portal/sources/Email.php index 4286687db..62345ddc3 100644 --- a/LEAF_Request_Portal/sources/Email.php +++ b/LEAF_Request_Portal/sources/Email.php @@ -415,7 +415,7 @@ function initNexusDB(): void private function getHeaders(): string { $header = 'MIME-Version: 1.0'; - $header .= "\r\nContent-type: text/html; charset=iso-8859-1"; + $header .= "\r\nContent-type: text/html; charset=utf-8"; if ($this->emailSender == '') { $header .= "\r\nFrom: {$this->emailFrom}"; } else { From 5724c1ef78fc393db396c0960bddc76d339d3784 Mon Sep 17 00:00:00 2001 From: shane Date: Mon, 18 Nov 2024 10:27:29 -0600 Subject: [PATCH 2/2] LEAF-4584 - This was found to cause special characters to break in emails. everything should be stored as utf-8 --- LEAF-Automated-Tests | 2 +- LEAF_Request_Portal/sources/FormWorkflow.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LEAF-Automated-Tests b/LEAF-Automated-Tests index a7f6435a6..c56c1b20b 160000 --- a/LEAF-Automated-Tests +++ b/LEAF-Automated-Tests @@ -1 +1 @@ -Subproject commit a7f6435a65ae82b646ebfd70cd3ea92015b96a38 +Subproject commit c56c1b20b429f902108c954ab825c9918f7d697d diff --git a/LEAF_Request_Portal/sources/FormWorkflow.php b/LEAF_Request_Portal/sources/FormWorkflow.php index 48603d0a0..e5960b8e6 100644 --- a/LEAF_Request_Portal/sources/FormWorkflow.php +++ b/LEAF_Request_Portal/sources/FormWorkflow.php @@ -1672,7 +1672,7 @@ private function getFields(): array default: break; } - $data = iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $data); + $formattedFields["content"][$field['indicatorID']] = $data !== "" ? $data : $field["default"]; $formattedFields["to_cc_content"][$field['indicatorID']] = $emailValue; }