diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-08-11 12:20:35 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-08-11 12:20:35 +0200 |
| commit | 91df95a90dd3266f4beeb7df7534f75882909581 (patch) | |
| tree | 4aa78d8abf67a08571dd7421251d104415dd2bf4 /phpBB/phpbb/auth | |
| parent | c10c6bd34297afbf6b32f5047a85c33fa546c23d (diff) | |
| parent | 756aa68b34e8584c7e010b2295ff63e485be1907 (diff) | |
| download | forums-91df95a90dd3266f4beeb7df7534f75882909581.tar forums-91df95a90dd3266f4beeb7df7534f75882909581.tar.gz forums-91df95a90dd3266f4beeb7df7534f75882909581.tar.bz2 forums-91df95a90dd3266f4beeb7df7534f75882909581.tar.xz forums-91df95a90dd3266f4beeb7df7534f75882909581.zip | |
Merge pull request #2842 from Nicofuma/ticket/11854
[ticket/11854] Move captchas to phpbb/ and use DI for plugins
Diffstat (limited to 'phpBB/phpbb/auth')
| -rw-r--r-- | phpBB/phpbb/auth/provider/db.php | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php index 142a47247f..722eeffa9a 100644 --- a/phpBB/phpbb/auth/provider/db.php +++ b/phpBB/phpbb/auth/provider/db.php @@ -27,6 +27,13 @@ class db extends \phpbb\auth\provider\base protected $passwords_manager; /** + * DI container + * + * @var \Symfony\Component\DependencyInjection\ContainerInterface + */ + protected $phpbb_container; + + /** * Database Authentication Constructor * * @param \phpbb\db\driver\driver_interface $db @@ -34,10 +41,11 @@ class db extends \phpbb\auth\provider\base * @param \phpbb\passwords\manager $passwords_manager * @param \phpbb\request\request $request * @param \phpbb\user $user + * @param \Symfony\Component\DependencyInjection\ContainerInterface $phpbb_container DI container * @param string $phpbb_root_path * @param string $php_ext */ - public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\passwords\manager $passwords_manager, \phpbb\request\request $request, \phpbb\user $user, $phpbb_root_path, $php_ext) + public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\passwords\manager $passwords_manager, \phpbb\request\request $request, \phpbb\user $user, \Symfony\Component\DependencyInjection\ContainerInterface $phpbb_container, $phpbb_root_path, $php_ext) { $this->db = $db; $this->config = $config; @@ -46,6 +54,7 @@ class db extends \phpbb\auth\provider\base $this->user = $user; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; + $this->phpbb_container = $phpbb_container; } /** @@ -146,13 +155,8 @@ class db extends \phpbb\auth\provider\base // Every auth module is able to define what to do by itself... if ($show_captcha) { - // Visual Confirmation handling - if (!class_exists('phpbb_captcha_factory', false)) - { - include ($this->phpbb_root_path . 'includes/captcha/captcha_factory.' . $this->php_ext); - } - - $captcha = \phpbb_captcha_factory::get_instance($this->config['captcha_plugin']); + $captcha_factory = $this->phpbb_container->get('captcha.factory'); + $captcha = $captcha_factory->get_instance($this->config['captcha_plugin']); $captcha->init(CONFIRM_LOGIN); $vc_response = $captcha->validate($row); if ($vc_response) |