Fixes and updates for serendipity_event_spamblock by DLange (2.0 branch)

[PATCH 1/4] remove serendipity_serverOffsetHour() workaround as this
 function is now in core

[PATCH 2/4] remove blogg.de anti-spamlist support as it has been
 discontinued

[PATCH 3/4] proper locking of .htaccess file to prevent race
 condition and partial file over-writes

[PATCH 4/4] allow multiple Deny From lines in .htaccess so more IPs
 can be simultaneously  blocked for busy sites

plugins/serendipity_event_spamblock/UTF-8/lang_cn.inc.php

@@ -85,8 +85,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', '使用Spamblock插件解除对该网址的屏蔽');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_EMAIL', '使用Spamblock插件解除对该电子邮件地址的屏蔽');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', '使用blogg.de黑名单对网址进行过滤');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', '已被blogg.de黑名单过滤掉');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE', '回复内容和文章标题相同');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE', '自动拒绝那些回复内容和文章标题完全相同的回复');

plugins/serendipity_event_spamblock/UTF-8/lang_cs.inc.php

@@ -95,8 +95,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL',		'Zrušit blokování této URL adresy');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_EMAIL',		'Zrušit blokování této e-mailové adresy');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST',		'Aktivovat filtraci URL adres z balcklistu blogg.de');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST',		'Zamítnuto blacklistem blogg.de');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE',		'Nadpis komentáře je stejný jako jeho tělo');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE',		'Odmítne komentáře, které v těle obsahují pouze nadpis.');

plugins/serendipity_event_spamblock/UTF-8/lang_cz.inc.php

@@ -95,8 +95,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL',		'Zrušit blokování této URL adresy');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_EMAIL',		'Zrušit blokování této e-mailové adresy');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST',		'Aktivovat filtraci URL adres z balcklistu blogg.de');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST',		'Zamítnuto blacklistem blogg.de');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE',		'Nadpis komentáře je stejný jako jeho tělo');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE',		'Odmítne komentáře, které v těle obsahují pouze nadpis.');

plugins/serendipity_event_spamblock/UTF-8/lang_da.inc.php

@@ -86,8 +86,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_AUTHOR', 'Fjern blokering af denne forfatter vha Spamblock plugin');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', 'Fjern blokering af denne URL vha Spamblock plugin');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', 'Aktiver URL filtrering vha blogg.de blackliste');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', 'Filtreret vha blogg.de blackliste');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE', 'Indhold = titel kommentar');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE', 'Afvis kommentarer hvor indholdet er det samme som titel');

plugins/serendipity_event_spamblock/UTF-8/lang_de.inc.php

@@ -85,7 +85,6 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', 'Blockade dieser URL via Spamschutz aufheben');
         @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_EMAIL', 'Blockade dieser E-Mail via Spamschutz aufheben');
 
-        @define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', 'URL-Filterung anhand der blogg.de Blacklist aktivieren');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE', 'Artikeltitel ist derselbe wie der Kommentar!');
         @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE', 'Kommentare abweisen, die als Text nur den Artikeltitel enthalten');
 
@@ -135,7 +134,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_SERVER_AKISMET_ANON', 'Akismet (anonymisiert)');
 
 // Next lines were translated on 2009/06/03
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', 'durch blogg.de Blacklist gefiltert');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_TRACKBACKIPVALIDATION_URL_EXCLUDE', 'URLs von IP Validatierung ausnehmen');
 @define('PLUGIN_EVENT_SPAMBLOCK_TRACKBACKIPVALIDATION_URL_EXCLUDE_DESC', 'URLs, die von der IP Validatierung ausgeschlossen werden sollen. ' . PLUGIN_EVENT_SPAMBLOCK_FILTER_URLS_DESC);

plugins/serendipity_event_spamblock/UTF-8/lang_es.inc.php

@@ -86,8 +86,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', 'Desbloquear estea URL a través de la extensión Spamblock');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_EMAIL', 'Desbloquear este correo electrónico a través de la extensión Spamblock');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', 'Activar el filtrado de URL através de la lista negra blogg.de');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', 'Filtrado a través de la lista negra blogg.de');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE', 'Titulo de la entrada igual al comentario');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE', 'Rechaza comentarios que sólo contengan título');

plugins/serendipity_event_spamblock/UTF-8/lang_fr.inc.php

@@ -91,8 +91,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_ADD_URL', 'Bloquer cette adresse à l\'aide du plugin Spamblock');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_AUTHOR', 'Débloquer cet auteur dans le plugin Spamblock');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', 'Débloquer cette adresse dans le plugin Spamblock');
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', 'Activer le filtrage d\'adresse par la blacklist de blogg.de');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', 'Adresse filtrée par la blacklist de blogg.de');
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE', 'Titre du billet égal commentaire');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE', 'Rejeter les commentaires qui ne contiennent que le titre du billet');
 @define('PLUGIN_EVENT_SPAMBLOCK_TRACKBACKURL', 'Vérifier les adresses des rétroliens');

plugins/serendipity_event_spamblock/UTF-8/lang_ja.inc.php

@@ -92,8 +92,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', 'この URL はスパムプロテクタープラグインでブロックしない');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_EMAIL', 'この電子メールはスパムプロテクタープラグインでブロックしない');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', 'blogg.de ブラックリストによる URL フィルタリングを有効にする');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', 'blogg.de ブラックリストによるフィルタリング');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE', 'エントリの題名とコメントが同じ');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE', 'エントリの題名のみを含むコメントを拒否する');

plugins/serendipity_event_spamblock/UTF-8/lang_nl.inc.php

@@ -88,8 +88,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', 'Deblokkeer deze URL via deSpamblock plugin');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_EMAIL', 'Deblokkeer deze E-mail via deSpamblock plugin');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', 'Activeer url filtering door blogg.de Blacklist');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', 'Gefilterd door blogg.de Blacklist');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE', 'Titel is dezelfde als het commentaar');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE', 'Weiger commentaar waarbij de titel dezelfde is als de inhoud.');

plugins/serendipity_event_spamblock/UTF-8/lang_pl.inc.php

@@ -86,8 +86,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_AUTHOR', 'Odblokuj tego autora we wtyczce Obrona przed spamem');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', 'Odblokuj ten URL we wtyczce Obrona przed spamem');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', 'Filtruj URLe za pomocą Blacklisty serwisu blogg.de');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', 'Zidentyfikowane jako spam na podstawie Blacklisty serwisu blogg.de');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE', 'Tytuł wpisu jest taki sam jak treść komentarza');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE', 'Odrzucaj komentarze, które zawierają tylko tytuł');

plugins/serendipity_event_spamblock/UTF-8/lang_pt_PT.inc.php

@@ -94,8 +94,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_AUTHOR', 'Desbloquear este autor via plugin Spamblock');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', 'Desbloquear esta URL via plugin Spamblock');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', 'Activar filtragem de URL via a lista negra de blogg.de');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', 'Filtrado pela lista negra de blogg.deq');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

plugins/serendipity_event_spamblock/UTF-8/lang_sk.inc.php

@@ -88,8 +88,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL',		'Zrušiť blokovánie tejto adresy URL');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_EMAIL',		'Zrušiť blokovánie tejto e-mailovej adresy');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST',	'Aktivovať filtrovanie adries URL z balcklistu blogg.de');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST',	'Zamietnuté blacklistom blogg.de');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE',		'Nadpis komentára je rovnaký ako jeho telo');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE',		'Odmietnuté budú komentáre, ktoré v tele obsahujú iba nadpis.');

plugins/serendipity_event_spamblock/UTF-8/lang_zh.inc.php

@@ -85,8 +85,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', '使用Spamblock插件解除对该网址的屏蔽');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_EMAIL', '使用Spamblock插件解除对该电子邮件地址的屏蔽');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', '使用blogg.de黑名单对网址进行过滤');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', '已被blogg.de黑名单过滤掉');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE', '回复内容和文章标题相同');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE', '自动拒绝那些回复内容和文章标题完全相同的回复');

plugins/serendipity_event_spamblock/lang_cn.inc.php

@@ -85,8 +85,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', '使用Spamblock插件解除对该网址的屏蔽');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_EMAIL', '使用Spamblock插件解除对该电子邮件地址的屏蔽');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', '使用blogg.de黑名单对网址进行过滤');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', '已被blogg.de黑名单过滤掉');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE', '回复内容和文章标题相同');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE', '自动拒绝那些回复内容和文章标题完全相同的回复');

plugins/serendipity_event_spamblock/lang_cs.inc.php

@@ -95,8 +95,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL',		'Zrušit blokování této URL adresy');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_EMAIL',		'Zrušit blokování této e-mailové adresy');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST',		'Aktivovat filtraci URL adres z balcklistu blogg.de');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST',		'Zamítnuto blacklistem blogg.de');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE',		'Nadpis komentáøe je stejný jako jeho tìlo');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE',		'Odmítne komentáøe, které v tìle obsahují pouze nadpis.');

plugins/serendipity_event_spamblock/lang_cz.inc.php

@@ -95,8 +95,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL',		'Zru¹it blokování této URL adresy');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_EMAIL',		'Zru¹it blokování této e-mailové adresy');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST',		'Aktivovat filtraci URL adres z balcklistu blogg.de');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST',		'Zamítnuto blacklistem blogg.de');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE',		'Nadpis komentáøe je stejný jako jeho tìlo');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE',		'Odmítne komentáøe, které v tìle obsahují pouze nadpis.');

plugins/serendipity_event_spamblock/lang_da.inc.php

@@ -86,8 +86,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_AUTHOR', 'Fjern blokering af denne forfatter vha Spamblock plugin');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', 'Fjern blokering af denne URL vha Spamblock plugin');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', 'Aktiver URL filtrering vha blogg.de blackliste');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', 'Filtreret vha blogg.de blackliste');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE', 'Indhold = titel kommentar');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE', 'Afvis kommentarer hvor indholdet er det samme som titel');

plugins/serendipity_event_spamblock/lang_de.inc.php

@@ -85,7 +85,6 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', 'Blockade dieser URL via Spamschutz aufheben');
         @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_EMAIL', 'Blockade dieser E-Mail via Spamschutz aufheben');
 
-        @define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', 'URL-Filterung anhand der blogg.de Blacklist aktivieren');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE', 'Artikeltitel ist derselbe wie der Kommentar!');
         @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE', 'Kommentare abweisen, die als Text nur den Artikeltitel enthalten');
 
@@ -135,7 +134,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_SERVER_AKISMET_ANON', 'Akismet (anonymisiert)');
 
 // Next lines were translated on 2009/06/03
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', 'durch blogg.de Blacklist gefiltert');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_TRACKBACKIPVALIDATION_URL_EXCLUDE', 'URLs von IP Validatierung ausnehmen');
 @define('PLUGIN_EVENT_SPAMBLOCK_TRACKBACKIPVALIDATION_URL_EXCLUDE_DESC', 'URLs, die von der IP Validatierung ausgeschlossen werden sollen. ' . PLUGIN_EVENT_SPAMBLOCK_FILTER_URLS_DESC);

plugins/serendipity_event_spamblock/lang_en.inc.php

@@ -90,8 +90,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', 'Unblock this URL via Spamblock plugin');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_EMAIL', 'Unblock this E-mail via Spamblock plugin');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', 'Activate URL filtering by blogg.de Blacklist');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', 'Filtered by blogg.de Blacklist');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE', 'Entry title equals comment');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE', 'Reject comments which only contain the entry title');

plugins/serendipity_event_spamblock/lang_es.inc.php

@@ -86,8 +86,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', 'Desbloquear estea URL a través de la extensión Spamblock');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_EMAIL', 'Desbloquear este correo electrónico a través de la extensión Spamblock');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', 'Activar el filtrado de URL através de la lista negra blogg.de');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', 'Filtrado a través de la lista negra blogg.de');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE', 'Titulo de la entrada igual al comentario');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE', 'Rechaza comentarios que sólo contengan título');

plugins/serendipity_event_spamblock/lang_fa.inc.php

@@ -86,8 +86,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_AUTHOR', 'Unblock this author via Spamblock plugin');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', 'Unblock this URL via Spamblock plugin');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', 'Activate URL filtering by blogg.de Blacklist');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', 'Filtered by blogg.de Blacklist');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE', 'Entry title equals comment');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE', 'Reject comments which only contain the entry title');

plugins/serendipity_event_spamblock/lang_fr.inc.php

@@ -91,8 +91,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_ADD_URL', 'Bloquer cette adresse à l\'aide du plugin Spamblock');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_AUTHOR', 'Débloquer cet auteur dans le plugin Spamblock');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', 'Débloquer cette adresse dans le plugin Spamblock');
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', 'Activer le filtrage d\'adresse par la blacklist de blogg.de');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', 'Adresse filtrée par la blacklist de blogg.de');
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE', 'Titre du billet égal commentaire');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE', 'Rejeter les commentaires qui ne contiennent que le titre du billet');
 @define('PLUGIN_EVENT_SPAMBLOCK_TRACKBACKURL', 'Vérifier les adresses des rétroliens');

plugins/serendipity_event_spamblock/lang_ja.inc.php

@@ -92,8 +92,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', 'この URL はスパムプロテクタープラグインでブロックしない');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_EMAIL', 'この電子メールはスパムプロテクタープラグインでブロックしない');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', 'blogg.de ブラックリストによる URL フィルタリングを有効にする');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', 'blogg.de ブラックリストによるフィルタリング');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE', 'エントリの題名とコメントが同じ');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE', 'エントリの題名のみを含むコメントを拒否する');

plugins/serendipity_event_spamblock/lang_nl.inc.php

@@ -88,8 +88,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', 'Deblokkeer deze URL via deSpamblock plugin');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_EMAIL', 'Deblokkeer deze E-mail via deSpamblock plugin');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', 'Activeer url filtering door blogg.de Blacklist');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', 'Gefilterd door blogg.de Blacklist');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE', 'Titel is dezelfde als het commentaar');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE', 'Weiger commentaar waarbij de titel dezelfde is als de inhoud.');

plugins/serendipity_event_spamblock/lang_pl.inc.php

@@ -86,8 +86,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_AUTHOR', 'Odblokuj tego autora we wtyczce Obrona przed spamem');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', 'Odblokuj ten URL we wtyczce Obrona przed spamem');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', 'Filtruj URLe za pomoc± Blacklisty serwisu blogg.de');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', 'Zidentyfikowane jako spam na podstawie Blacklisty serwisu blogg.de');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE', 'Tytu³ wpisu jest taki sam jak tre¶æ komentarza');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE', 'Odrzucaj komentarze, które zawieraj± tylko tytu³');

plugins/serendipity_event_spamblock/lang_pt_PT.inc.php

@@ -94,8 +94,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_AUTHOR', 'Desbloquear este autor via plugin Spamblock');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', 'Desbloquear esta URL via plugin Spamblock');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', 'Activar filtragem de URL via a lista negra de blogg.de');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', 'Filtrado pela lista negra de blogg.deq');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

plugins/serendipity_event_spamblock/lang_sk.inc.php

@@ -88,8 +88,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL',		'Zru¹i» blokovánie tejto adresy URL');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_EMAIL',		'Zru¹i» blokovánie tejto e-mailovej adresy');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST',	'Aktivova» filtrovanie adries URL z balcklistu blogg.de');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST',	'Zamietnuté blacklistom blogg.de');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE',		'Nadpis komentára je rovnaký ako jeho telo');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE',		'Odmietnuté budú komentáre, ktoré v tele obsahujú iba nadpis.');

plugins/serendipity_event_spamblock/lang_zh.inc.php

@@ -85,8 +85,6 @@
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_URL', '使用Spamblock插件解除对该网址的屏蔽');
 @define('PLUGIN_EVENT_SPAMBLOCK_REMOVE_EMAIL', '使用Spamblock插件解除对该电子邮件地址的屏蔽');
 
-@define('PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST', '使用blogg.de黑名单对网址进行过滤');
-@define('PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST', '已被blogg.de黑名单过滤掉');
 
 @define('PLUGIN_EVENT_SPAMBLOCK_REASON_TITLE', '回复内容和文章标题相同');
 @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_TITLE', '自动拒绝那些回复内容和文章标题完全相同的回复');

plugins/serendipity_event_spamblock/serendipity_event_spamblock.php

@@ -2,13 +2,6 @@
 
 @serendipity_plugin_api::load_language(dirname(__FILE__));
 
-/* BC - TODO: Remove for 0.8 final */
-if (!function_exists('serendipity_serverOffsetHour')) {
-    function serendipity_serverOffsetHour() {
-        return time();
-    }
-}
-
 class serendipity_event_spamblock extends serendipity_event
 {
 var $filter_defaults;
@@ -62,7 +55,6 @@ var $filter_defaults;
             'contentfilter_authors',
             'contentfilter_words',
             'contentfilter_emails',
-            'bloggdeblacklist',
             'akismet',
             'akismet_server',
             'akismet_filter',
@@ -80,7 +72,6 @@ var $filter_defaults;
                     'contentfilter_authors',
                     'contentfilter_words',
                     'contentfilter_emails',
-                    'bloggdeblacklist',
                     'akismet',
                     'akismet_server',
                     'akismet_filter',
@@ -252,19 +243,6 @@ var $filter_defaults;
 
                 break;
 
-            case 'bloggdeblacklist':
-                $propbag->add('type', 'radio');
-                $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_BLOGG_SPAMLIST);
-                $propbag->add('description', '');
-                $propbag->add('default', 'none');
-                $propbag->add('radio', array(
-                    'value' => array('moderate', 'reject', 'none'),
-                    'desc'  => array(PLUGIN_EVENT_SPAMBLOCK_API_MODERATE, PLUGIN_EVENT_SPAMBLOCK_API_REJECT, NONE)
-                ));
-                $propbag->add('radio_per_row', '1');
-
-                break;
-
             case 'akismet':
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_AKISMET);
@@ -448,8 +426,9 @@ var $filter_defaults;
 
         serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}spamblock_htaccess (ip, timestamp) VALUES ('" . serendipity_db_escape_string($new_ip) . "', '" . time() . "')");
 
-        // Temporarily hardcoded fix by DLange to prevent .htaccess growing too large.
+        // Limit number of banned IPs to prevent .htaccess growing too large. The query selects at max 20*$blocklist_chunksize entries from the last two days.
-        $q = "SELECT ip FROM {$serendipity['dbPrefix']}spamblock_htaccess WHERE timestamp > " . (time() - 86400*2) . " GROUP BY ip ORDER BY timestamp DESC LIMIT 177";
+        $blocklist_chunksize = 177;
+        $q = "SELECT ip FROM {$serendipity['dbPrefix']}spamblock_htaccess WHERE timestamp > " . (time() - 86400*2) . " GROUP BY ip ORDER BY timestamp DESC LIMIT " . 20*$blocklist_chunksize;
         $rows = serendipity_db_query($q, false, 'assoc');
 
         $deny = array();
@@ -458,24 +437,39 @@ var $filter_defaults;
         }
 
         $hta = $serendipity['serendipityPath'] . '.htaccess';
-        if (count($deny) > 0 && file_exists($hta) && is_writable($hta)) {
+        $blocklist_size = count($deny);
-            $htaccess = file_get_contents($hta);
+        if ($blocklist_size > 0 && file_exists($hta) && is_writable($hta)) {
-            $fp = @fopen($hta, 'w');
+            $blocklist = "#IP count: " . $blocklist_size . ", last update: " . date('Y-m-d H:i:s') . "\n";
+            for ($i = 0; $i < ((int) (($blocklist_size-1) / $blocklist_chunksize))+1; $i++) {
+                $blocklist = $blocklist . "Deny From " . implode(" ", array_slice($deny, $i*$blocklist_chunksize, $blocklist_chunksize)) . "\n";
+            }
+            $fp = @fopen($hta, 'r+');
             if (!$fp) {
                 return false;
-            } else {
+            }
+            if (flock($fp, LOCK_EX|LOCK_NB)) {
+                $htaccess = file_get_contents($hta);
+                if (!$htaccess) {
+                    fclose($fp);  // also releases the lock
+                    return false;
+                }
                 // Check if an old htaccess file existed and try to preserve its contents. Otherwise completely wipe the file.
                 if ($htaccess != '' && preg_match('@^(.*)#SPAMDENY.*Deny From.+#/SPAMDENY(.*)$@imsU', $htaccess, $match)) {
                     // Code outside from s9y-code was found.
-                    $content = trim($match[1]) . "\n#SPAMDENY\nDeny From " . implode(' ', $deny) . "\n#/SPAMDENY\n" . trim($match[2]);
+                    $content = trim($match[1]) . "\n#SPAMDENY\n" . $blocklist . "#/SPAMDENY\n" . trim($match[2]);
                 } else {
-                    $content = trim($htaccess) . "\n#SPAMDENY\nDeny From " . implode(' ', $deny) . "\n#/SPAMDENY\n";
+                    $content = trim($htaccess) . "\n#SPAMDENY\n" . $blocklist . "#/SPAMDENY\n";
                 }
+                ftruncate($fp, 0);
                 fwrite($fp, $content);
                 fclose($fp);
                 return true;
+            } else {
+                fclose($fp);
+                return false;
             }
         }
+        return false;
     }
 
     function akismetRequest($api_key, $data, &$ret, $action = 'comment-check', $eventData = null, $addData = null) {
@@ -636,6 +630,7 @@ var $filter_defaults;
         require_once S9Y_PEAR_PATH . 'HTTP/Request.php';
         if (function_exists('serendipity_request_start')) serendipity_request_start();
 
+        // this switch statement is a leftover from blogg.de support (i.e. there were more options than just one). Leaving it in place in case we get more options again in the future.
         switch($where) {
             case 'akismet.com':
                 // DEBUG
@@ -657,36 +652,6 @@ var $filter_defaults;
                 $this->akismetRequest($api_key, $data, $ret);
                 break;
 
-            case 'blogg.de':
-                $target  = $serendipity['serendipityPath'] . PATH_SMARTY_COMPILE . '/blogg.de.blacklist.txt';
-                $timeout = 3600; // One hour
-
-                if (file_exists($target) && filemtime($target) > time()-$timeout) {
-                    $data = file_get_contents($target);
-                } else {
-                    $data = '';
-
-                    $req    = new HTTP_Request('http://spam.blogg.de/blacklist.txt');
-
-                    if (PEAR::isError($req->sendRequest()) || $req->getResponseCode() != '200') {
-                        if (file_exists($target) && filesize($target) > 0) {
-                            $data = file_get_contents($target);
-                        }
-                    } else {
-                        // Fetch file
-                        $data = $req->getResponseBody();
-                        $fp = @fopen($target, 'w');
-
-                        if ($fp) {
-                            fwrite($fp, $data);
-                            fclose($fp);
-                        }
-                    }
-                }
-
-                $blacklist = explode("\n", $data);
-                $ret =& $blacklist;
-
             default:
                 break;
         }
@@ -1092,35 +1057,6 @@ var $filter_defaults;
                             return false;
                         }
 
-                        // Filter Blogg.de Blacklist?
-                        $bloggdeblacklist = $this->get_config('bloggdeblacklist');
-                        if ($bloggdeblacklist == 'moderate' || $bloggdeblacklist == 'reject') {
-                            $domains = $this->getBlacklist('blogg.de', '', $eventData, $addData);
-                            if (is_array($domains)) {
-                                foreach($domains AS $domain) {
-                                    $domain = trim($domain);
-                                    if (empty($domain)) {
-                                        continue;
-                                    }
-
-                                    if (preg_match('@' . preg_quote($domain) . '@i', $addData['url'])) {
-                                        $this->IsHardcoreSpammer();
-                                        if ($bloggdeblacklist == 'moderate') {
-                                            $this->log($logfile, $eventData['id'], 'MODERATE', PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST . ': ' . $domain, $addData);
-                                            $eventData['moderate_comments'] = true;
-                                            $serendipity['csuccess']        = 'moderate';
-                                            $serendipity['moderate_reason'] = PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY . ' (' . PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST . ')';
-                                        } else {
-                                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_BLOGG_SPAMLIST . ': ' . $domain, $addData);
-                                            $eventData = array('allow_comments' => false);
-                                            $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY;
-                                            return false;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
                         // Check for maximum number of links before rejecting
                         $link_count = substr_count(strtolower($addData['comment']), 'http://');
                         if ($links_reject > 0 && $link_count > $links_reject) {