X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ef856a5f7a4c893dde5a893971e4686d4c30c8f4..80edf46ff216a547676de9e7902072777f715a35:/IkiWiki/Plugin/blogspam.pm?ds=inline

diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index 8552f3a1b..626c8ec42 100644
--- a/IkiWiki/Plugin/blogspam.pm
+++ b/IkiWiki/Plugin/blogspam.pm
@@ -9,6 +9,7 @@ my $defaulturl='http://test.blogspam.net:8888/';
 
 sub import {
 	hook(type => "getsetup", id => "blogspam",  call => \&getsetup);
+	hook(type => "checkconfig", id => "blogspam", call => \&checkconfig);
 	hook(type => "checkcontent", id => "blogspam", call => \&checkcontent);
 }
 
@@ -43,17 +44,19 @@ sub getsetup () {
 		},
 }
 
-sub checkcontent (@) {
-	my %params=@_;
-
+sub checkconfig () {
+	# This is done at checkconfig time because printing an error
+	# if the module is missing when a spam is posted would not
+	# let the admin know about the problem.
 	eval q{
 		use RPC::XML;
 		use RPC::XML::Client;
 	};
-	if ($@) {
-		warn($@);
-		return undef;
-	}
+	error $@ if $@;
+}
+
+sub checkcontent (@) {
+	my %params=@_;
 	
  	if (exists $config{blogspam_pagespec}) {
 		return undef
@@ -62,11 +65,11 @@ sub checkcontent (@) {
 	}
 
 	my $url=$defaulturl;
-	$url = $params{blogspam_server} if exists $params{blogspam_server};
+	$url = $config{blogspam_server} if exists $config{blogspam_server};
 	my $client = RPC::XML::Client->new($url);
 
-	my @options = split(",", $params{blogspam_options})
-		if exists $params{blogspam_options};
+	my @options = split(",", $config{blogspam_options})
+		if exists $config{blogspam_options};
 
 	# Allow short comments and whitespace-only edits, unless the user
 	# has overridden min-words themselves.
@@ -85,7 +88,7 @@ sub checkcontent (@) {
 
 	my %req=(
 		ip => $ENV{REMOTE_ADDR},
-		comment => $params{content},
+		comment => defined $params{diff} ? $params{diff} : $params{content},
 		subject => defined $params{subject} ? $params{subject} : "",
 		name => defined $params{author} ? $params{author} : "",
 		link => exists $params{url} ? $params{url} : "",