sub import {
hook(type => "getsetup", id => "blogspam", call => \&getsetup);
+ hook(type => "checkconfig", id => "blogspam", call => \&checkconfig);
hook(type => "checkcontent", id => "blogspam", call => \&checkcontent);
}
},
}
-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
}
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";
- my %req={
+ my %req=(
ip => $ENV{REMOTE_ADDR},
comment => $params{content},
subject => defined $params{subject} ? $params{subject} : "",
options => join(",", @options),
site => $config{url},
version => "ikiwiki ".$IkiWiki::version,
- };
- my $res = $client->send_request('testComment', %req);
+ );
+ my $res = $client->send_request('testComment', \%req);
if (! ref $res || ! defined $res->value) {
debug("failed to get response from blogspam server ($url)");