Skip to content
Snippets Groups Projects
Commit b9fcb363 authored by tbrehm's avatar tbrehm
Browse files

- Changed amavisd default values

- fixed a php notice in app.inc.php
parent aebdd8ec
No related branches found
No related tags found
No related merge requests found
...@@ -47,7 +47,7 @@ $sql_select_white_black_list = 'SELECT wb FROM spamfilter_wblist'. ...@@ -47,7 +47,7 @@ $sql_select_white_black_list = 'SELECT wb FROM spamfilter_wblist'.
$final_virus_destiny = D_BOUNCE; $final_virus_destiny = D_BOUNCE;
$final_spam_destiny = D_DISCARD; $final_spam_destiny = D_DISCARD;
$final_banned_destiny = D_BOUNCE; $final_banned_destiny = D_BOUNCE;
$final_bad_header_destiny = D_DISCARD; $final_bad_header_destiny = D_PASS;
# Default settings, we st this very high to not filter aut emails accidently # Default settings, we st this very high to not filter aut emails accidently
$sa_spam_subject_tag = '***SPAM*** '; $sa_spam_subject_tag = '***SPAM*** ';
......
...@@ -775,7 +775,7 @@ $sql_select_white_black_list = 'SELECT wb FROM spamfilter_wblist'. ...@@ -775,7 +775,7 @@ $sql_select_white_black_list = 'SELECT wb FROM spamfilter_wblist'.
$final_virus_destiny = D_BOUNCE; $final_virus_destiny = D_BOUNCE;
$final_spam_destiny = D_DISCARD; $final_spam_destiny = D_DISCARD;
$final_banned_destiny = D_BOUNCE; $final_banned_destiny = D_BOUNCE;
$final_bad_header_destiny = D_DISCARD; $final_bad_header_destiny = D_PASS;
# #
# Disable spam and virus notifications for the admin user. # Disable spam and virus notifications for the admin user.
......
...@@ -68,7 +68,7 @@ class app { ...@@ -68,7 +68,7 @@ class app {
$cl = explode(',',$classes); $cl = explode(',',$classes);
if(is_array($cl)) { if(is_array($cl)) {
foreach($cl as $classname) { foreach($cl as $classname) {
if(!is_object($this->$classname)) { if(!@is_object($this->$classname)) {
if(is_file($conf['classpath'] . "/".$classname.".inc.php") && !is_link($conf['classpath'] . "/".$classname.".inc.php")) { if(is_file($conf['classpath'] . "/".$classname.".inc.php") && !is_link($conf['classpath'] . "/".$classname.".inc.php")) {
include_once($conf['classpath'] . "/".$classname.".inc.php"); include_once($conf['classpath'] . "/".$classname.".inc.php");
$this->$classname = new $classname; $this->$classname = new $classname;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment