From b9fcb36357fd30422a0afc223582f3c990c9ae56 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 27 Feb 2009 17:36:37 +0000
Subject: [PATCH] - Changed amavisd default values - fixed a php notice in
app.inc.php
---
install/tpl/amavisd_user_config.master | 2 +-
install/tpl/fedora_amavisd_conf.master | 2 +-
server/lib/app.inc.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/install/tpl/amavisd_user_config.master b/install/tpl/amavisd_user_config.master
index c88e312912..c89f875883 100644
--- a/install/tpl/amavisd_user_config.master
+++ b/install/tpl/amavisd_user_config.master
@@ -47,7 +47,7 @@ $sql_select_white_black_list = 'SELECT wb FROM spamfilter_wblist'.
$final_virus_destiny = D_BOUNCE;
$final_spam_destiny = D_DISCARD;
$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
$sa_spam_subject_tag = '***SPAM*** ';
diff --git a/install/tpl/fedora_amavisd_conf.master b/install/tpl/fedora_amavisd_conf.master
index 2a20433547..01d20691a0 100644
--- a/install/tpl/fedora_amavisd_conf.master
+++ b/install/tpl/fedora_amavisd_conf.master
@@ -775,7 +775,7 @@ $sql_select_white_black_list = 'SELECT wb FROM spamfilter_wblist'.
$final_virus_destiny = D_BOUNCE;
$final_spam_destiny = D_DISCARD;
$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.
diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php
index 457693b505..e0ac82f150 100644
--- a/server/lib/app.inc.php
+++ b/server/lib/app.inc.php
@@ -68,7 +68,7 @@ class app {
$cl = explode(',',$classes);
if(is_array($cl)) {
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")) {
include_once($conf['classpath'] . "/".$classname.".inc.php");
$this->$classname = new $classname;
--
GitLab