From 0160a3a1d75ba31ad4e58350fd2a89c204e2e013 Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Sun, 9 Nov 2008 06:13:40 +0000 Subject: [PATCH] Correct AWL columns --- spam/CHANGELOG | 2 ++ spam/edit_awl.cgi | 4 +++- spam/lang/en | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/spam/CHANGELOG b/spam/CHANGELOG index 4baeac32a..da0085452 100644 --- a/spam/CHANGELOG +++ b/spam/CHANGELOG @@ -15,3 +15,5 @@ Added global configuration settings to use MySQL, PostgreSQL or LDAP backends fo Auto-whitelists can now be viewed, deleted from and cleared for all users on the system. An access control option allows this to be limited to just certain users or group members. ---- Changes since 1.430 ---- Added buttons to the auto-whitelist page for permanently allowing or denying selected addresses. +---- Changes since 1.440 ---- +Corrected the columns on the auto-whitelist page, to show the message count and score. diff --git a/spam/edit_awl.cgi b/spam/edit_awl.cgi index 6abb6f9c6..4ed30408b 100644 --- a/spam/edit_awl.cgi +++ b/spam/edit_awl.cgi @@ -78,6 +78,7 @@ else { print &ui_columns_start([ "", $text{'awl_email'}, $text{'awl_ip'}, + $text{'awl_count'}, $text{'awl_score'} ], undef, 0, \@tds); foreach $k (@keys) { ($email, $ip, $rest) = split(/\|/, $k); @@ -90,7 +91,8 @@ else { else { $ip = $text{'awl_unknown'}; } - print &ui_checked_columns_row([ $email, $ip, $awl{$k} ], + $score = $awl{$k."|totscore"}; + print &ui_checked_columns_row([ $email, $ip, $awl{$k}, $score ], \@tds, "d", $k); } print &ui_columns_end(); diff --git a/spam/lang/en b/spam/lang/en index f10ce3f8a..e4976daf9 100644 --- a/spam/lang/en +++ b/spam/lang/en @@ -349,6 +349,7 @@ awl_ok=Search awl_searching=Showing auto-whitelist entries matching $1 .. awl_email=Email address awl_ip=Sender's IP or network +awl_count=Messages received awl_score=Score to apply awl_none=None awl_unknown=Unknown