X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/12eb056b33e1f01a63c4fcee408c9ac0d96c6b5e..89492a62a76e1bf5f5a1d2b1d9ac82b042b7ec49:/IkiWiki/Plugin/blogspam.pm

diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index 58303418f..e48ed729f 100644
--- a/IkiWiki/Plugin/blogspam.pm
+++ b/IkiWiki/Plugin/blogspam.pm
@@ -4,11 +4,13 @@ package IkiWiki::Plugin::blogspam;
 use warnings;
 use strict;
 use IkiWiki 3.00;
+use Encode;
 
 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);
 }
 
@@ -17,6 +19,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		blogspam_pagespec => {
 			type => 'pagespec',
@@ -43,26 +46,37 @@ 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;
+		$RPC::XML::ENCODING = 'utf-8';
 	};
-	if ($@) {
-		warn($@);
-		return undef;
-	}
+	error $@ if $@;
+}
+
+sub checkcontent (@) {
+	my %params=@_;
+	my $session=$params{session};
 	
- 	if (exists $config{blogspam_pagespec}) {
-		return undef
-			if ! pagespec_match($params{page}, $config{blogspam_pagespec},
-	                	location => $params{page});
+	my $spec='!admin()';
+ 	if (exists $config{blogspam_pagespec} &&
+	    length $config{blogspam_pagespec}) {
+		$spec.=" and (".$config{blogspam_pagespec}.")";
 	}
 
+	my $user=$session->param("name");
+	return undef unless pagespec_match($params{page}, $spec,
+		(defined $user ? (user => $user) : ()),
+		(defined $session->remote_addr() ? (ip => $session->remote_addr()) : ()),
+		location => $params{page});
+
 	my $url=$defaulturl;
 	$url = $config{blogspam_server} if exists $config{blogspam_server};
+
 	my $client = RPC::XML::Client->new($url);
 
 	my @options = split(",", $config{blogspam_options})
@@ -84,13 +98,13 @@ sub checkcontent (@) {
 	push @options, "exclude=stopwords";
 
 	my %req=(
-		ip => $ENV{REMOTE_ADDR},
-		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} : "",
+		ip => $session->remote_addr(),
+		comment => encode_utf8(defined $params{diff} ? $params{diff} : $params{content}),
+		subject => encode_utf8(defined $params{subject} ? $params{subject} : ""),
+		name => encode_utf8(defined $params{author} ? $params{author} : ""),
+		link => encode_utf8(exists $params{url} ? $params{url} : ""),
 		options => join(",", @options),
-		site => $config{url},
+		site => encode_utf8($config{url}),
 		version => "ikiwiki ".$IkiWiki::version,
 	);
 	my $res = $client->send_request('testComment', \%req);