use warnings;
use strict;
use IkiWiki 3.00;
-require RPC::XML;
-require RPC::XML::Client;
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);
}
},
}
+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;
+ };
+ error $@ if $@;
+}
+
sub checkcontent (@) {
my %params=@_;
}
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.
# 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 {