From 60d9538b14a3ec8f0a39716bde3d13d31e1ed97d Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 29 Oct 2012 14:47:39 -0400
Subject: [ticket/11157] get_captcha_types is an instance method.
It is specific to a particular captcha factory implementation,
instantiate a captcha factory to invoke it.
PHPBB3-11157
---
phpBB/includes/acp/acp_captcha.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'phpBB/includes')
diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php
index 51b5dd3301..c7c64ae56b 100644
--- a/phpBB/includes/acp/acp_captcha.php
+++ b/phpBB/includes/acp/acp_captcha.php
@@ -29,7 +29,8 @@ class acp_captcha
$user->add_lang('acp/board');
include($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx);
- $captchas = phpbb_captcha_factory::get_captcha_types();
+ $factory = new phpbb_captcha_factory();
+ $captchas = $factory->get_captcha_types();
$selected = request_var('select_captcha', $config['captcha_plugin']);
$selected = (isset($captchas['available'][$selected]) || isset($captchas['unavailable'][$selected])) ? $selected : $config['captcha_plugin'];
--
cgit v1.2.1
From 14a6e5ec73779d18cc6f09cb3b1cb4fd08f024f8 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 29 Oct 2012 09:34:51 -0400
Subject: [ticket/11157] Fix remaining captcha spam.
PHPBB3-11157
---
phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php | 4 ++--
.../includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php | 4 ++--
phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php | 4 ++--
phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 10 +++++-----
phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 6 +++---
5 files changed, 14 insertions(+), 14 deletions(-)
(limited to 'phpBB/includes')
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
index 6c1f3bf00b..e4503cabe4 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -55,7 +55,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
return $instance;
}
- function is_available()
+ public static function is_available()
{
global $phpbb_root_path, $phpEx;
@@ -80,7 +80,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
return true;
}
- function get_name()
+ public static function get_name()
{
return 'CAPTCHA_GD';
}
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
index a5588178bb..06ad9dbbf6 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
@@ -44,7 +44,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
return new phpbb_captcha_gd_wave();
}
- function is_available()
+ public static function is_available()
{
global $phpbb_root_path, $phpEx;
@@ -61,7 +61,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
return can_load_dll('gd');
}
- function get_name()
+ public static function get_name()
{
return 'CAPTCHA_GD_3D';
}
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
index 96f13fbe1b..563dbf6660 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
@@ -45,12 +45,12 @@ class phpbb_captcha_nogd extends phpbb_default_captcha
return $instance;
}
- function is_available()
+ public static function is_available()
{
return true;
}
- function get_name()
+ public static function get_name()
{
return 'CAPTCHA_NO_GD';
}
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 99813189d7..c005d478a2 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -108,7 +108,7 @@ class phpbb_captcha_qa
/**
* See if the captcha has created its tables.
*/
- function is_installed()
+ public static function is_installed()
{
global $db, $phpbb_root_path, $phpEx;
@@ -124,14 +124,14 @@ class phpbb_captcha_qa
/**
* API function - for the captcha to be available, it must have installed itself and there has to be at least one question in the board's default lang
*/
- function is_available()
+ public static function is_available()
{
global $config, $db, $phpbb_root_path, $phpEx, $user;
// load language file for pretty display in the ACP dropdown
$user->add_lang('captcha_qa');
- if (!phpbb_captcha_qa::is_installed())
+ if (!self::is_installed())
{
return false;
}
@@ -157,7 +157,7 @@ class phpbb_captcha_qa
/**
* API function
*/
- function get_name()
+ public static function get_name()
{
return 'CAPTCHA_QA';
}
@@ -612,7 +612,7 @@ class phpbb_captcha_qa
$user->add_lang('acp/board');
$user->add_lang('captcha_qa');
- if (!$this->is_installed())
+ if (!self::is_installed())
{
$this->install();
}
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 70c24a8c30..55bebf9443 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -60,7 +60,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
return $instance;
}
- function is_available()
+ public static function is_available()
{
global $config, $user;
$user->add_lang('captcha_recaptcha');
@@ -75,7 +75,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
return true;
}
- function get_name()
+ public static function get_name()
{
return 'CAPTCHA_RECAPTCHA';
}
@@ -163,7 +163,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
'RECAPTCHA_SERVER' => $this->recaptcha_server,
'RECAPTCHA_PUBKEY' => isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '',
'RECAPTCHA_ERRORGET' => '',
- 'S_RECAPTCHA_AVAILABLE' => $this->is_available(),
+ 'S_RECAPTCHA_AVAILABLE' => self::is_available(),
'S_CONFIRM_CODE' => true,
'S_TYPE' => $this->type,
'L_CONFIRM_EXPLAIN' => $explain,
--
cgit v1.2.1
From d602f13d7f6ba7ee67a5286befd8afd9f8f0cd15 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 29 Oct 2012 14:54:54 -0400
Subject: [ticket/11157] static public is the currently approved order.
PHPBB3-11157
---
phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php | 4 ++--
phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php | 4 ++--
phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php | 4 ++--
phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 6 +++---
phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
(limited to 'phpBB/includes')
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
index e4503cabe4..5328e64a86 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -55,7 +55,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
return $instance;
}
- public static function is_available()
+ static public function is_available()
{
global $phpbb_root_path, $phpEx;
@@ -80,7 +80,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
return true;
}
- public static function get_name()
+ static public function get_name()
{
return 'CAPTCHA_GD';
}
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
index 06ad9dbbf6..48af287723 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
@@ -44,7 +44,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
return new phpbb_captcha_gd_wave();
}
- public static function is_available()
+ static public function is_available()
{
global $phpbb_root_path, $phpEx;
@@ -61,7 +61,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
return can_load_dll('gd');
}
- public static function get_name()
+ static public function get_name()
{
return 'CAPTCHA_GD_3D';
}
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
index 563dbf6660..6d6e2c6036 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
@@ -45,12 +45,12 @@ class phpbb_captcha_nogd extends phpbb_default_captcha
return $instance;
}
- public static function is_available()
+ static public function is_available()
{
return true;
}
- public static function get_name()
+ static public function get_name()
{
return 'CAPTCHA_NO_GD';
}
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index c005d478a2..0eae643d33 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -108,7 +108,7 @@ class phpbb_captcha_qa
/**
* See if the captcha has created its tables.
*/
- public static function is_installed()
+ static public function is_installed()
{
global $db, $phpbb_root_path, $phpEx;
@@ -124,7 +124,7 @@ class phpbb_captcha_qa
/**
* API function - for the captcha to be available, it must have installed itself and there has to be at least one question in the board's default lang
*/
- public static function is_available()
+ static public function is_available()
{
global $config, $db, $phpbb_root_path, $phpEx, $user;
@@ -157,7 +157,7 @@ class phpbb_captcha_qa
/**
* API function
*/
- public static function get_name()
+ static public function get_name()
{
return 'CAPTCHA_QA';
}
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 55bebf9443..cf14caff54 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -60,7 +60,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
return $instance;
}
- public static function is_available()
+ static public function is_available()
{
global $config, $user;
$user->add_lang('captcha_recaptcha');
@@ -75,7 +75,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
return true;
}
- public static function get_name()
+ static public function get_name()
{
return 'CAPTCHA_RECAPTCHA';
}
--
cgit v1.2.1