Merge remote branch 'smcv/unescaped-meta'

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

diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index cbd9859a533cf58dba27e1af20dc04368ab66e5e..c4e5cf390cb397a994414bf718c135b4bf498c22 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);
 }
 


@@ -17,6 +18,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => 0,
                plugin => {
                        safe => 1,
                        rebuild => 0,

+                       section => "auth",

                },
                blogspam_pagespec => {
                        type => 'pagespec',
                },
                blogspam_pagespec => {
                        type => 'pagespec',


@@ -43,17 +45,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


@@ -85,7 +89,7 @@ sub checkcontent (@) {
 
        my %req=(
                ip => $ENV{REMOTE_ADDR},
 
        my %req=(
                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} : "",
                subject => defined $params{subject} ? $params{subject} : "",
                name => defined $params{author} ? $params{author} : "",
                link => exists $params{url} ? $params{url} : "",