Changeset 47

Timestamp:

02/22/05 13:15:24

Author:

brad

Message:

Major checkin that includes despam functionality and overall comment
and ping management. Also added wordlist support, comment and trackback
passphrase options.

Files:

• trunk/plugins/spamlookup/mt-spamlookup.cgi (modified) (7 diffs)
• trunk/plugins/spamlookup/spamlookup.pl (modified) (20 diffs)
• trunk/plugins/spamlookup/tmpl/spamlookup.tmpl (modified) (10 diffs)
• trunk/plugins/spamlookup/tmpl/view_cache.tmpl (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)

trunk/plugins/spamlookup/mt-spamlookup.cgi

@@ -34 +34 @@
-
-use MT::App;
+use MT::Util qw(format_ts offset_time mark_odd_rows);
+use MT::Author qw(APPROVED BLOCKED);
-use vars qw(@ISA);
-@ISA = qw(MT::App);
@@ -48 +50 @@
-        unban_ip => \&unban_ip,
-        reset_cache => \&reset_cache,
-
+
+
+
-    ); 
-    $app->{default_mode} = 'default';
@@ -58 +62 @@
-    $app->{cfg}->set('AltTemplatePath', '');
-    $app->{requires_login} = 1;
- Configuration
+
-                              bc_uri => '?__mode=show' } ];
+    $app->{mode} = $mode;
-    $app;   
+}
+
+sub view {
+    my $app = shift;
+    my (%param) = @_;
+
+    my $query = $app->{query};
+    my $type = $query->param('_type');
+    my $Type = $type eq 'comments' ? 'Comments' : 'TrackBack Pings';
+
+    $app->add_breadcrumb("View $Type" => '?__mode=view&_type='.$type);
+
+    my $tmpl;
+    if ($type eq 'comments') {
+        $tmpl = 'comments.tmpl';
+    } else {
+        $tmpl = 'pings.tmpl';
+    }
+
+    $app->select_objects(\%param);
+
+    $app->build_page($tmpl, \%param);
+}
+
+sub despam {
+    my $app = shift;
+    my (%param) = @_;
+
+    my $query = $app->{query};
+    my $type = $query->param('_type') || 'comments';
+    my $Type = $type eq 'comments' ? 'Comments' : 'TrackBack Pings';
+
+    $app->add_breadcrumb("Despam $Type" => '?__mode=despam&_type='.$type);
+
+    $param{'type'} = $type;
+    $param{'type_'.$type} = 1;
+
+    my %to_rebuild;
+    my @ids = $query->param('is_spam');
+    my $action = $query->param('action');
+    if (@ids && ($action =~ m/Delete/)) {
+        if ($type eq 'comments') {
+            foreach (@ids) {
+                my $obj = MT::Comment->load($_);
+                next unless $obj;
+                $to_rebuild{$obj->entry_id} = 1;
+                $obj->remove;
+            }
+        } else {
+            require MT::TBPing;
+            foreach (@ids) {
+                my $obj = MT::TBPing->load($_);
+                next unless $obj;
+                $to_rebuild{$obj->tb_id} = 1;
+                $obj->remove;
+            }
+        }
+    }
+
+    $app->select_objects(\%param);
+
+    my $loop = $param{object_loop};
+
+    if (!@$loop) {
+        if ($param{redirect}) {
+            $param{message} = qq{Didn't find any spam in the last }.$param{count}.qq{ records scanned in the date range } . format_ts("%Y-%m-%d %H:%M:%S", $param{start_date}) . " through " . format_ts("%Y-%m-%d %H:%M:%S", $param{end_date}) . ". Continuing search..."; ## next obj id is }.$obj->id;
+        }
+    } else {
+        $param{message} = "The following items were identified as spam, falling in the date range: " . format_ts("%Y-%m-%d %H:%M:%S", $param{start_date}) . " through " . format_ts("%Y-%m-%d %H:%M:%S", $param{end_date});
+    }
+
+    if (%to_rebuild) {
+        require MT::Blog;
+        require MT::Entry;
+        MT::Util::start_background_task(sub {
+            my %blog_rebuild;
+
+            foreach my $id (keys %to_rebuild) {
+                if ($type eq 'comments') {
+                    my $entry = MT::Entry->load($id);
+                    next unless $entry;
+                    $app->rebuild_entry(Entry => $id, BuildDependencies => 1);
+                    $blog_rebuild{$entry->blog_id} = 1;
+                } else {
+                    my $tb = MT::Trackback->load($id);
+                    next unless $tb;
+                    my $blog = MT::Blog->load($tb->blog_id);
+                    $blog_rebuild{$tb->blog_id} = 1;
+                    if ($tb->entry_id) {
+                        $app->rebuild_entry(Entry => $tb->entry_id);
+                    } else {
+                        $app->_rebuild_entry_archive_type(
+                            Entry => undef, Blog => $blog,
+                            Category => MT::Category->load($tb->category_id),
+                            ArchiveType => 'Category'
+                        );
+                    }
+                    if ($app->{cfg}->GenerateTrackBackRSS) {
+                        ## Now generate RSS feed for this trackback item.
+                        my $rss = _generate_rss($tb, 10);
+                        my $base = $blog->archive_path;
+                        my $feed = File::Spec->catfile($base, $tb->rss_file || $tb->id . '.xml');   
+                        my $fmgr = $blog->file_mgr;
+                        $fmgr->put_data($rss, $feed);
+                    }
+                }
+            }
+
+            $app->rebuild_indexes( BlogID => $_ ) foreach keys %blog_rebuild;
+        });
+    }   
+
+    $app->build_page('despam.tmpl', \%param);
+}
+
+sub select_objects {
+    my $app = shift;
+    my ($param) = @_;
+
+    my $query = $app->{query};
+    my $type = $query->param('_type') || 'comments';
+
+    my $offset = $query->param('offset') || 0;
+    my $limit = $query->param('limit') || 25;
+    my $filter = $app->{mode} eq 'despam';
+
+    my $iter;
+    if ($type eq 'comments') {
+        require MT::Comment;
+        my $terms = {};
+        $terms->{visible} = 1 if $filter;
+        my $args = { offset => $offset, limit => ($limit*10)+1, 'sort' => 'created_on', direction => 'descend' };
+        $iter = MT::Comment->load_iter($terms, $args);
+    } else {
+        require MT::TBPing;
+        require MT::Trackback;
+        my $terms = {};
+        my $args = { offset => $offset, limit => ($limit * 10)+1, 'sort' => 'created_on', direction => 'descend' };
+        $iter = MT::TBPing->load_iter($terms, $args);
+    }
+
+    my @loop;
+    require MT::Callback;
+    my $cb = new MT::Callback(method => 'Despam');
+    my (%blogs, $obj, $start_date, $end_date);
+    my $count = 0;
+    while ($obj = $iter->()) {
+        $start_date = $obj->created_on unless defined $start_date;
+        $end_date = $obj->created_on;
+        $offset++; $count++;
+        last if $count == ($limit * 10);
+        next if ($type ne 'comments') && (($obj->created_by || 0) == 1) && $filter;
+        next unless $obj->ip || $filter;  # objects without an ip address aren't very despammable
+        my $data = $obj->column_values;
+        my $blog_id = $obj->blog_id;
+        my $blog;
+        if ($blogs{$blog_id}) {
+            $blog = $blogs{$blog_id};
+        } else {
+            $blog = MT::Blog->load($blog_id);
+            $blogs{$blog_id} = $blog;
+        }
+        if ($filter) {
+            $cb->error('');
+            my $result = MT::Plugin::SpamLookup::filter($cb, $app, $obj);
+            my $action;
+
+            if ($type eq 'comments') {
+                if ($result) {
+                    next if $obj->visible;
+                }
+            } else {
+                if ($result) {
+                    next unless $obj->created_by;
+                }
+                $result = 1 if $obj->created_by;
+            }
+            $action = $result ? 'Moderate' : 'Block';
+            $data->{result} = $action;
+            $data->{"action_$action"} = 1;
+            $data->{reason} = $cb->errstr;
+        }
+
+        my $text;
+        if ($type eq 'comments') {
+            $data->{excerpt} = (substr($obj->text(), 0, 125)
+                             . (length($obj->text) > 125 ? "..." : ""));
+            $data->{author_display} = $data->{author};
+            $data->{author_display} = substr($data->{author_display}, 0, 25) . '...'
+                if $data->{author_display} && $data->{author_display} =~ m(\S{25,});
+            my $entry = MT::Entry->load($obj->entry_id());
+            $data->{entry_title} = $entry->title() || $entry->text || "";
+            $data->{entry_title} = substr($data->{entry_title}, 0, 25) . '...'
+                if $data->{entry_title} && $data->{entry_title} =~ m(\S{25,});
+            $data->{commenter_id} = $obj->commenter_id() if $obj->commenter_id();
+            my $cmntr = MT::Author->load({ id => $obj->commenter_id(),
+                                           type => MT::Author::COMMENTER });
+            if ($cmntr) {
+                $data->{email_hidden} = $cmntr && $cmntr->is_email_hidden();
+                require MT::Permission;
+            
+                my $status = $cmntr->status($blog_id);
+                $data->{commenter_approved} = ($cmntr->status($blog_id) == APPROVED);
+                $data->{commenter_blocked} = ($cmntr->status($blog_id) == BLOCKED);
+            }
+            $text = $obj->url . ' ' . $obj->text;
+        } else {
+            my $tb = MT::Trackback->load($obj->tb_id);
+            my ($entry, $cat);
+            if ($tb->entry_id) {
+                $entry = MT::Entry->load($tb->entry_id);
+                $data->{entry_id} = $entry->id;
+            } elsif ($tb->category_id) {
+                $cat = MT::Category->load($tb->category_id);
+                $data->{category_id} = $cat->id;
+            }
+            $data->{tb_blog_name} = $obj->blog_name;
+
+            $text = $obj->source_url . ' ' . $obj->excerpt;
+            $data->{excerpt} = (substr($obj->excerpt(), 0, 125)
+                             . (length($obj->excerpt()) > 125 ? "..." : ""));
+            if ($entry) {
+                $data->{entry_title} = $entry->title() || $entry->text || "";
+                $data->{entry_title} = substr($data->{entry_title}, 0, 25) . '...'
+                    if $data->{entry_title} && $data->{entry_title} =~ m(\S{25,});
+            }
+            $data->{category_title} = $cat->label if $cat;
+        }
+        $data->{blog_name} = $blog->name;
+        $data->{created_on_relative_date} = relative_date(ts2epoch($blog->id, $obj->created_on()), offset_time(time, $blog), $obj->created_on, "%Y-%m-%d");
+        if ($filter) {
+            my @urls = MT::Plugin::SpamLookup::extract_urls($text, 2);
+            my @domain_loop;
+            push @domain_loop, { domain => $_ } foreach @urls;
+            $data->{domain_loop} = \@domain_loop;
+        }
+        push @loop, $data;
+        last if scalar(@loop) == $limit;
+    }
+    $param->{count} = $count;
+    $param->{start_date} = $start_date;
+    $param->{end_date} = $end_date;
+    mark_odd_rows(\@loop);
+    if (!@loop) {
+        if ($obj) {
+            $param->{redirect} = 1;
+        }
+    } else {
+        $param->{more} = $obj ? 1 : 0;
+    }
+    $param->{object_loop} = \@loop;
+    $param->{offset} = $offset;
+    $param->{limit} = $limit;
+}
+
+use Time::Local qw( timegm );
+sub ts2epoch {
+    my ($blog, $ts) = @_;
+    my ($yr, $mo, $dy, $hr, $mn, $sc) = unpack('A4A2A2A2A2A2A2', $ts);
+    $ts = timegm($sc, $mn, $hr, $dy, $mo-1, $yr-1900);
+}
+
+sub relative_date {
+    my ($ts1, $ts2, $ts, $fmt) = @_;
+    # make sure ts2 is always > ts1
+    ($ts2, $ts1) = ($ts1, $ts2) if $ts2 < $ts1;
+    my $delta = $ts2 - $ts1;
+    if ($delta <= 60) {
+        "Less than 1 minute";
+    } elsif ($delta <= 86400) {
+        # less than 1 day
+        my $hours = int($delta / 3600);
+        my $min = int(($delta % 3600) / 60);
+        my $result;
+        if ($hours && $min) {
+            $result = sprintf('%d hour' . ($hours > 1 ? 's' : '') . ', %d minute' . ($min > 1 ? 's' : '') . ' ago', $hours, $min);
+        } elsif ($hours) {
+            $result = sprintf('%d hour' . ($hours > 1 ? 's' : '') . ' ago', $hours);
+        } elsif ($min) {
+            $result = sprintf('%d minute' . ($min > 1 ? 's' : '') . ' ago', $min);
+        }
+        $result;
+    } elsif ($delta <= 604800) {
+        # less than 1 week
+        my $days = int($delta / 86400);
+        my $hours = int(($delta % 86400) / 3600);
+        my $result;
+        if ($days && $hours) {
+            $result = sprintf('%d day' . ($days > 1 ? 's' : '') . ', %d hour' . ($hours > 1 ? 's' : '') . ' ago', $days, $hours);
+        } elsif ($days) {
+            $result = sprintf('%d day' . ($days > 1 ? 's' : '') . ' ago', $days);
+        } elsif ($hours) {
+            $result = sprintf('%d hour' . ($hours > 1 ? 's' : '') . ' ago', $hours);
+        }
+        $result;
+    } else {
+        format_ts($fmt, $ts);
+    }
+}
+
+sub _generate_rss {
+    my($tb, $lastn) = @_;
+    my $rss = <<RSS;
+<rss version="0.91"><channel>
+<title>@{[ $tb->title ]}</title>
+<link>@{[ $tb->url || '' ]}</link>
+<description>@{[ $tb->description || '' ]}</description>
+<language>en-us</language>
+RSS
+    my %arg;
+    if ($lastn) {
+        %arg = ('sort' => 'created_on', direction => 'descend',
+                limit => $lastn);
+    }
+    my $iter = MT::TBPing->load_iter({ tb_id => $tb->id }, \%arg);
+    while (my $ping = $iter->()) {
+        $rss .= sprintf qq(<item>\n<title>%s</title>\n<link>%s</link>\n),
+            encode_xml($ping->title), encode_xml($ping->source_url);
+        if ($ping->excerpt) {
+            $rss .= sprintf qq(<description>%s</description>\n),
+                encode_xml($ping->excerpt);
+        }
+        $rss .= qq(</item>\n);
+    }
+    $rss .= qq(</channel>\n</rss>);
+    $rss;
-}
-
@@ -122 +453 @@
-    my $service=$data->{cache_ip_infoservice};
-    if($service =~ /%ip%/) {
-       
-           my $dest=
-           $dest=~
-           $_->{iptext}=
-       
+        
+            my $dest = 
+            $dest =~ 
+            $_->{iptext} = 
+        
-    }
-    $param{cache_loop} = \@data;
@@ -218 +549 @@
-        @domains = MT::Plugin::SpamLookup::extract_urls('http://' . $domain)
-            if !@domains;
-my 
+
-            if ($domain =~ m/^(\d+)\.(\d+)\.(\d+)\.(\d+)$/) {
-                $domain = "$4.$3.$2.$1";
@@ -238 +569 @@
-    my $app = shift;
-    my (%param) = @_;
+
+    $app->add_breadcrumb("Configuration" => '?__mode=show');
+
-    my @config = MT::Plugin::SpamLookup->instance->config_params;
-    my $data = MT::Plugin::SpamLookup->instance->get_config_hash();
-    $param{$_} = $data->{$_} foreach @config;
+    if (defined $param{"pingip_moderate"}) {
+        $param{"pingip_moderate_".$param{"pingip_moderate"}} = 1;
+    }
+    if (defined $param{"pingip_block"}) {
+        $param{"pingip_block_".$param{"pingip_block"}} = 1;
+    }
+    if (defined $param{"tbpass_entryfield"}) {
+        $param{"tbpass_entryfield_".$param{"tbpass_entryfield"}} = 1;
+    }
+    if (defined $param{"commentpass_entryfield"}) {
+        $param{"commentpass_entryfield_".$param{"commentpass_entryfield"}} = 1;
+    }
-    if (defined $MT::Plugin::Moderate::VERSION) {
-        $param{can_moderate_pings} = 1;
-    }
+
-    $app->build_page('spamlookup.tmpl', \%param);
-}
@@ -250 +597 @@
-    my $app = shift;
-    my $auth = $app->{author};
-
+uery
-    my $pd = MT::Plugin::SpamLookup->instance->get_config_obj;
-    my $config = $pd->data() || {};
-    my @config = MT::Plugin::SpamLookup->instance->config_params;
-    foreach (@config) {
-
+uery
-    }
-    $pd->data($config);

trunk/plugins/spamlookup/spamlookup.pl

@@ -11 +11 @@
-    name => 'SpamLookup',
-    config_link => 'mt-spamlookup.cgi',
-
+.
-    doc_link => undef
-});
@@ -17 +17 @@
-MT->add_callback('CommentFilter', 6, $plugin, \&filter);
-MT->add_callback('TBPingFilter', 6, $plugin, \&filter);
+MT->add_callback('TBPingThrottleFilter', 6, $plugin, \&tbfilter);
-
-use vars qw($DEBUG);
@@ -33 +34 @@
-    qw( comment_filter ping_filter
-        allow_auth allow_urlless allow_priorurls
-moderate pingip_che
+enabled pingip_moderate pingip_blo
-        ipbl_enabled ipbl_moderate ipbl_service
-        domainbl_enabled domainbl_moderate domainbl_service
@@ -40 +41 @@
-        headers_enabled headers_moderate headers_ignore
-        urlcount_enabled urlcount_moderate_limit urlcount_block_limit
+        commentpass_enabled commentpass_formfield commentpass_entryfield commentpass_text commentpass_moderate
+        tbpass_enabled tbpass_formfield tbpass_entryfield tbpass_text tbpass_moderate
+        wordlist_moderate wordlist_block
-    );
-}
@@ -79 +83 @@
-    $data->{allow_urlless} = 0 unless exists $data->{allow_urlless};
-    $data->{allow_priorurls} = 0 unless exists $data->{allow_priorurls};
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-    $data->{ipbl_enabled} = 1 unless exists $data->{ipbl_enabled};
@@ -113 +127 @@
-    $data->{proxycheck_autoban} = 0 unless exists $data->{proxycheck_autoban};
-
+    $data->{wordlist_moderate} ||= '';
+    $data->{wordlist_block} ||= '';
+
-    $data;
+}
+
+sub tbfilter {
+    my ($eh, $app, $obj) = @_;
+
+    my $plugin = $eh->{plugin};
+    my $data = $plugin->get_config_hash();
+    if ($data->{tbpass_enabled} && $obj->entry_id) {
+        my $text;
+        if (my $field = $data->{tbpass_entryfield}) {
+            require MT::Entry;
+            my $entry = MT::Entry->load($obj->entry_id);
+            if ($field eq 'title') {
+                $text = $entry->title;
+            } elsif ($field eq 'excerpt') {
+                $text = $entry->excerpt;
+            } elsif ($field eq 'keywords') {
+                $text = $entry->keywords;
+            } elsif ($field eq 'extended') {
+                $text = $entry->text_more;
+            }
+        } else {
+            $text = $data->{tbpass_text};
+        }
+        $text =~ s/^\s*//s;
+        $text =~ s/\s*$//s;
+        $obj->passphrase($text);
+    }
+
+    1;
-}
-
@@ -120 +167 @@
-
-    # pull these from user configuration settings...
+    my $plugin = $eh->{plugin};
-    my $data = $plugin->get_config_hash();
+
+    my $method = $eh->{method};
-
-    my (@urls, $blog, $nurls);
@@ -129 +179 @@
-
-        # comment
-@urls = extract_urls($obj->text, 0, \$nurls
-push @urls, extract_urls($obj->url) if $obj->url
+my $text = ($obj->text || '') . ' ' . ($obj->url || ''
+@urls = extract_urls($text, 0, \$nurls)
-        $data->{source_url} = $obj->url;
-
@@ -149 +199 @@
-        return 1 unless $data->{ping_filter};
-
-b
+B
-
-        if ($data->{domainbl_enabled} || $data->{urlcount_enabled}) {
-@urls = extract_urls($obj->excerpt, 0, \$nurls
-push @urls, extract_urls($obj->source_url) if $obj->source_url
+my $text = ($obj->excerpt || '') . ' ' . ($obj->source_url || ''
+@urls = extract_urls($text, 0, \$nurls)
-        }
-        $data->{source_url} = $obj->source_url;
-
+
+
+
+
-    $data->{__urls} = \@urls;
-    $data->{__nurls} = $nurls;
@@ -176 +229 @@
-
-    my @tests;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    my ($result, @errors);
-    foreach (@tests) {
-
-$eh->errstr =~ m/\w/
+[0]->
+(defined $eh->errstr) && ($eh->errstr =~ m/\w/)
-            push @errors, $eh->errstr;
-            $eh->error(undef);
@@ -208 +280 @@
-                # MT-Moderate:
-                $obj->created_by(1);
-                $obj->save;
-            } else {
-                # trackbacks can't be moderated right now...
@@ -219 +290 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-}
-unless ($pdata) {
-$pdata = new MT::PluginData
-$pdata->plugin($plugin->name
-$pdata->key('cache');
-}
-$pdata->data($cache)
-$pdata->save;
+    unless ($pdata) {
+        $pdata = new MT::PluginData;
+    $pdata->plugin($plugin->name)
+    $pdata->key('cache'
+}
+    $pdata->data($cache);
+    $pdata->save
+}
-    }
-
@@ -260 +333 @@
-## Each returns one of three states:  0 to reject, 1 to accept, undef
-## to ignore, allowing the next test to run.
+
+sub wordlist_check {
+    my ($eh, $app, $obj, $data) = @_;
+
+    my $text = '';
+    if ($data->{__type} eq 'comment') {
+        $text = join "\n",
+            "name:". ($obj->author || ''),
+            "email:" . ($obj->email || ''),
+            "url:" . ($obj->url || ''),
+            "text:" . ($obj->text || '');
+    } else {
+        $text = join "\n",
+            "blog:". ($obj->blog_name || ''),
+            "title:" . ($obj->title || ''),
+            "url:" . ($obj->source_url || ''),
+            "text:" . ($obj->excerpt || '');
+    }
+
+    my $decodedtext = decode_entities($text);
+
+    my $match;
+    if ($data->{wordlist_block}) {
+        $match = wordlist_match($text, $data->{wordlist_block});
+        $match ||= wordlist_match($decodedtext, $data->{wordlist_block});
+        if ($match) {
+            $eh->error("Blocking ".$data->{__type}." on blog id ".$obj->blog_id." based on wordlist match: ".$match);
+            return BLOCK;
+        }
+    }
+
+    if ($data->{wordlist_moderate}) {
+        $match = wordlist_match($text, $data->{wordlist_moderate});
+        $match ||= wordlist_match($decodedtext, $data->{wordlist_moderate});
+        if ($match) {
+            $eh->error("Moderating ".$data->{__type}." on blog id ".$obj->blog_id." based on wordlist match: ".$match);
+            return MODERATE;
+        }
+    }
+
+    return IGNORE;
+}
+
+sub wordlist_match {
+    my ($text, $patterns) = @_;
+
+    $text ||= '';
+    my @patt = split /[\r\n]+/, $patterns;
+    foreach my $patt (@patt) {
+        $patt =~ s/^\s+//s;
+        $patt =~ s/\s+$//s;
+        next if $patt eq '';
+        if ($patt =~ m!^/!) {
+            my $re = $patt;
+            my ($opt) = $re =~ m!/([^/]*)$!;
+            $re =~ s!^/!!;
+            $re =~ s!/[^/]*$!!;
+            $re = '(?'.$opt.':'.$re.')' if $opt;
+            $re = eval { qr/$re/ };
+            $re = '\b' . quotemeta($patt) . '\b' if $@;
+            return 'Match on pattern: '.$patt if $text =~ m/$re/;
+        } else {
+            my $re = '\b' . quotemeta($patt) . '\b';
+            return 'Match on phrase: '.$patt if $text =~ m/$re/i;
+        }
+    }
+    0;
+}
+
+sub tbpass_check {
+    my ($eh, $app, $obj, $data) = @_;
+
+    
+    return IGNORE;
+}
+
+sub commentpass_check {
+    my ($eh, $app, $obj, $data) = @_;
+
+    my $formfield = $data->{commentpass_formfield};
+    my $entryfield = $data->{commentpass_entryfield};
+    my $text = $data->{commentpass_text};
+
+    return IGNORE unless $formfield;
+
+    my $inpass = $app->{query}->param($formfield);
+    return BLOCK unless defined $inpass;
+
+    if ($entryfield) {
+        my $entry = MT::Entry->load($obj->entry_id);
+        if ($entryfield eq 'title') {
+            $text = $entry->title;
+        } elsif ($entryfield eq 'excerpt') {
+            $text = $entry->excerpt;
+        } elsif ($entryfield eq 'keywords') {
+            $text = $entry->keywords;
+        } elsif ($entryfield eq 'extended') {
+            $text = $entry->text_more;
+        }
+    }
+
+    foreach ($text, $inpass) {
+        s/^\s*//s;
+        s/\s*$//s;
+    }
+
+    return ACCEPT if lc($text) eq lc($inpass);
+
+    return $data->{commentpass_moderate} ? MODERATE : BLOCK;
+}
-
-sub pingip_check {
@@ -274 +457 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    $eh->error("$action TrackBack ping for blog " . $obj->blog_id .
-        " since domain IP does not match ping IP for source URL " .
-        $obj->source_url . "; domain IP: $domainip; ping IP: $pingip");
-
+
+
-}
-
@@ -418 +611 @@
-
-    my $type = $data->{__type};
-
+ || 0
-    if ($nurls >= $data->{urlcount_block_limit}) {
-        $eh->error("Blocking $type on blog "  . $obj->blog_id .
@@ -463 +656 @@
-    my $remote_ip = $obj->ip;
-    foreach my $url (@$urls) {
+        next if $url !~ m/\./;  # ignore domain if it is just a single word
-        if ($url =~ m/^(\d+)\.(\d+)\.(\d+)\.(\d+)$/) {
-            $url = "$4.$3.$2.$1";
@@ -503 +697 @@
-sub checkdns {
-    my ($name) = @_;
+    require MT::Request;
+    my $cache = MT::Request->instance->cache('checkdns_cache') || {};
+    return $cache->{$name} if exists $cache->{$name};
-    my $iaddr = gethostbyname($name);
-    return 0 unless $iaddr;
-    require Socket;
-    my $ip = Socket::inet_ntoa($iaddr);
+    $cache->{$name} = $ip;
+    MT::Request->instance->cache('checkdns_cache', $cache);
-    return $ip ? $ip : undef;
-}
-
-sub extract_urls {
-
-
+
+
+
-    # unmunge so we can see encoded urls as well
-    $str = lc decode_entities($str);
@@ -523 +723 @@
-        $domain =~ s/^www\.//s;
-        next unless $domain;
+        next unless $domain =~ m/\./;
-        my @parts = split /\./, $domain;
-        next unless @parts;
@@ -532 +733 @@
-            next;
-        }
-
+
+
-        $$total++ if(defined($total));
-my $last = $#parts;
-my $start = length($parts[$last]) < 3 ? 2 : 1
-if ($start > $last) {
-!$seen{$domain}
+if ($mode == 0) {  # default mode, replicate for all subdomains
+    my $last = $#parts
+    my $start = length($parts[$last]) < 3 ? 2 : 1;
+$start > $last
-                $seen{$domain} = 1;
-                push @urls, $domain;
-            }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        }
-    }
@@ -553 +758 @@
-}
-
-# yanked from HTML::Entities, since some users don't have the module
-sub decode_entities {
-    my ($str) = @_;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-

trunk/plugins/spamlookup/tmpl/spamlookup.tmpl

@@ -22 +22 @@
-
-<p>
-
-
-
+
+
-</p>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    <input type="hidden" name="__mode" value="save" />
-
@@ -41 +56 @@
-    </p>
-
-O
-
-
-Don't filter authenticated comments
+