From 40276f66d38e50fe4199fb9a1a9d72f16d47328d Mon Sep 17 00:00:00 2001 From: Jan <56178675+JE4GLE@users.noreply.github.com> Date: Wed, 13 Nov 2024 14:14:00 +0100 Subject: [PATCH 1/8] Added German translation for "Keep Formatting" --- program/localization/de_DE/labels.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc index e8b0fd4641..62d252ae05 100644 --- a/program/localization/de_DE/labels.inc +++ b/program/localization/de_DE/labels.inc @@ -244,6 +244,7 @@ $labels['charset'] = 'Zeichensatz'; $labels['editortype'] = 'Bearbeitungstyp'; $labels['returnreceipt'] = 'Empfangsbestätigung (MDN)'; $labels['dsn'] = 'Übermittlungsbestätigung (DSN)'; +$labels['keepformatting'] = 'Formatierung beibehalten'; $labels['mailreplyintro'] = 'Am $date, schrieb $sender:'; $labels['originalmessage'] = 'Originalnachricht'; $labels['selectimage'] = 'Bild auswählen'; From 9491e675531331c89eb52a3eeec4cfa56c98fea9 Mon Sep 17 00:00:00 2001 From: Jan <56178675+JE4GLE@users.noreply.github.com> Date: Fri, 15 Nov 2024 09:52:57 +0100 Subject: [PATCH 2/8] Update compose.html --- skins/elastic/templates/compose.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/skins/elastic/templates/compose.html b/skins/elastic/templates/compose.html index 0f7cad8caf..18d9c30c69 100644 --- a/skins/elastic/templates/compose.html +++ b/skins/elastic/templates/compose.html @@ -46,12 +46,14 @@

+
From d01920c563da9841e5deb695c37b2428cf278fbd Mon Sep 17 00:00:00 2001 From: Jan <56178675+JE4GLE@users.noreply.github.com> Date: Fri, 15 Nov 2024 09:56:22 +0100 Subject: [PATCH 3/8] Update labels.inc --- program/localization/de_DE/labels.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc index 62d252ae05..e8b0fd4641 100644 --- a/program/localization/de_DE/labels.inc +++ b/program/localization/de_DE/labels.inc @@ -244,7 +244,6 @@ $labels['charset'] = 'Zeichensatz'; $labels['editortype'] = 'Bearbeitungstyp'; $labels['returnreceipt'] = 'Empfangsbestätigung (MDN)'; $labels['dsn'] = 'Übermittlungsbestätigung (DSN)'; -$labels['keepformatting'] = 'Formatierung beibehalten'; $labels['mailreplyintro'] = 'Am $date, schrieb $sender:'; $labels['originalmessage'] = 'Originalnachricht'; $labels['selectimage'] = 'Bild auswählen'; From 9f0414c8c9a9341644b33750cdffd23ba1a9d941 Mon Sep 17 00:00:00 2001 From: Jan <56178675+JE4GLE@users.noreply.github.com> Date: Tue, 19 Nov 2024 20:26:11 +0100 Subject: [PATCH 4/8] Update send.php --- program/actions/mail/send.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/program/actions/mail/send.php b/program/actions/mail/send.php index f0e63445d2..487cf53c3a 100644 --- a/program/actions/mail/send.php +++ b/program/actions/mail/send.php @@ -47,6 +47,10 @@ public function run($args = []) $saveonly = !empty($_GET['_saveonly']); $savedraft = !empty($_POST['_draft']) && !$saveonly; + $keepformatting = !empty($_POST['_keepformatting']); + if (in_array('keep_formatting', $rcmail->config->get('dont_override', []))) { + $keepformatting = false; + } $SENDMAIL = new rcmail_sendmail($COMPOSE, [ 'sendmail' => true, 'saveonly' => $saveonly, @@ -55,7 +59,7 @@ public function run($args = []) call_user_func_array([$rcmail->output, 'show_message'], $args); $rcmail->output->send('iframe'); }, - 'keepformatting' => !empty($_POST['_keepformatting']), + 'keepformatting' => $keepformatting, ]); // Collect input for message headers From 3969d06e3ff1d1f272b57715307e5ed87048933f Mon Sep 17 00:00:00 2001 From: Jan <56178675+JE4GLE@users.noreply.github.com> Date: Wed, 20 Nov 2024 09:45:44 +0100 Subject: [PATCH 5/8] Update send.php --- program/actions/mail/send.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/program/actions/mail/send.php b/program/actions/mail/send.php index 487cf53c3a..a967605cbe 100644 --- a/program/actions/mail/send.php +++ b/program/actions/mail/send.php @@ -47,9 +47,10 @@ public function run($args = []) $saveonly = !empty($_GET['_saveonly']); $savedraft = !empty($_POST['_draft']) && !$saveonly; - $keepformatting = !empty($_POST['_keepformatting']); if (in_array('keep_formatting', $rcmail->config->get('dont_override', []))) { - $keepformatting = false; + $keepformatting = !empty($rcmail->config->get('keep_formatting', false)); + } else { + $keepformatting = !empty($_POST['_keepformatting']); } $SENDMAIL = new rcmail_sendmail($COMPOSE, [ 'sendmail' => true, From 506aa288fc461506e0f22b3103439e8df100db6e Mon Sep 17 00:00:00 2001 From: Jan <56178675+JE4GLE@users.noreply.github.com> Date: Wed, 20 Nov 2024 11:00:34 +0100 Subject: [PATCH 6/8] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d40f24101..3bc573592d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Add possibility to change ATTR_EMULATE_PREPARES via config file (#9213) - Use draft settings (like DSN) on "Edit as new" (#9349) - Use new HTML5 parser available on PHP >= 8.4 +- Allow hiding the "Keep formatting" option when composing an email (#9704) - Installer: Show NOT OK if none of the database extensions is installed (#9594, #9604) - Mailvelope: Add a button to enable the extension for webmail domain (#9498) - OAuth: Add support for SMTP without authentication (#9183) From 623226bcf3d6d9a3b97dce2fbb10bccbbdf95ee9 Mon Sep 17 00:00:00 2001 From: Jan <56178675+JE4GLE@users.noreply.github.com> Date: Wed, 20 Nov 2024 11:01:52 +0100 Subject: [PATCH 7/8] Update program/actions/mail/send.php Co-authored-by: Carsten Brandt --- program/actions/mail/send.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/program/actions/mail/send.php b/program/actions/mail/send.php index a967605cbe..d53f04d2d0 100644 --- a/program/actions/mail/send.php +++ b/program/actions/mail/send.php @@ -47,7 +47,7 @@ public function run($args = []) $saveonly = !empty($_GET['_saveonly']); $savedraft = !empty($_POST['_draft']) && !$saveonly; - if (in_array('keep_formatting', $rcmail->config->get('dont_override', []))) { + if (in_array('keep_formatting', $rcmail->config->get('dont_override', []), true)) { $keepformatting = !empty($rcmail->config->get('keep_formatting', false)); } else { $keepformatting = !empty($_POST['_keepformatting']); From dc2c5428cd59cf07587663b2475c50c7939f55ee Mon Sep 17 00:00:00 2001 From: Jan <56178675+JE4GLE@users.noreply.github.com> Date: Wed, 20 Nov 2024 14:33:13 +0100 Subject: [PATCH 8/8] Update CHANGELOG.md Co-authored-by: Pablo Zmdl <57864086+pabzm@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bc573592d..31b162c8a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,7 @@ - Add possibility to change ATTR_EMULATE_PREPARES via config file (#9213) - Use draft settings (like DSN) on "Edit as new" (#9349) - Use new HTML5 parser available on PHP >= 8.4 -- Allow hiding the "Keep formatting" option when composing an email (#9704) +- Allow hiding the "Keep formatting" option (via `dont_override`) when composing an email (#9704) - Installer: Show NOT OK if none of the database extensions is installed (#9594, #9604) - Mailvelope: Add a button to enable the extension for webmail domain (#9498) - OAuth: Add support for SMTP without authentication (#9183)