From f442da030fdbc02941766add9390b7a810cccb1b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 21 Nov 2011 14:10:01 +0000
Subject: [PATCH] - Readded sieve filter master file.
---
interface/lib/classes/functions.inc.php | 2 ++
server/conf/sieve_filter.master | 36 +++++++++++++++++++
.../plugins-available/apache2_plugin.inc.php | 2 +-
3 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 server/conf/sieve_filter.master
diff --git a/interface/lib/classes/functions.inc.php b/interface/lib/classes/functions.inc.php
index 21029929d5..3e926aeec7 100644
--- a/interface/lib/classes/functions.inc.php
+++ b/interface/lib/classes/functions.inc.php
@@ -73,6 +73,8 @@ class functions {
mail($to, $subject, "", $header);
} else {
$header = "From: $from\nReply-To: $from\n";
+ $header .= "Content-Type: text/plain;\n\tcharset=\"UTF-8\"\n";
+ $header .= "Content-Transfer-Encoding: 8bit\n\n";
mail($to, $subject, $text, $header);
}
diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
new file mode 100644
index 0000000000..2b4a9fc2f8
--- /dev/null
+++ b/server/conf/sieve_filter.master
@@ -0,0 +1,36 @@
+
+require ["fileinto", "regex", "vacation"];
+
+<tmpl_if name="cc">
+# Send a copy of email to
+redirect "<tmpl_var name='cc'>";
+keep;
+</tmpl_if>
+
+<tmpl_if name="move_junk" op="==" value="y">
+# Move spam to spam folder
+if header :contains "X-Spam-Flag" "YES" {
+ fileinto "Junk";
+ # Stop here so that we do not reply on spams
+ stop;
+}
+</tmpl_if>
+
+<tmpl_var name='custom_mailfilter'>
+
+<tmpl_if name="autoresponder" op="==" value="y">
+#################################################################
+# Autoreply
+#################################################################
+
+# Move spam to spam folder
+if header :contains "X-Spam-Flag" "YES" {
+ fileinto "Junk";
+ # Stop here so that we do not reply on spams
+ stop;
+}
+vacation :days 1
+ :subject "Out of office reply"
+ # :addresses ["test@test.int", "till@test.int"]
+ "<tmpl_var name='autoresponder_text'>";
+</tmpl_if>
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 7dc07fe748..49bb90fa5f 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -167,7 +167,7 @@ class apache2_plugin {
$app->log("Creating CA-signed SSL Cert for: $domain",LOGLEVEL_DEBUG);
if (filesize($crt_file)==0 || !file_exists($crt_file)) $app->log("CA-Certificate signing failed. openssl ca -out $crt_file -config ".$web_config['CA_path']."/openssl.cnf -passin pass:".$web_config['CA_pass']." -in $csr_file",LOGLEVEL_ERROR);
};
- if (filesize($crt_file)==0 || !file_exists($crt_file)){
+ if (@filesize($crt_file)==0 || !file_exists($crt_file)){
exec("openssl req -x509 -passin pass:$ssl_password -passout pass:$ssl_password -key $key_file -in $csr_file -out $crt_file -days $ssl_days -config $config_file ");
$app->log("Creating self-signed SSL Cert for: $domain",LOGLEVEL_DEBUG);
};
--
GitLab