From 29934a052fb5e273c82f440eee25f3e58cbd8024 Mon Sep 17 00:00:00 2001 From: riccardo Date: Fri, 29 Sep 2023 15:40:42 +0200 Subject: [PATCH 1/7] Autoresponder in html --- server/plugins-available/maildeliver_plugin.inc.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php index 15cf20c25f..0d3ad974f4 100644 --- a/server/plugins-available/maildeliver_plugin.inc.php +++ b/server/plugins-available/maildeliver_plugin.inc.php @@ -89,6 +89,7 @@ class maildeliver_plugin { or $data["old"]["autoresponder_subject"] != $data["new"]["autoresponder_subject"] or $data["old"]["autoresponder_text"] != $data["new"]["autoresponder_text"] or $data["old"]["autoresponder"] != $data["new"]["autoresponder"] + or $data["old"]["autoresponder_html"] != $data["new"]["autoresponder_html"] or (isset($data["new"]["email"]) and $data["old"]["email"] != $data["new"]["email"]) or $data["old"]["autoresponder_start_date"] != $data["new"]["autoresponder_start_date"] or $data["old"]["autoresponder_end_date"] != $data["new"]["autoresponder_end_date"] @@ -154,6 +155,9 @@ class maildeliver_plugin { // Autoresponder $tpl->setVar('autoresponder', $data["new"]["autoresponder"]); + // Autoresponder_html + $tpl->setVar('autoresponder_html', $data["new"]["autoresponder_html"]); + // Autoresponder Subject $data["new"]["autoresponder_subject"] = str_replace("\"", "'", $data["new"]["autoresponder_subject"]); $tpl->setVar('autoresponder_subject', $data["new"]["autoresponder_subject"]); -- GitLab From 6ed2981e97b7704c42c4fef54be2272767ac2643 Mon Sep 17 00:00:00 2001 From: riccardo Date: Fri, 29 Sep 2023 15:44:55 +0200 Subject: [PATCH 2/7] Autoresponder in html --- .../web/mailuser/templates/mail_user_autoresponder_edit.htm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm b/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm index 898f285e53..51c28351c7 100644 --- a/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm +++ b/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm @@ -10,6 +10,10 @@
+
+ +
+
{tmpl_var name='autoresponder_start_date'}
-- GitLab From d44ce39404066e662cbfa8d064cbc6528c7e8712 Mon Sep 17 00:00:00 2001 From: riccardo Date: Fri, 29 Sep 2023 15:46:23 +0200 Subject: [PATCH 3/7] Autoresponder in html --- interface/web/mail/form/mail_user.tform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php index 3dd334a29c..a6ca0bb46c 100644 --- a/interface/web/mail/form/mail_user.tform.php +++ b/interface/web/mail/form/mail_user.tform.php @@ -381,7 +381,7 @@ if ($global_config['mail']['mailbox_show_autoresponder_tab'] === 'y') { 'formtype' => 'TEXTAREA', 'filters' => array( 0 => array( 'event' => 'SAVE', - 'type' => 'STRIPTAGS') + 'type' => 'TRIM') ), 'default' => '', 'value' => '', -- GitLab From 53585a56cf107a720ba1b8f36a4114e4751ccbf9 Mon Sep 17 00:00:00 2001 From: riccardo Date: Fri, 29 Sep 2023 15:53:39 +0200 Subject: [PATCH 4/7] Autoresponder in html --- server/conf/sieve_filter.master | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master index 8719717da8..67ea56ddf2 100644 --- a/server/conf/sieve_filter.master +++ b/server/conf/sieve_filter.master @@ -61,7 +61,15 @@ if currentdate :value "le" "iso8601" "" { vacation :days 1 :subject "" + + :mime "MIME-Version: 1.0 +Content-Type: text/html; charset=UTF-8 +Content-Transfer-Encoding: 7bit +"; + + ""; + } -- GitLab From 3388c028bc3c84032729544a833813697341ac1e Mon Sep 17 00:00:00 2001 From: riccardo Date: Mon, 2 Oct 2023 09:28:21 +0200 Subject: [PATCH 5/7] Autoresponder in html --- interface/web/mail/form/mail_user.tform.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php index a6ca0bb46c..b008299c34 100644 --- a/interface/web/mail/form/mail_user.tform.php +++ b/interface/web/mail/form/mail_user.tform.php @@ -394,6 +394,12 @@ if ($global_config['mail']['mailbox_show_autoresponder_tab'] === 'y') { 'default' => 'n', 'value' => array(1 => 'y', 0 => 'n') ), + 'autoresponder_html' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'n', + 'value' => array(1 => 'y', 0 => 'n') + ), 'autoresponder_start_date' => array ( 'datatype' => 'DATETIME', 'formtype' => 'DATETIME', -- GitLab From 6cfe3dd24a03011d54b5a997c8a569d5a4c04000 Mon Sep 17 00:00:00 2001 From: riccardo Date: Mon, 2 Oct 2023 10:12:09 +0200 Subject: [PATCH 6/7] Autoresponder in html --- install/sql/incremental/upd_dev_collection.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql index e69de29bb2..3a16aee496 100644 --- a/install/sql/incremental/upd_dev_collection.sql +++ b/install/sql/incremental/upd_dev_collection.sql @@ -0,0 +1 @@ +ALTER TABLE `mail_user` ADD `autoresponder_html` enum('n','y') NOT NULL DEFAULT 'n'; -- GitLab From 62e50dabd002c15cc60ca281fbf0722a3884fe9f Mon Sep 17 00:00:00 2001 From: riccardo Date: Mon, 2 Oct 2023 14:51:27 +0200 Subject: [PATCH 7/7] Autoresponder in html --- install/sql/ispconfig3.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 75529ab82b..fefa6ccb6d 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -1076,6 +1076,7 @@ CREATE TABLE `mail_user` ( `sender_cc` varchar(255) NOT NULL default '', `homedir` varchar(255) NOT NULL default '', `autoresponder` enum('n','y') NOT NULL default 'n', + `autoresponder_html` enum('n','y') NOT NULL default 'n', `autoresponder_start_date` datetime NULL default NULL, `autoresponder_end_date` datetime NULL default NULL, `autoresponder_subject` varchar(255) NOT NULL default 'Out of office reply', -- GitLab