From b466ed8cc8af44cd5fb07f54a91e59ab95a4cd0f Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Tue, 1 May 2012 13:40:43 -0700
Subject: [PATCH] Add trusted_networks field support

---
 spam/CHANGELOG      | 2 ++
 spam/edit_score.cgi | 5 +++++
 spam/lang/en        | 1 +
 spam/save_score.cgi | 3 +++
 4 files changed, 11 insertions(+)

diff --git a/spam/CHANGELOG b/spam/CHANGELOG
index 1d1316a41..7633336ca 100644
--- a/spam/CHANGELOG
+++ b/spam/CHANGELOG
@@ -22,3 +22,5 @@ Converted all pages to use the new Webmin UI library, for a more consistent look
 Cleaned up the layout of all pages to improve formatted, in particular the Allowed and Denied Addresses page which now uses tabs.
 ---- Changes since 1.520 ----
 Don't show language and character set spam classification options unless the TextCat plugin is enabled, as they won't work without it.
+---- Changes since 1.590 ----
+Added a field for setting the trusted_networks parameter.
diff --git a/spam/edit_score.cgi b/spam/edit_score.cgi
index 7de5fff58..15936973f 100755
--- a/spam/edit_score.cgi
+++ b/spam/edit_score.cgi
@@ -54,6 +54,11 @@ $received = &find("num_check_received", $conf);
 print &ui_table_row($text{'score_received'},
 	&opt_field("num_check_received", $received, 5, 2));
 
+# Trusted networks
+@trusted = &find_value("trusted_networks", $conf);
+print &ui_table_row($text{'score_trusted'},
+	&ui_textarea("trusted_networks", join("\n", @trusted), 5, 70));
+
 if (&indexof("Mail::SpamAssassin::Plugin::TextCat", @plugins) >= 0) {
 	print &ui_table_hr();
 
diff --git a/spam/lang/en b/spam/lang/en
index cfd4d5925..b95855fce 100644
--- a/spam/lang/en
+++ b/spam/lang/en
@@ -63,6 +63,7 @@ score_localessel=Selected character sets ..
 score_auto=Whitelist score factor
 score_timeout=Seconds to wait for RBL queries
 score_received=Number of Received: headers to check with RBL
+score_trusted=Networks and hosts to trust
 score_describe=Test descriptions for report
 score_descr=Description
 score_err=Failed to save message scoring
diff --git a/spam/save_score.cgi b/spam/save_score.cgi
index 7a8af71e9..0ee98ac7a 100755
--- a/spam/save_score.cgi
+++ b/spam/save_score.cgi
@@ -21,6 +21,9 @@ $hits_param = &version_atleast(3.0) ? "required_score" : "required_hits";
 &parse_opt($conf, "rbl_timeout", \&timeout_check);
 &parse_opt($conf, "num_check_received", \&received_check);
 
+@trusted = grep { /\S/ } split(/\r?\n/, $in{'trusted_networks'});
+&save_directives($conf, "trusted_networks", \@trusted, 1);
+
 if (defined($in{'langs_def'})) {
 	if ($in{'langs_def'} == 2) {
 		&save_directives($conf, "ok_languages", [ ], 1);