Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 server/plugins-available/maildrop_plugin.inc.php

@@ -144,7 +144,7 @@
            }
            $tpl = str_replace('{vmail_mailbox_base}', $mail_config["homedir_path"], $tpl);

            if ($data["new"]["autoresponder_start_date"] != '0000-00-00 00:00:00') { // Dates have been set
            if ($data['new']['autoresponder_start_date'] && $data["new"]["autoresponder_start_date"] != '0000-00-00 00:00:00') { // Dates have been set
               $tpl = str_replace('{start_date}', strtotime($data["new"]["autoresponder_start_date"]), $tpl);
               $tpl = str_replace('{end_date}', strtotime($data["new"]["autoresponder_end_date"]), $tpl);
            } else {
@@ -211,7 +211,7 @@
                  $mailfilter_content .= file_get_contents($conf["rootpath"].'/conf/mailfilter_move_junk.master')."\n";
               }
            }
            $mailfilter_content .= $data["new"]["custom_mailfilter"];
            $mailfilter_content .= str_replace("\r\n","\n",$data["new"]["custom_mailfilter"]);

            // Replace windows linebreaks in mailfilter file
            $mailfilter_content = str_replace("\r\n", "\n", $mailfilter_content);