X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0993933ea30f4fb28402f12a033cdd37015da427..edc9d462d06d4622dd3c49996bd455cae23a985e:/IkiWiki/Plugin/blogspam.pm

diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index 6e68a9856..cbd9859a5 100644
--- a/IkiWiki/Plugin/blogspam.pm
+++ b/IkiWiki/Plugin/blogspam.pm
@@ -4,8 +4,6 @@ package IkiWiki::Plugin::blogspam;
 use warnings;
 use strict;
 use IkiWiki 3.00;
-require RPC::XML;
-require RPC::XML::Client;
 
 my $defaulturl='http://test.blogspam.net:8888/';
 
@@ -47,6 +45,15 @@ sub getsetup () {
 
 sub checkcontent (@) {
 	my %params=@_;
+
+	eval q{
+		use RPC::XML;
+		use RPC::XML::Client;
+	};
+	if ($@) {
+		warn($@);
+		return undef;
+	}
 	
  	if (exists $config{blogspam_pagespec}) {
 		return undef
@@ -55,11 +62,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.
@@ -76,31 +83,29 @@ sub checkcontent (@) {
 	# and "buy".
 	push @options, "exclude=stopwords";
 
-	# blogspam API does not have a field for author url, so put it in
-	# the content to be checked.
-	if (exists $params{url}) {
-		$params{content}.="\n".$params{url};
-	}
-
-	my $res = $client->send_request('testComment', {
+	my %req=(
 		ip => $ENV{REMOTE_ADDR},
 		comment => $params{content},
 		subject => defined $params{subject} ? $params{subject} : "",
 		name => defined $params{author} ? $params{author} : "",
+		link => exists $params{url} ? $params{url} : "",
 		options => join(",", @options),
 		site => $config{url},
 		version => "ikiwiki ".$IkiWiki::version,
-	});
+	);
+	my $res = $client->send_request('testComment', \%req);
 
 	if (! ref $res || ! defined $res->value) {
 		debug("failed to get response from blogspam server ($url)");
 		return undef;
 	}
 	elsif ($res->value =~ /^SPAM:(.*)/) {
+		eval q{use Data::Dumper};
+		debug("blogspam server reports ".$res->value.": ".Dumper(\%req));
 		return gettext("Sorry, but that looks like spam to <a href=\"http://blogspam.net/\">blogspam</a>: ").$1;
 	}
 	elsif ($res->value ne 'OK') {
-		debug(gettext("blogspam server failure: ").$res->value);
+		debug("blogspam server failure: ".$res->value);
 		return undef;
 	}
 	else {