move wrapper building loop into Wrapper.pm

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

diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index 58303418f7b4a137d43264879d20b209a13c4e93..8db3780e8888ee9c9188881e80ae26b6715436ff 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,20 @@ 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=@_;
+       my $session=$params{session};

        
        if (exists $config{blogspam_pagespec}) {
                return undef
        
        if (exists $config{blogspam_pagespec}) {
                return undef


@@ -84,7 +89,7 @@ sub checkcontent (@) {
        push @options, "exclude=stopwords";
 
        my %req=(
        push @options, "exclude=stopwords";
 
        my %req=(

-               ip => $ENV{REMOTE_ADDR},
+               ip => $session->remote_addr(),

                comment => defined $params{diff} ? $params{diff} : $params{content},
                subject => defined $params{subject} ? $params{subject} : "",
                name => defined $params{author} ? $params{author} : "",
                comment => defined $params{diff} ? $params{diff} : $params{content},
                subject => defined $params{subject} ? $params{subject} : "",
                name => defined $params{author} ? $params{author} : "",