noticed a problem

[git.ikiwiki.info.git] / IkiWiki / Plugin / blogspam.pm

diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index c482a5ae169b5c043795163d5586c90467aafef7..626c8ec42acc8f69297d416ef358e66702a153b3 100644 (file)
--- 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);
 
 sub import {
        hook(type => "getsetup", id => "blogspam",  call => \&getsetup);

+       hook(type => "checkconfig", id => "blogspam", call => \&checkconfig);

        hook(type => "checkcontent", id => "blogspam", call => \&checkcontent);
 }
 
        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;
        };
        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
        
        if (exists $config{blogspam_pagespec}) {
                return undef


@@ -62,11 +65,11 @@ sub checkcontent (@) {
        }
 
        my $url=$defaulturl;
        }
 
        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 $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.
 
        # Allow short comments and whitespace-only edits, unless the user
        # has overridden min-words themselves.


@@ -83,16 +86,16 @@ sub checkcontent (@) {
        # and "buy".
        push @options, "exclude=stopwords";
 
        # and "buy".
        push @options, "exclude=stopwords";
 

-       my %req={
+       my %req=(

                ip => $ENV{REMOTE_ADDR},
                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} : "",
                options => join(",", @options),
                site => $config{url},
                version => "ikiwiki ".$IkiWiki::version,
                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) {
        my $res = $client->send_request('testComment', \%req);
 
        if (! ref $res || ! defined $res->value) {