From 5335a40f5ac4c20c96987ecc0853c62f86cca221 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 29 Apr 2014 09:19:18 +0200
Subject: [PATCH] Fixed: FS#3474 - Mail plugins do not load files from
conf-custom
---
server/plugins-available/getmail_plugin.inc.php | 6 +++++-
server/plugins-available/maildrop_plugin.inc.php | 12 ++++++++++--
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/server/plugins-available/getmail_plugin.inc.php b/server/plugins-available/getmail_plugin.inc.php
index 80424ad00..5b1edfbab 100644
--- a/server/plugins-available/getmail_plugin.inc.php
+++ b/server/plugins-available/getmail_plugin.inc.php
@@ -100,7 +100,11 @@ class getmail_plugin {
if($data["new"]["active"] == 'y') {
// Open master template
- $tpl = file_get_contents($conf["rootpath"].'/conf/getmail.conf.master');
+ if(file_exists($conf["rootpath"].'/conf-custom/getmail.conf.master')) {
+ $tpl = file_get_contents($conf["rootpath"].'/conf-custom/getmail.conf.master');
+ } else {
+ $tpl = file_get_contents($conf["rootpath"].'/conf/getmail.conf.master');
+ }
// Shall emails be deleted after retrieval
if($data["new"]["source_delete"] == 'y') {
diff --git a/server/plugins-available/maildrop_plugin.inc.php b/server/plugins-available/maildrop_plugin.inc.php
index 37b030608..5e05bc37c 100644
--- a/server/plugins-available/maildrop_plugin.inc.php
+++ b/server/plugins-available/maildrop_plugin.inc.php
@@ -137,7 +137,11 @@ class maildrop_plugin {
}
// 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
@@ -201,7 +205,11 @@ class maildrop_plugin {
}
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"];
--
GitLab