Revert "Merge branch 'develop' into 'develop'"

This reverts merge request !1812

Author: Till Brehm

install/sql/incremental/upd_dev_collection.sql

@@ -1 +0,0 @@
-ALTER TABLE `mail_user` ADD `autoresponder_html` enum('n','y') NOT NULL DEFAULT 'n';

install/sql/ispconfig3.sql

@@ -1076,7 +1076,6 @@ 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',

interface/web/mail/form/mail_user.tform.php

@@ -381,7 +381,7 @@
 				'formtype' => 'TEXTAREA',
 				'filters'   => array(
 					0 => array( 'event' => 'SAVE',
-					'type' => 'TRIM')
+					'type' => 'STRIPTAGS')
 			),
 				'default' => '',
 				'value'  => '',
@@ -394,12 +394,6 @@
 				'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',

interface/web/mailuser/templates/mail_user_autoresponder_edit.htm

@@ -10,10 +10,6 @@
                 <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>

server/conf/sieve_filter.master

@@ -61,15 +61,7 @@ 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">
 }

server/plugins-available/maildeliver_plugin.inc.php

@@ -89,7 +89,6 @@ function update($event_name, $data) {
 			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"]
@@ -155,9 +154,6 @@ function update($event_name, $data) {
 				// 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"]);