From de44f7208107219650e966843881798a96a55c07 Mon Sep 17 00:00:00 2001 From: lars Date: Sun, 29 Jan 2006 19:38:07 +0000 Subject: [PATCH] fixed bug: setting spamassassin options fails for user without any SA settings --- ql-web/trunk/ql-web.pl | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/ql-web/trunk/ql-web.pl b/ql-web/trunk/ql-web.pl index 224344c..20f762e 100755 --- a/ql-web/trunk/ql-web.pl +++ b/ql-web/trunk/ql-web.pl @@ -342,12 +342,17 @@ sub update_filter_options { return (0==1); } - $result = $ldap->modify($user_dn, delete => ['spamassassin'] ); - if ($result->is_error) { - warn $result->error_text; - $warning = 'UpdateFilterOptions'; - $ldap->unbind; - return (1==0); + { + my @spam_options = &get_ldap_values('spamassassin'); + if ($#spam_options > 0) { + $result = $ldap->modify($user_dn, delete => ['spamassassin'] ); + if ($result->is_error) { + warn $result->error_text; + $warning = 'UpdateFilterOptions'; + $ldap->unbind; + return (1==0); + } + } } {