diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3a16aee49664492e1efe2b1bb6eeedc3e2998a8c 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';
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 75529ab82b50735e6bd00e22f31d791d430514d4..fefa6ccb6d173bee610e4364a25dad41a6322221 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',
diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index 3dd334a29c6115f6db2bd59aaf5760b4c666959f..b008299c34faefb7d5881c46b89f30a179966925 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' => '',
@@ -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',
diff --git a/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm b/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm
index 898f285e53d61b7dfcc9981fb03a2681550c046e..51c28351c76524cba97402f2a5451fe37302bd58 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 @@
<label for="autoresponder" class="col-sm-3 control-label">{tmpl_var name='autoresponder_active'}</label>
<div class="col-sm-9"><input type="checkbox" value="y" id="autoresponder" name="autoresponder" onclick="AR_ResetDates();" {tmpl_var name='ar_active'} /></div>
</div>
+ <div class="form-group">
+ <label for="autoresponder_html" class="col-sm-3 control-label">{tmpl_var name='autoresponder_html'}</label>
+ <div class="col-sm-9"><input type="checkbox" value="n" id="autoresponder_html" name="autoresponder_html" onclick="AR_ResetDates();" {tmpl_var name='autoresponder_html'} /></div>
+ </div>
<div class="form-group">
<label for="autoresponder_start_date" class="col-sm-3 control-label">{tmpl_var name='autoresponder_start_date_txt'}</label>
<div class="col-sm-9">{tmpl_var name='autoresponder_start_date'}</div>
diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
index 8719717da869a84970a76fcfc667d7d970a21b61..67ea56ddf2821be3b04fe4f26d9ae4ea32ea30a5 100644
--- a/server/conf/sieve_filter.master
+++ b/server/conf/sieve_filter.master
@@ -61,7 +61,15 @@ if currentdate :value "le" "iso8601" "<tmpl_var name='end_date'>" {
vacation :days 1
:subject "<tmpl_var name='autoresponder_subject'>"
<tmpl_var name='addresses'>
+<tmpl_if name="autoresponder_html" op="==" value="y">
+ :mime "MIME-Version: 1.0
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: 7bit
+<tmpl_var name='autoresponder_text'>";
+</tmpl_if>
+<tmpl_if name="autoresponder_html" op="==" value="n">
"<tmpl_var name='autoresponder_text'>";
+</tmpl_if>
<tmpl_if name="end_date">
}
diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php
index 15cf20c25f54fc993ebe2367bb24775f1146c927..0d3ad974f432d5c4903988502b98bb88dfce2216 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"]);