tbrehm
2011-11-21 f442da030fdbc02941766add9390b7a810cccb1b
- Readded sieve filter master file.

1 files added
2 files modified
40 ■■■■■ changed files
interface/lib/classes/functions.inc.php 2 ●●●●● patch | view | raw | blame | history
server/conf/sieve_filter.master 36 ●●●●● patch | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 2 ●●● patch | view | raw | blame | history
interface/lib/classes/functions.inc.php
@@ -73,6 +73,8 @@
            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);
        }
server/conf/sieve_filter.master
New file
@@ -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>
server/plugins-available/apache2_plugin.inc.php
@@ -167,7 +167,7 @@
                    $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);
                };