From b6cbaee3395c55fe6ffaa3bbaf4769dce6b1edae Mon Sep 17 00:00:00 2001
From: onli <onli@paskuda.biz>
Date: Mon, 18 Mar 2019 21:48:26 +0100
Subject: [PATCH] Disable bodyclone spamblock option by default, disable for
 comments See
 https://www.cgarbs.de/blog/archives/1181-Trackbacks-in-Serendipity.html

---
 docs/NEWS                                                   | 2 ++
 .../serendipity_event_spamblock.php                         | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/NEWS b/docs/NEWS
index 478676a0..4d9be602 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -1,6 +1,8 @@
 
 Version 2.2.1-alpha2 ()
 ------------------------------------------------------------------------
+    * Allow to receive multiple trackbacks and pingbacks
+
     * Fallback for $lang variable when configuration failed to load,
       which evades some unuseful error messages (thanks @HQJaTu!)
 
diff --git a/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php b/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php
index 297a9e36..b386e826 100644
--- a/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php
+++ b/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php
@@ -25,7 +25,7 @@ class serendipity_event_spamblock extends serendipity_event
             'smarty'      => '2.6.7',
             'php'         => '4.1.0'
         ));
-        $propbag->add('version',       '1.87');
+        $propbag->add('version',       '1.88');
         $propbag->add('event_hooks',    array(
             'frontend_saveComment' => true,
             'external_plugin'      => true,
@@ -226,7 +226,7 @@ class serendipity_event_spamblock extends serendipity_event
                 $propbag->add('type', 'boolean');
                 $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_BODYCLONE);
                 $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_BODYCLONE_DESC);
-                $propbag->add('default', true);
+                $propbag->add('default', false);
                 break;
 
             case 'captchas':
@@ -1160,7 +1160,7 @@ class serendipity_event_spamblock extends serendipity_event
                         }
 
                         // Check for identical comments. We allow to bypass trackbacks from our server to our own blog.
-                        if ( $this->get_config('bodyclone', true) === true && $_SERVER['REMOTE_ADDR'] != $_SERVER['SERVER_ADDR'] && $addData['type'] != 'PINGBACK') {
+                        if ( $this->get_config('bodyclone', false) === true && $_SERVER['REMOTE_ADDR'] != $_SERVER['SERVER_ADDR'] && $addData['type'] == 'NORMAL') {
                             $query = "SELECT count(id) AS counter FROM {$serendipity['dbPrefix']}comments WHERE type = '" . $addData['type'] . "' AND body = '" . serendipity_db_escape_string($addData['comment']) . "'";
                             $row   = serendipity_db_query($query, true);
                             if (is_array($row) && $row['counter'] > 0) {