update

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

diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index cbd9859a533cf58dba27e1af20dc04368ab66e5e..f0b6cb2a2742519a2796bce8a863500f34d0d5f0 100644 (file)
--- a/IkiWiki/Plugin/blogspam.pm
+++ b/IkiWiki/Plugin/blogspam.pm
@@ -4,11 +4,13 @@ package IkiWiki::Plugin::blogspam;
 use warnings;
 use strict;
 use IkiWiki 3.00;
 use warnings;
 use strict;
 use IkiWiki 3.00;

+use Encode;

 
 my $defaulturl='http://test.blogspam.net:8888/';
 
 sub import {
        hook(type => "getsetup", id => "blogspam",  call => \&getsetup);
 
 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);
 }
 
        hook(type => "checkcontent", id => "blogspam", call => \&checkcontent);
 }
 


@@ -17,6 +19,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 +46,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


@@ -63,6 +69,7 @@ sub checkcontent (@) {
 
        my $url=$defaulturl;
        $url = $config{blogspam_server} if exists $config{blogspam_server};
 
        my $url=$defaulturl;
        $url = $config{blogspam_server} if exists $config{blogspam_server};

+

        my $client = RPC::XML::Client->new($url);
 
        my @options = split(",", $config{blogspam_options})
        my $client = RPC::XML::Client->new($url);
 
        my @options = split(",", $config{blogspam_options})


@@ -84,13 +91,13 @@ sub checkcontent (@) {
        push @options, "exclude=stopwords";
 
        my %req=(
        push @options, "exclude=stopwords";
 
        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} : "",
+               ip => $session->remote_addr(),
+               comment => encode_utf8(defined $params{diff} ? $params{diff} : $params{content}),
+               subject => encode_utf8(defined $params{subject} ? $params{subject} : ""),
+               name => encode_utf8(defined $params{author} ? $params{author} : ""),
+               link => encode_utf8(exists $params{url} ? $params{url} : ""),

                options => join(",", @options),
                options => join(",", @options),

-               site => $config{url},
+               site => encode_utf8($config{url}),

                version => "ikiwiki ".$IkiWiki::version,
        );
        my $res = $client->send_request('testComment', \%req);
                version => "ikiwiki ".$IkiWiki::version,
        );
        my $res = $client->send_request('testComment', \%req);