Merge branch 'master' into revamp-scripts-class

Geeklog-Core · Nov 11, 2017 · 7babdd3 · 7babdd3
2 parents 28ac355 + 7d7b939
commit 7babdd3
Show file tree

Hide file tree

Showing 60 changed files with 912 additions and 285 deletions.
diff --git a/language/english.php b/language/english.php
@@ -255,7 +255,7 @@
     103 => 'Ban this user',
     104 => 'Ban this IP address with the Spamx plugin',
     105 => 'IP Address',
-    106 => 'Perform bulk action on comments and comment submissions including approval, deleting, and banning of user or IP address.', 
+    106 => 'Perform bulk action on comments and comment submissions including approval, deleting, and banning of user or IP address.  <span style="color: red;">IP addresses in red are the ones banned by the Spam-X plugin.</span>',
     'record_edit' => 'Record user and time of edit?'
 );
 
@@ -1413,6 +1413,7 @@
     18 => '<strong>To enable URL routing, you have to enable URL rewrite in the Configuration.</strong>',
     19 => '<strong>To enable URL routing, you have to enable URL routing in the Configuration.</strong>',
     20 => '<ul><li>Placeholders (@) must be the same both in a rule and its route.</li><li>A placeholder starts with "@", followed by an alphabet, optionally followed by any length of alphabet or digit.</li><li>Placeholders are case-sensitive.</li></ul>',
+    21 => 'Status Code',
 );
 
 ###############################################################################

diff --git a/language/english_utf-8.php b/language/english_utf-8.php
@@ -255,7 +255,7 @@
     103 => 'Ban this user',
     104 => 'Ban this IP address with the Spamx plugin',
     105 => 'IP Address',
-    106 => 'Perform bulk action on comments and comment submissions including approval, deleting, and banning of user or IP address.',
+    106 => 'Perform bulk action on comments and comment submissions including approval, deleting, and banning of user or IP address.  <span style="color: red;">IP addresses in red are the ones banned by the Spam-X plugin.</span>',
     'record_edit' => 'Record user and time of edit?'
 );
 
@@ -1413,6 +1413,7 @@
     18 => '<strong>To enable URL routing, you have to enable URL rewrite in the Configuration.</strong>',
     19 => '<strong>To enable URL routing, you have to enable URL routing in the Configuration.</strong>',
     20 => '<ul><li>Placeholders (@) must be the same both in a rule and its route.</li><li>A placeholder starts with "@", followed by an alphabet, optionally followed by any length of alphabet or digit.</li><li>Placeholders are case-sensitive.</li></ul>',
+    21 => 'Status Code',
 );
 
 ###############################################################################

diff --git a/language/japanese_utf-8.php b/language/japanese_utf-8.php
@@ -263,8 +263,8 @@
     103 => 'このユーザーを禁止する',
     104 => 'このIPアドレスをSpamxプラグインで禁止する',
     105 => 'IPアドレス',
-    106 => 'ユーザーやIPアドレスの一括承認・削除・禁止を含めて、コメントに対するアクションを一括して行います。', 
-    'record_edit' => 'Record user and time of edit?'
+    106 => 'ユーザーやIPアドレスの一括承認・削除・禁止を含めて、コメントに対するアクションを一括して行います。<span style="color: red;">赤字のIPアドレスはSpam-Xプラグインで禁止されているIPです。</span>',
+    'record_edit' => '編集者と編集時刻を記録する'
 );
 
 ###############################################################################
@@ -1413,7 +1413,8 @@
     17 => 'データベース操作でエラーが発生しました。',
     18 => '<strong>URLルーティングを有効にするには、コンフィギュレーションでURLリライトを有効にしてください。</strong>',
     19 => '<strong>URLルーティングを有効にするには、コンフィギュレーションでURLルーティングを有効にしてください。</strong>',
-    20 => '<ul><li>プレースホルダー(@)はルールとルートで同じものを定義してください。</li><li>プレースホルダーは@で始まり、1文字目は英字、2文字目以降は英数字を使えます。</li><li>プレースホルダーは大文字・小文字を区別します。</li></ul>'
+    20 => '<ul><li>プレースホルダー(@)はルールとルートで同じものを定義してください。</li><li>プレースホルダーは@で始まり、1文字目は英字、2文字目以降は英数字を使えます。</li><li>プレースホルダーは大文字・小文字を区別します。</li></ul>',
+    21 => 'ステータスコード',
 );
 
 ###############################################################################

diff --git a/plugins/spamx/BanUser.Action.class.php b/plugins/spamx/BanUser.Action.class.php
@@ -3,7 +3,7 @@
 /**
  * File: BanUser.Action.class.php
  * This is the Ban User Action for the Geeklog Spam-X plugin
- * Copyright (C) 2012 by the following authors:
+ * Copyright (C) 2012-2017 by the following authors:
  * Author   Dirk Haun       dirk AT haun-online DOT net
  * based on earlier works by Tom Willett
  * Licensed under GNU General Public License

diff --git a/plugins/spamx/BannedUsers.Examine.class.php b/plugins/spamx/BannedUsers.Examine.class.php
@@ -4,7 +4,7 @@
  * File: BannedUsers.Examine.class.php
  * This Exame class for Geeklog's Spam-X plugin checks posts against URLs
  * that banned users used as their homepage URL.
- * Copyright (C) 2012 by the following authors:
+ * Copyright (C) 2012-2017 by the following authors:
  * Author   Dirk Haun       dirk AT haun-online DOT de
  * Licensed under GNU General Public License
  *
@@ -62,10 +62,10 @@ public function execute($comment)
 
             if (preg_match($pattern, $comment)) {
                 $ans = 1; // quit on first positive match
-                SPAMX_log($LANG_SX00['foundspam'] . $val .
-                    ' (' . $LANG28[42] . ')' .
+                SPAMX_log($LANG_SX00['foundspam'] . $val . ' (' . $LANG28[42] . ')' .
                     $LANG_SX00['foundspam2'] . $uid .
-                    $LANG_SX00['foundspam3'] . $_SERVER['REMOTE_ADDR']);
+                    $LANG_SX00['foundspam3'] . $_SERVER['REMOTE_ADDR']
+                );
                 break;
             }
         }

diff --git a/plugins/spamx/BlackList.Examine.class.php b/plugins/spamx/BlackList.Examine.class.php
@@ -3,7 +3,7 @@
 /**
  * File: BlackList.Examine.class.php
  * This is the Personal BlackList Examine class for the Geeklog Spam-X plugin
- * Copyright (C) 2004-2006 by the following authors:
+ * Copyright (C) 2004-2017 by the following authors:
  * Author   Tom Willett     tomw AT pigstye DOT net
  * Licensed under GNU General Public License
  *

diff --git a/plugins/spamx/DeleteComment.Action.class.php b/plugins/spamx/DeleteComment.Action.class.php
@@ -3,7 +3,7 @@
 /**
  * File: DeleteComment.Action.class.php
  * This is the Delete Comment Action  for the Geeklog Spam-X plugin
- * Copyright (C) 2004-2005 by the following authors:
+ * Copyright (C) 2004-2017 by the following authors:
  * Author   Tom Willett     tomw AT pigstye DOT net
  * Licensed under GNU General Public License
  *

diff --git a/plugins/spamx/EditBlackList.Admin.class.php b/plugins/spamx/EditBlackList.Admin.class.php
@@ -3,7 +3,7 @@
 /**
  * File: EditBlackList.Admin.class.php
  * This is the Edit Personal Blacklist Module for the Geeklog Spam-X plugin
- * Copyright (C) 2004-2009 by the following authors:
+ * Copyright (C) 2004-2017 by the following authors:
  * Author   Tom Willett     tomw AT pigstye DOT net
  *          Dirk Haun       dirk AT haun-online DOT de
  * Licensed under GNU General Public License

diff --git a/plugins/spamx/EditHeader.Admin.class.php b/plugins/spamx/EditHeader.Admin.class.php
@@ -3,7 +3,7 @@
 /**
  * File: EditHeader.Admin.class.php
  * This is the Edit HTTP Header Module for the Geeklog Spam-X plugin
- * Copyright (C) 2005-2009 by the following authors:
+ * Copyright (C) 2005-2017 by the following authors:
  * Author    Dirk Haun <dirk AT haun-online DOT de>
  * based on the works of Tom Willett <tomw AT pigstye DOT net>
  * Licensed under GNU General Public License

diff --git a/plugins/spamx/EditIP.Admin.class.php b/plugins/spamx/EditIP.Admin.class.php
@@ -3,7 +3,7 @@
 /**
  * File: EditIP.Admin.class.php
  * This is the Edit IPBlacklist Module for the Geeklog Spam-X plugin
- * Copyright (C) 2004-2009 by the following authors:
+ * Copyright (C) 2004-2017 by the following authors:
  * Author   Tom Willett     tomw AT pigstye DOT net
  *          Dirk Haun       dirk AT haun-online DOT de
  * Licensed under GNU General Public License

diff --git a/plugins/spamx/EditIPofURL.Admin.class.php b/plugins/spamx/EditIPofURL.Admin.class.php
@@ -3,7 +3,7 @@
 /**
  * File: EditIPofURL.Admin.class.php
  * This is the Edit IP of URL Module for the Geeklog Spam-X plugin
- * Copyright (C) 2004-2010 by the following authors:
+ * Copyright (C) 2004-2017 by the following authors:
  * Author    Tom Willett     tomw AT pigstye DOT net
  *           Dirk Haun       dirk AT haun-online DOT de
  * Licensed under GNU General Public License

diff --git a/plugins/spamx/EditSFS.Admin.class.php b/plugins/spamx/EditSFS.Admin.class.php
@@ -3,7 +3,7 @@
 /**
  * File: EditSFS.Admin.class.php
  * This is the Edit Personal Blacklist Module for the glFusion Spam-X plugin
- * Copyright (C) 2004-2009 by the following authors:
+ * Copyright (C) 2004-2017 by the following authors:
  * Author   Tom Willett     tomw AT pigstye DOT net
  *          Dirk Haun       dirk AT haun-online DOT de
  * Licensed under GNU General Public License

diff --git a/plugins/spamx/Header.Examine.class.php b/plugins/spamx/Header.Examine.class.php
@@ -3,7 +3,7 @@
 /**
  * File: Header.Examine.class.php
  * This is the HTTP Header Examine class for the Geeklog Spam-X plugin
- * Copyright (C) 2005-2009 by the following authors:
+ * Copyright (C) 2005-2017 by the following authors:
  * Author    Dirk Haun <dirk AT haun-online DOT de>
  * based on the works of Tom Willett <tomw AT pigstye DOT net>
  * Licensed under the GNU General Public License

diff --git a/plugins/spamx/IP.Examine.class.php b/plugins/spamx/IP.Examine.class.php
@@ -3,7 +3,7 @@
 /**
  * File: IP.Examine.class.php
  * This is the IP BlackList Examine class for the Geeklog Spam-X plugin
- * Copyright (C) 2004-2010 by the following authors:
+ * Copyright (C) 2004-2017 by the following authors:
  * Author        Tom Willett        tomw AT pigstye DOT net
  * Licensed under GNU General Public License
  *

diff --git a/plugins/spamx/IPofUrl.Examine.class.php b/plugins/spamx/IPofUrl.Examine.class.php
@@ -3,7 +3,7 @@
 /**
  * File: IPofUrl.Examine.class.php
  * This is the Personal BlackList Examine class for the Geeklog Spam-X plugin
- * Copyright (C) 2004-2006 by the following authors:
+ * Copyright (C) 2004-2017 by the following authors:
  * Author        Tom Willett        tomw AT pigstye DOT net
  * Licensed under GNU General Public License
  *

diff --git a/plugins/spamx/MailAdmin.Action.class.php b/plugins/spamx/MailAdmin.Action.class.php
@@ -3,7 +3,7 @@
 /**
  * File: MailAdmin.Action.class.php
  * This is the Mail Admin Action for the Geeklog Spam-X plugin
- * Copyright (C) 2004-2008 by the following authors:
+ * Copyright (C) 2004-2017 by the following authors:
  * Author   Tom Willett     tomw AT pigstye DOT net
  * Licensed under GNU General Public License
  *

diff --git a/plugins/spamx/MassDelTrackback.Admin.class.php b/plugins/spamx/MassDelTrackback.Admin.class.php
@@ -3,7 +3,7 @@
 /**
  * File:  MassDelTrackback.Admin.class.php
  * Mass delete trackback spam
- * Copyright (C) 2004-2008 by the following authors:
+ * Copyright (C) 2004-2017 by the following authors:
  *
  * @author     Tom Willett     tomw AT pigstye DOT net
  * @author     Dirk Haun       dirk AT haun-online DOT de

diff --git a/plugins/spamx/MassDelete.Admin.class.php b/plugins/spamx/MassDelete.Admin.class.php
@@ -3,7 +3,7 @@
 /**
  * File:  MassDelete.Admin.class.php
  * Mass delete comment spam
- * Copyright (C) 2004-2008 by the following authors:
+ * Copyright (C) 2004-2017 by the following authors:
  * Author        Tom Willett        tomw AT pigstye DOT net
  * Licensed under GNU General Public License
  *

diff --git a/plugins/spamx/SFS.Examine.class.php b/plugins/spamx/SFS.Examine.class.php
@@ -3,7 +3,7 @@
 /**
  * File: SFS.Examine.class.php
  * This is the Stop Forum Spam Examine class for the Geeklog Spam-X plugin
- * Copyright  (C) 2014 Tom Homer  - WebSiteMaster AT cogeco DOT com
+ * Copyright  (C) 2014-2017 Tom Homer  - WebSiteMaster AT cogeco DOT com
  * Licensed under the GNU General Public License
  */
 

diff --git a/plugins/spamx/SFS.Misc.class.php b/plugins/spamx/SFS.Misc.class.php
@@ -1,12 +1,13 @@
 <?php
+
 /**
  *   SFS.Misc.class.php
  *   Special examiner to check email and IP addresses during registration.
  *   Checks stopforumspam.com and, if the result is positive, addes the
  *   email and/or IP address to the spamx table.
  *
  * @author       Lee Garner <lee@leegarner.com>
- * @copyright    Copyright (c) 2010 Lee Garner <lee@leegarner.com>
+ * @copyright    Copyright (c) 2010-2017 Lee Garner <lee@leegarner.com>
  * @package      spamx
  * @subpackage   Modules
  * @version      1.0.0

diff --git a/plugins/spamx/SFSbase.class.php b/plugins/spamx/SFSbase.class.php
@@ -3,7 +3,7 @@
 /**
  * File: SFSbase.class.php
  * Stop Forum Spam (SFS) Base Class
- * Copyright  (C) 2014 Tom Homer  - WebSiteMaster AT cogeco DOT com
+ * Copyright  (C) 2014-2017 Tom Homer  - WebSiteMaster AT cogeco DOT com
  * Licensed under the GNU General Public License
 
 

diff --git a/plugins/spamx/SFSreport.Action.class.php b/plugins/spamx/SFSreport.Action.class.php
@@ -3,7 +3,7 @@
 /**
  * File: SFS.Action.class.php
  * This is the Stop Forum Spam Action class for the Geeklog Spam-X plugin
- * Copyright  (C) 2014 Tom Homer  - WebSiteMaster AT cogeco DOT com
+ * Copyright  (C) 2014-2017 Tom Homer  - WebSiteMaster AT cogeco DOT com
  * Licensed under the GNU General Public License
 
 

diff --git a/plugins/spamx/SLV.Examine.class.php b/plugins/spamx/SLV.Examine.class.php
@@ -3,7 +3,7 @@
 /**
  * File: SLV.Examine.class.php
  * This is the Spam Link Verification Examine class for the Geeklog Spam-X plugin
- * Copyright (C) 2006 by the following authors:
+ * Copyright (C) 2006-2017 by the following authors:
  * Author        Dirk Haun       dirk AT haun-online DOT de
  * Licensed under the GNU General Public License
  *

diff --git a/plugins/spamx/SLVbase.class.php b/plugins/spamx/SLVbase.class.php
@@ -3,7 +3,7 @@
 /**
  * File: SLVbase.class.php
  * Spam Link Verification (SLV) Base Class
- * Copyright (C) 2006 by the following authors:
+ * Copyright (C) 2006-2017 by the following authors:
  * Author        Dirk Haun       dirk AT haun-online DOT de
  * Licensed under the GNU General Public License
  *

diff --git a/plugins/spamx/SLVreport.Action.class.php b/plugins/spamx/SLVreport.Action.class.php
@@ -3,7 +3,7 @@
 /**
  * File: SLV.Action.class.php
  * This is the Spam Link Verification Action class for the Geeklog Spam-X plugin
- * Copyright (C) 2006 by the following authors:
+ * Copyright (C) 2006-2017 by the following authors:
  * Author        Dirk Haun       dirk AT haun-online DOT de
  * Licensed under the GNU General Public License
  *

diff --git a/plugins/spamx/SLVwhitelist.Admin.class.php b/plugins/spamx/SLVwhitelist.Admin.class.php
@@ -3,7 +3,7 @@
 /**
  * File: SLVwhitelist.Admin.class.php
  * This is the SLV Whitelist Module for the Geeklog Spam-X plugin
- * Copyright (C) 2004-2010 by the following authors:
+ * Copyright (C) 2004-2017 by the following authors:
  * Author   Tom Willett     tomw AT pigstye DOT net
  *          Dirk Haun       dirk AT haun-online DOT de
  * Licensed under GNU General Public License

diff --git a/plugins/spamx/SNL.Examine.class.php b/plugins/spamx/SNL.Examine.class.php
@@ -3,7 +3,7 @@
 /**
  * File: SNL.Examine.class.php
  * This is the Spam Number of Links Examine class for the Geeklog Spam-X plugin
- * Copyright  (C) 2006 Tom Homer  - WebSiteMaster AT cogeco DOT com
+ * Copyright  (C) 2006-2017 Tom Homer  - WebSiteMaster AT cogeco DOT com
  * Licensed under the GNU General Public License
 
 

diff --git a/plugins/spamx/SNLbase.class.php b/plugins/spamx/SNLbase.class.php
@@ -3,7 +3,7 @@
 /**
  * File: SNLbase.class.php
  * Spam Number of Links (SNL) Base Class
- * Copyright  (C) 2006 Tom Homer  - WebSiteMaster AT cogeco DOT com
+ * Copyright  (C) 2006-2017 Tom Homer  - WebSiteMaster AT cogeco DOT com
  * Licensed under the GNU General Public License
 
 

diff --git a/plugins/spamx/SNLreport.Action.class.php b/plugins/spamx/SNLreport.Action.class.php
@@ -3,10 +3,8 @@
 /**
  * File: SNL.Action.class.php
  * This is the Spam Number of Links Action class for the Geeklog Spam-X plugin
- * Copyright  (C) 2006 Tom Homer  - WebSiteMaster AT cogeco DOT com
+ * Copyright  (C) 2006-2017 Tom Homer  - WebSiteMaster AT cogeco DOT com
  * Licensed under the GNU General Public License
-
-
  */
 
 if (stripos($_SERVER['PHP_SELF'], basename(__FILE__)) !== false) {

diff --git a/plugins/spamx/autoinstall.php b/plugins/spamx/autoinstall.php
@@ -8,7 +8,7 @@
 // |                                                                           |
 // | This file provides helper functions for the automatic plugin install.     |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2008-2010 by the following authors:                         |
+// | Copyright (C) 2008-2017 by the following authors:                         |
 // |                                                                           |
 // | Authors: Dirk Haun         - dirk AT haun-online DOT de                   |
 // +---------------------------------------------------------------------------+
@@ -50,8 +50,8 @@ function plugin_autoinstall_spamx($pi_name)
     $info = array(
         'pi_name'         => $pi_name,
         'pi_display_name' => $pi_display_name,
-        'pi_version'      => '1.3.4',
-        'pi_gl_version'   => '2.1.2',
+        'pi_version'      => '1.3.5',
+        'pi_gl_version'   => '2.2.0',
         'pi_homepage'     => 'https://www.geeklog.net/',
     );
 

diff --git a/plugins/spamx/configuration_validation.php b/plugins/spamx/configuration_validation.php
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Spam-X                                                                    |
+// | Spam-X 1.3                                                                |
 // +---------------------------------------------------------------------------+
 // | configuration_validation.php                                              |
 // |                                                                           |
 // | List of validation rules for the Links plugin configurations              |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2007-2010 by the following authors:                         |
+// | Copyright (C) 2007-2017 by the following authors:                         |
 // |                                                                           |
 // | Authors: Akeda Bagus       - admin AT gedex DOT web DOT id                |
 // |          Tom Homer         - tomhomer AT gmail DOT com                    |