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

[ticket/11854] Rename captchas.factory service to captcha.factory

Browse source 
PHPBB3-11854
This commit is contained in:
Tristan Darricau 2014-08-09 15:57:01 +02:00
parent d73d606f11
commit b91abf1a0b
10 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/config/captcha.yml
View file

@ -1,5 +1,5 @@
services: services:
captchas.factory: captcha.factory:
class: phpbb\captcha\factory class: phpbb\captcha\factory
arguments: arguments:
- @service_container - @service_container

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

@ -30,7 +30,7 @@ class acp_captcha
$user->add_lang('acp/board'); $user->add_lang('acp/board');
$factory = $phpbb_container->get('captchas.factory'); $factory = $phpbb_container->get('captcha.factory');
$captchas = $factory->get_captcha_types(); $captchas = $factory->get_captcha_types();
$selected = request_var('select_captcha', $config['captcha_plugin']); $selected = request_var('select_captcha', $config['captcha_plugin']);
@ -138,7 +138,7 @@ class acp_captcha
{ {
global $db, $user, $config, $phpbb_container; global $db, $user, $config, $phpbb_container;
$captcha = $phpbb_container->get('captchas.factory')->get_instance($selected); $captcha = $phpbb_container->get('captcha.factory')->get_instance($selected);
$captcha->init(CONFIRM_REG); $captcha->init(CONFIRM_REG);
$captcha->execute_demo(); $captcha->execute_demo();

2
phpBB/includes/functions.php
View file

@ -2839,7 +2839,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
{ {
case LOGIN_ERROR_ATTEMPTS: case LOGIN_ERROR_ATTEMPTS:
$captcha = $phpbb_container->get('captchas.factory')->get_instance($config['captcha_plugin']); $captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']);
$captcha->init(CONFIRM_LOGIN); $captcha->init(CONFIRM_LOGIN);
// $captcha->reset(); // $captcha->reset();

2
phpBB/includes/ucp/ucp_confirm.php
View file

@ -38,7 +38,7 @@ class ucp_confirm
{ {
global $db, $user, $phpbb_root_path, $config, $phpEx, $phpbb_container; global $db, $user, $phpbb_root_path, $config, $phpEx, $phpbb_container;
$captcha = $phpbb_container->get('captchas.factory')->get_instance($config['captcha_plugin']); $captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']);
$captcha->init(request_var('type', 0)); $captcha->init(request_var('type', 0));
$captcha->execute(); $captcha->execute();

2
phpBB/includes/ucp/ucp_login_link.php
View file

@ -197,7 +197,7 @@ class ucp_login_link
{ {
case LOGIN_ERROR_ATTEMPTS: case LOGIN_ERROR_ATTEMPTS:
$captcha = $phpbb_container->get('captchas.factory')->get_instance($config['captcha_plugin']); $captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']);
$captcha->init(CONFIRM_LOGIN); $captcha->init(CONFIRM_LOGIN);
$template->assign_vars(array( $template->assign_vars(array(

2
phpBB/includes/ucp/ucp_register.php
View file

@ -182,7 +182,7 @@ class ucp_register
// The CAPTCHA kicks in here. We can't help that the information gets lost on language change. // The CAPTCHA kicks in here. We can't help that the information gets lost on language change.
if ($config['enable_confirm']) if ($config['enable_confirm'])
{ {
$captcha = $phpbb_container->get('captchas.factory')->get_instance($config['captcha_plugin']); $captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']);
$captcha->init(CONFIRM_REG); $captcha->init(CONFIRM_REG);
} }

2
phpBB/phpbb/session.php
View file

@ -1022,7 +1022,7 @@ class session
} }
// only called from CRON; should be a safe workaround until the infrastructure gets going // only called from CRON; should be a safe workaround until the infrastructure gets going
$captcha_factory = $phpbb_container->get('captchas.factory'); $captcha_factory = $phpbb_container->get('captcha.factory');
$captcha_factory->garbage_collect($config['captcha_plugin']); $captcha_factory->garbage_collect($config['captcha_plugin']);
$sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . ' $sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . '

2
phpBB/posting.php
View file

@ -241,7 +241,7 @@ $user->setup(array('posting', 'mcp', 'viewtopic'), $post_data['forum_style']);
if ($config['enable_post_confirm'] && !$user->data['is_registered']) if ($config['enable_post_confirm'] && !$user->data['is_registered'])
{ {
$captcha = $phpbb_container->get('captchas.factory')->get_instance($config['captcha_plugin']); $captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']);
$captcha->init(CONFIRM_POST); $captcha->init(CONFIRM_POST);
} }

2
phpBB/report.php
View file

@ -151,7 +151,7 @@ else
if ($config['enable_post_confirm'] && !$user->data['is_registered']) if ($config['enable_post_confirm'] && !$user->data['is_registered'])
{ {
$captcha = $phpbb_container->get('captchas.factory')->get_instance($config['captcha_plugin']); $captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']);
$captcha->init(CONFIRM_REPORT); $captcha->init(CONFIRM_REPORT);
} }

2
tests/session/garbage_collection_test.php
View file

@ -33,7 +33,7 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case
$plugins = new \phpbb\di\service_collection($phpbb_container); $plugins = new \phpbb\di\service_collection($phpbb_container);
$plugins->add('core.captcha.plugins.nogd'); $plugins->add('core.captcha.plugins.nogd');
$phpbb_container->set( $phpbb_container->set(
'captchas.factory', 'captcha.factory',
new \phpbb\captcha\factory($phpbb_container, $plugins) new \phpbb\captcha\factory($phpbb_container, $plugins)
); );
$phpbb_container->set( $phpbb_container->set(