From 55260127bd91e53f8bb5bc78e6304468b5b0aba9 Mon Sep 17 00:00:00 2001 From: PayBas Date: Wed, 13 Aug 2014 15:22:34 +0200 Subject: [PATCH 1/9] [ticket/12961] Add link in anti-spam ACP page to titania PHPBB3-12961 --- phpBB/adm/style/acp_captcha.html | 1 + phpBB/language/en/acp/board.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index df4c675209..65f0a33085 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -6,6 +6,7 @@

{L_ACP_VC_SETTINGS_EXPLAIN}

+

{L_ACP_VC_EXT_GET_MORE} {L_ACP_VC_EXT_LINK}

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index d451bdd515..c4d250778a 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -298,6 +298,8 @@ $lang = array_merge($lang, array( // Visual Confirmation Settings $lang = array_merge($lang, array( 'ACP_VC_SETTINGS_EXPLAIN' => 'Here you can select and configure plugins, which are designed to block automated form submissions by spambots. These plugins typically work by challenging the user with a CAPTCHA, a test which is designed to be difficult for computers to solve.', + 'ACP_VC_EXT_GET_MORE' => 'For additional (and possibly better) anti-spam plugins, visit the', + 'ACP_VC_EXT_LINK' => 'phpBB.com anti-spam extensions database', 'AVAILABLE_CAPTCHAS' => 'Available plugins', 'CAPTCHA_UNAVAILABLE' => 'The plugin cannot be selected as its requirements are not met.', 'CAPTCHA_GD' => 'GD image', From d08a7f70e679eaf0355a34b7c9db147b02f1dbc2 Mon Sep 17 00:00:00 2001 From: PayBas Date: Wed, 13 Aug 2014 15:49:26 +0200 Subject: [PATCH 2/9] [ticket/12961] Change url to https://www.phpbb.com/go/anti-spam/ PHPBB3-12961 --- phpBB/adm/style/acp_captcha.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index 65f0a33085..edbf32888c 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -6,7 +6,7 @@

{L_ACP_VC_SETTINGS_EXPLAIN}

-

{L_ACP_VC_EXT_GET_MORE} {L_ACP_VC_EXT_LINK}

+

{L_ACP_VC_EXT_GET_MORE} {L_ACP_VC_EXT_LINK}

From 27bb2b72893b9bf59601ae78a02e59788e956e32 Mon Sep 17 00:00:00 2001 From: PayBas Date: Wed, 13 Aug 2014 16:44:16 +0200 Subject: [PATCH 3/9] [ticket/12961] Change url to anti-spam-ext As per IRC suggestion PHPBB3-12961 --- phpBB/adm/style/acp_captcha.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index edbf32888c..e64ed58c2e 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -6,7 +6,7 @@

{L_ACP_VC_SETTINGS_EXPLAIN}

-

{L_ACP_VC_EXT_GET_MORE} {L_ACP_VC_EXT_LINK}

+

{L_ACP_VC_EXT_GET_MORE} {L_ACP_VC_EXT_LINK}

From 73426d2d304537144c00ff84d6e38eba9d92e45a Mon Sep 17 00:00:00 2001 From: PayBas Date: Thu, 14 Aug 2014 22:22:20 +0200 Subject: [PATCH 4/9] [ticket/12961] Refactor lang entry PHPBB3-12961 --- phpBB/adm/style/acp_captcha.html | 2 +- phpBB/includes/acp/acp_captcha.php | 3 +++ phpBB/language/en/acp/board.php | 3 +-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index e64ed58c2e..f4866653c3 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -6,7 +6,7 @@

{L_ACP_VC_SETTINGS_EXPLAIN}

-

{L_ACP_VC_EXT_GET_MORE} {L_ACP_VC_EXT_LINK}

+

{L_ACP_VC_EXT_GET_MORE}

diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php index fa8d8fb6a9..c0eff6a916 100644 --- a/phpBB/includes/acp/acp_captcha.php +++ b/phpBB/includes/acp/acp_captcha.php @@ -61,6 +61,9 @@ class acp_captcha $this->tpl_name = 'acp_captcha'; $this->page_title = 'ACP_VC_SETTINGS'; + $template->assign_vars(array(L_ACP_VC_EXT_GET_MORE => sprintf($user->lang['ACP_VC_EXT_GET_MORE'], + '', '') + )); $form_key = 'acp_captcha'; add_form_key($form_key); diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index c4d250778a..4a51b8e5b9 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -298,8 +298,7 @@ $lang = array_merge($lang, array( // Visual Confirmation Settings $lang = array_merge($lang, array( 'ACP_VC_SETTINGS_EXPLAIN' => 'Here you can select and configure plugins, which are designed to block automated form submissions by spambots. These plugins typically work by challenging the user with a CAPTCHA, a test which is designed to be difficult for computers to solve.', - 'ACP_VC_EXT_GET_MORE' => 'For additional (and possibly better) anti-spam plugins, visit the', - 'ACP_VC_EXT_LINK' => 'phpBB.com anti-spam extensions database', + 'ACP_VC_EXT_GET_MORE' => 'For additional (and possibly better) anti-spam plugins, visit the %sphpBB.com anti-spam extensions database%s.', 'AVAILABLE_CAPTCHAS' => 'Available plugins', 'CAPTCHA_UNAVAILABLE' => 'The plugin cannot be selected as its requirements are not met.', 'CAPTCHA_GD' => 'GD image', From 45405a48a8914aca114db51eb97c0009be5d349f Mon Sep 17 00:00:00 2001 From: PayBas Date: Fri, 15 Aug 2014 22:53:05 +0200 Subject: [PATCH 5/9] [ticket/12961] Move link to language file PHPBB3-12961 --- phpBB/includes/acp/acp_captcha.php | 3 --- phpBB/language/en/acp/board.php | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php index c0eff6a916..fa8d8fb6a9 100644 --- a/phpBB/includes/acp/acp_captcha.php +++ b/phpBB/includes/acp/acp_captcha.php @@ -61,9 +61,6 @@ class acp_captcha $this->tpl_name = 'acp_captcha'; $this->page_title = 'ACP_VC_SETTINGS'; - $template->assign_vars(array(L_ACP_VC_EXT_GET_MORE => sprintf($user->lang['ACP_VC_EXT_GET_MORE'], - '', '') - )); $form_key = 'acp_captcha'; add_form_key($form_key); diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 4a51b8e5b9..40f9310457 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -298,7 +298,7 @@ $lang = array_merge($lang, array( // Visual Confirmation Settings $lang = array_merge($lang, array( 'ACP_VC_SETTINGS_EXPLAIN' => 'Here you can select and configure plugins, which are designed to block automated form submissions by spambots. These plugins typically work by challenging the user with a CAPTCHA, a test which is designed to be difficult for computers to solve.', - 'ACP_VC_EXT_GET_MORE' => 'For additional (and possibly better) anti-spam plugins, visit the %sphpBB.com anti-spam extensions database%s.', + 'ACP_VC_EXT_GET_MORE' => 'For additional (and possibly better) anti-spam plugins, visit the phpBB.com anti-spam extensions database.', 'AVAILABLE_CAPTCHAS' => 'Available plugins', 'CAPTCHA_UNAVAILABLE' => 'The plugin cannot be selected as its requirements are not met.', 'CAPTCHA_GD' => 'GD image', From ca55f22c731fd56fbadd49f7672f8e04a1198b0d Mon Sep 17 00:00:00 2001 From: PayBas Date: Thu, 21 Aug 2014 20:05:55 +0200 Subject: [PATCH 6/9] [ticket/12961] Add additional link to the KB PHPBB3-12961 --- phpBB/language/en/acp/board.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 40f9310457..338947c123 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -298,7 +298,7 @@ $lang = array_merge($lang, array( // Visual Confirmation Settings $lang = array_merge($lang, array( 'ACP_VC_SETTINGS_EXPLAIN' => 'Here you can select and configure plugins, which are designed to block automated form submissions by spambots. These plugins typically work by challenging the user with a CAPTCHA, a test which is designed to be difficult for computers to solve.', - 'ACP_VC_EXT_GET_MORE' => 'For additional (and possibly better) anti-spam plugins, visit the phpBB.com anti-spam extensions database.', + 'ACP_VC_EXT_GET_MORE' => 'For additional (and possibly better) anti-spam plugins, visit the phpBB.com anti-spam extensions database. For more information on preventing spam on your board, visit the phpBB.com knowledge base.', 'AVAILABLE_CAPTCHAS' => 'Available plugins', 'CAPTCHA_UNAVAILABLE' => 'The plugin cannot be selected as its requirements are not met.', 'CAPTCHA_GD' => 'GD image', From f22ee4f73abdd6706e0bbb0f0717801dd63db8cb Mon Sep 17 00:00:00 2001 From: PayBas Date: Fri, 22 Aug 2014 15:23:35 +0200 Subject: [PATCH 7/9] [ticket/12961] Remove target="_blank" and switch to PHPBB3-12961 --- phpBB/language/en/acp/board.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 338947c123..8db4782dfe 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -298,7 +298,7 @@ $lang = array_merge($lang, array( // Visual Confirmation Settings $lang = array_merge($lang, array( 'ACP_VC_SETTINGS_EXPLAIN' => 'Here you can select and configure plugins, which are designed to block automated form submissions by spambots. These plugins typically work by challenging the user with a CAPTCHA, a test which is designed to be difficult for computers to solve.', - 'ACP_VC_EXT_GET_MORE' => 'For additional (and possibly better) anti-spam plugins, visit the phpBB.com anti-spam extensions database. For more information on preventing spam on your board, visit the phpBB.com knowledge base.', + 'ACP_VC_EXT_GET_MORE' => 'For additional (and possibly better) anti-spam plugins, visit the phpBB.com anti-spam extensions database. For more information on preventing spam on your board, visit the .com knowledge base.', 'AVAILABLE_CAPTCHAS' => 'Available plugins', 'CAPTCHA_UNAVAILABLE' => 'The plugin cannot be selected as its requirements are not met.', 'CAPTCHA_GD' => 'GD image', From 5eea1ca44e38b126b68d9b10840adff9b7852d62 Mon Sep 17 00:00:00 2001 From: PayBas Date: Sat, 23 Aug 2014 12:32:43 +0200 Subject: [PATCH 8/9] [ticket/12961] Fix missing phpBB.com Don't know how that happened. Weird PHPBB3-12961 --- phpBB/language/en/acp/board.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 8db4782dfe..ab6da0def5 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -298,7 +298,7 @@ $lang = array_merge($lang, array( // Visual Confirmation Settings $lang = array_merge($lang, array( 'ACP_VC_SETTINGS_EXPLAIN' => 'Here you can select and configure plugins, which are designed to block automated form submissions by spambots. These plugins typically work by challenging the user with a CAPTCHA, a test which is designed to be difficult for computers to solve.', - 'ACP_VC_EXT_GET_MORE' => 'For additional (and possibly better) anti-spam plugins, visit the phpBB.com anti-spam extensions database. For more information on preventing spam on your board, visit the .com knowledge base.', + 'ACP_VC_EXT_GET_MORE' => 'For additional (and possibly better) anti-spam plugins, visit the phpBB.com anti-spam extensions database. For more information on preventing spam on your board, visit the phpBB.com knowledge base.', 'AVAILABLE_CAPTCHAS' => 'Available plugins', 'CAPTCHA_UNAVAILABLE' => 'The plugin cannot be selected as its requirements are not met.', 'CAPTCHA_GD' => 'GD image', From ab9cdcadfb65000631272079b27e6438807e8ae8 Mon Sep 17 00:00:00 2001 From: PayBas Date: Tue, 26 Aug 2014 12:45:54 +0200 Subject: [PATCH 9/9] [ticket/12961] Shorten ext-db link text PHPBB3-12961 --- phpBB/language/en/acp/board.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index ab6da0def5..24cfe4556b 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -298,7 +298,7 @@ $lang = array_merge($lang, array( // Visual Confirmation Settings $lang = array_merge($lang, array( 'ACP_VC_SETTINGS_EXPLAIN' => 'Here you can select and configure plugins, which are designed to block automated form submissions by spambots. These plugins typically work by challenging the user with a CAPTCHA, a test which is designed to be difficult for computers to solve.', - 'ACP_VC_EXT_GET_MORE' => 'For additional (and possibly better) anti-spam plugins, visit the phpBB.com anti-spam extensions database. For more information on preventing spam on your board, visit the phpBB.com knowledge base.', + 'ACP_VC_EXT_GET_MORE' => 'For additional (and possibly better) anti-spam plugins, visit the phpBB.com Extensions Database. For more information on preventing spam on your board, visit the phpBB.com Knowledge Base.', 'AVAILABLE_CAPTCHAS' => 'Available plugins', 'CAPTCHA_UNAVAILABLE' => 'The plugin cannot be selected as its requirements are not met.', 'CAPTCHA_GD' => 'GD image',