makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 06:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'p/ticket/11157' into develop

Browse source 
* p/ticket/11157:
  [ticket/11157] static public is the currently approved order.
  [ticket/11157] Fix remaining captcha spam.
  [ticket/11157] get_captcha_types is an instance method.
This commit is contained in:
Andreas Fischer 2012-10-30 18:19:44 -04:00
commit 1f248dab6f
6 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/includes/acp/acp_captcha.php
View file

@ -29,7 +29,8 @@ class acp_captcha
$user->add_lang('acp/board'); $user->add_lang('acp/board');
include($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx); 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 = request_var('select_captcha', $config['captcha_plugin']);
$selected = (isset($captchas['available'][$selected]) || isset($captchas['unavailable'][$selected])) ? $selected : $config['captcha_plugin']; $selected = (isset($captchas['available'][$selected]) || isset($captchas['unavailable'][$selected])) ? $selected : $config['captcha_plugin'];

4
phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
View file

@ -55,7 +55,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
return $instance; return $instance;
} }
function is_available() static public function is_available()
{ {
global $phpbb_root_path, $phpEx; global $phpbb_root_path, $phpEx;
@ -80,7 +80,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
return true; return true;
} }
function get_name() static public function get_name()
{ {
return 'CAPTCHA_GD'; return 'CAPTCHA_GD';
} }

4
phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
View file

@ -44,7 +44,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
return new phpbb_captcha_gd_wave(); return new phpbb_captcha_gd_wave();
} }
function is_available() static public function is_available()
{ {
global $phpbb_root_path, $phpEx; global $phpbb_root_path, $phpEx;
@ -61,7 +61,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
return can_load_dll('gd'); return can_load_dll('gd');
} }
function get_name() static public function get_name()
{ {
return 'CAPTCHA_GD_3D'; return 'CAPTCHA_GD_3D';
} }

4
phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
View file

@ -45,12 +45,12 @@ class phpbb_captcha_nogd extends phpbb_default_captcha
return $instance; return $instance;
} }
function is_available() static public function is_available()
{ {
return true; return true;
} }
function get_name() static public function get_name()
{ {
return 'CAPTCHA_NO_GD'; return 'CAPTCHA_NO_GD';
} }

10
phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
View file

@ -108,7 +108,7 @@ class phpbb_captcha_qa
/** /**
* See if the captcha has created its tables. * See if the captcha has created its tables.
*/ */
function is_installed() static public function is_installed()
{ {
global $db, $phpbb_root_path, $phpEx; 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 * 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() static public function is_available()
{ {
global $config, $db, $phpbb_root_path, $phpEx, $user; global $config, $db, $phpbb_root_path, $phpEx, $user;
// load language file for pretty display in the ACP dropdown // load language file for pretty display in the ACP dropdown
$user->add_lang('captcha_qa'); $user->add_lang('captcha_qa');
if (!phpbb_captcha_qa::is_installed()) if (!self::is_installed())
{ {
return false; return false;
} }
@ -157,7 +157,7 @@ class phpbb_captcha_qa
/** /**
* API function * API function
*/ */
function get_name() static public function get_name()
{ {
return 'CAPTCHA_QA'; return 'CAPTCHA_QA';
} }
@ -612,7 +612,7 @@ class phpbb_captcha_qa
$user->add_lang('acp/board'); $user->add_lang('acp/board');
$user->add_lang('captcha_qa'); $user->add_lang('captcha_qa');
if (!$this->is_installed()) if (!self::is_installed())
{ {
$this->install(); $this->install();
} }

6
phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
View file

@ -60,7 +60,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
return $instance; return $instance;
} }
function is_available() static public function is_available()
{ {
global $config, $user; global $config, $user;
$user->add_lang('captcha_recaptcha'); $user->add_lang('captcha_recaptcha');
@ -75,7 +75,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
return true; return true;
} }
function get_name() static public function get_name()
{ {
return 'CAPTCHA_RECAPTCHA'; return 'CAPTCHA_RECAPTCHA';
} }
@ -163,7 +163,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
'RECAPTCHA_SERVER' => $this->recaptcha_server, 'RECAPTCHA_SERVER' => $this->recaptcha_server,
'RECAPTCHA_PUBKEY' => isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '', 'RECAPTCHA_PUBKEY' => isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '',
'RECAPTCHA_ERRORGET' => '', 'RECAPTCHA_ERRORGET' => '',
'S_RECAPTCHA_AVAILABLE' => $this->is_available(), 'S_RECAPTCHA_AVAILABLE' => self::is_available(),
'S_CONFIRM_CODE' => true, 'S_CONFIRM_CODE' => true,
'S_TYPE' => $this->type, 'S_TYPE' => $this->type,
'L_CONFIRM_EXPLAIN' => $explain, 'L_CONFIRM_EXPLAIN' => $explain,