diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-08-11 12:23:21 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-08-11 12:23:21 +0200 |
| commit | f09db1a7b4d9172035a461e90ce6fa3d7b544df3 (patch) | |
| tree | 77aa906455cf020db4e2bec413c56caaec45b8c6 /phpBB/config | |
| parent | 7b35bd3e7cb7e18da6aae39807880731c820b0cf (diff) | |
| parent | 91df95a90dd3266f4beeb7df7534f75882909581 (diff) | |
| download | forums-f09db1a7b4d9172035a461e90ce6fa3d7b544df3.tar forums-f09db1a7b4d9172035a461e90ce6fa3d7b544df3.tar.gz forums-f09db1a7b4d9172035a461e90ce6fa3d7b544df3.tar.bz2 forums-f09db1a7b4d9172035a461e90ce6fa3d7b544df3.tar.xz forums-f09db1a7b4d9172035a461e90ce6fa3d7b544df3.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/config/services.yml
Diffstat (limited to 'phpBB/config')
| -rw-r--r-- | phpBB/config/auth_providers.yml | 1 | ||||
| -rw-r--r-- | phpBB/config/captcha.yml | 62 | ||||
| -rw-r--r-- | phpBB/config/services.yml | 1 |
3 files changed, 64 insertions, 0 deletions
diff --git a/phpBB/config/auth_providers.yml b/phpBB/config/auth_providers.yml index d2f22ec477..db7c603bcd 100644 --- a/phpBB/config/auth_providers.yml +++ b/phpBB/config/auth_providers.yml @@ -14,6 +14,7 @@ services: - @passwords.manager - @request - @user + - @service_container - %core.root_path% - %core.php_ext% tags: diff --git a/phpBB/config/captcha.yml b/phpBB/config/captcha.yml new file mode 100644 index 0000000000..bca37767af --- /dev/null +++ b/phpBB/config/captcha.yml @@ -0,0 +1,62 @@ +parameters: + tables.captcha_qa_questions: %core.table_prefix%captcha_questions + tables.captcha_qa_answers: %core.table_prefix%captcha_answers + tables.captcha_qa_confirm: %core.table_prefix%qa_confirm + +services: + captcha.factory: + class: phpbb\captcha\factory + arguments: + - @service_container + - @captcha.plugins.service_collection + + captcha.plugins.service_collection: + class: phpbb\di\service_collection + arguments: + - @service_container + tags: + - { name: service_collection, tag: captcha.plugins } + + core.captcha.plugins.gd: + class: phpbb\captcha\plugins\gd + scope: prototype # scope MUST be prototype for this to work! + calls: + - [set_name, [core.captcha.plugins.gd]] + tags: + - { name: captcha.plugins } + + core.captcha.plugins.gd_wave: + class: phpbb\captcha\plugins\gd_wave + scope: prototype # scope MUST be prototype for this to work! + calls: + - [set_name, [core.captcha.plugins.gd_wave]] + tags: + - { name: captcha.plugins } + + core.captcha.plugins.nogd: + class: phpbb\captcha\plugins\nogd + scope: prototype # scope MUST be prototype for this to work! + calls: + - [set_name, [core.captcha.plugins.nogd]] + tags: + - { name: captcha.plugins } + + core.captcha.plugins.qa: + class: phpbb\captcha\plugins\qa + scope: prototype # scope MUST be prototype for this to work! + arguments: + - %tables.captcha_qa_questions% + - %tables.captcha_qa_answers% + - %tables.captcha_qa_confirm% + calls: + - [set_name, [core.captcha.plugins.qa]] + tags: + - { name: captcha.plugins } + + core.captcha.plugins.recaptcha: + class: phpbb\captcha\plugins\recaptcha + scope: prototype # scope MUST be prototype for this to work! + calls: + - [set_name, [core.captcha.plugins.recaptcha]] + tags: + - { name: captcha.plugins } diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index bbe0d2ca87..751aea03ae 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -11,6 +11,7 @@ imports: - { resource: passwords.yml } - { resource: profilefields.yml } - { resource: twig.yml } + - { resource: captcha.yml } - { resource: parameters.yml } services: |