Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

 server/plugins-available/maildrop_plugin.inc.php

@@ -137,10 +137,14 @@
            }

            // Load the master template
            $tpl = file_get_contents($conf["rootpath"].'/conf/autoresponder.master');
            if(file_exists($conf["rootpath"].'/conf-custom/autoresponder.master')) {
               $tpl = file_get_contents($conf["rootpath"].'/conf-custom/autoresponder.master');
            } else {
               $tpl = file_get_contents($conf["rootpath"].'/conf/autoresponder.master');
            }
            $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 {
@@ -201,7 +205,11 @@
            }

            if($data["new"]["move_junk"] == 'y') {
               $mailfilter_content .= file_get_contents($conf["rootpath"].'/conf/mailfilter_move_junk.master')."\n";
               if(file_exists($conf["rootpath"].'/conf-custom/mailfilter_move_junk.master')) {
                  $mailfilter_content .= file_get_contents($conf["rootpath"].'/conf-custom/mailfilter_move_junk.master')."\n";
               } else {
                  $mailfilter_content .= file_get_contents($conf["rootpath"].'/conf/mailfilter_move_junk.master')."\n";
               }
            }
            $mailfilter_content .= $data["new"]["custom_mailfilter"];