Changeset 85

Timestamp:

04/11/05 11:36:46

Author:

brad

Message:

Added default check to make sure entry/category is still accepting pings.
Fixed bug where moderated TrackBack is lost.

Files:

• trunk/plugins/spamlookup/spamlookup.pl (modified) (3 diffs)

trunk/plugins/spamlookup/spamlookup.pl

@@ -223 +223 @@
-
-    my @tests;
+    push @tests, [\&validping_check, 'ALlowed ping check']
+        if ($data->{__type} ne 'ping') && ($method ne 'Despam') && ($method ne 'Test');
-    push @tests, [\&commentpass_check, 'Comment Passphrase']
-        if $data->{commentpass_enabled} && ($data->{__type} eq 'comment')
@@ -283 +285 @@
-                # MT-Moderate:
-                $obj->created_by(1);
+                $obj->save;  # save this now since we're returning 0
-            } else {
-                # trackbacks can't be moderated right now...
@@ -337 +340 @@
-## to ignore, allowing the next test to run.
-
+sub validping_check {
+    my ($eh, $app, $obj, $data) = @_;
+
+    require MT::Trackback;
+    my $tb = MT::Trackback->load( $obj->tb_id );
+    if (!$tb) {
+        # this is merely a redundant assertion since MT does this
+        # check for us.
+        return BLOCK;
+    }
+
+    if ($tb->entry_id) {
+        my $entry = MT::Entry->load($tb->entry_id);
+        if ($entry && !$entry->allow_pings) {
+            $eh->error("Blocking ".$data->{__type}." on blog id ".$obj->blog_id." for entry id ".$tb->entry_id." since it no longer allows pings.");
+            return BLOCK;
+        }
+    } elsif ($tb->category_id) {
+        my $cat = MT::Category->load($tb->category_id);
+        if ($cat && !$cat->allow_pings) {
+            $eh->error("Blocking ".$data->{__type}." on blog id ".$obj->blog_id." for category id ".$tb->category_id." since it no longer allows pings.");
+            return BLOCK;
+        }
+    }
+    IGNORE;
+}
+
-sub wordlist_check {
-    my ($eh, $app, $obj, $data) = @_;