aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorJoseph Warner <hardolaf@hardolaf.com>2013-07-23 15:26:33 -0400
committerJoseph Warner <hardolaf@hardolaf.com>2013-07-23 15:26:57 -0400
commit9805927fac30d9c5d99f5f5f8d7207c9a6064724 (patch)
treeed91fe12f034caa99c4f43f832b921482adc564c /phpBB/language
parent77c32645437c77e99f36f6595e1a42cd0f7b7235 (diff)
downloadforums-9805927fac30d9c5d99f5f5f8d7207c9a6064724.tar
forums-9805927fac30d9c5d99f5f5f8d7207c9a6064724.tar.gz
forums-9805927fac30d9c5d99f5f5f8d7207c9a6064724.tar.bz2
forums-9805927fac30d9c5d99f5f5f8d7207c9a6064724.tar.xz
forums-9805927fac30d9c5d99f5f5f8d7207c9a6064724.zip
[feature/oauth] OAuth init method to minimally validate entered data
PHPBB3-11673
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/board.php15
1 files changed, 8 insertions, 7 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 553cd1a6eb..f76834ae50 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -394,13 +394,14 @@ $lang = array_merge($lang, array(
'AUTH_METHOD' => 'Select an authentication method',
- 'AUTH_PROVIDER_OAUTH_EXPLAIN' => 'Each OAuth provider requires a unique secret and key in order to authenticate with the external server.<br />These should be supplied by the OAuth service when you register your website with them and should be entered exactly as provided to you.<br />Any service that does not have both a key and a secret entered here will not be available for use by the forum users.',
- 'AUTH_PROVIDER_OAUTH_KEY' => 'Key',
- 'AUTH_PROVIDER_OAUTH_SERVICE_BITLY' => 'Bitly',
- 'AUTH_PROVIDER_OAUTH_SERVICE_FACEBOOK' => 'Facebook',
- 'AUTH_PROVIDER_OAUTH_SERVICE_GOOGLE' => 'Google',
- 'AUTH_PROVIDER_OAUTH_TITLE' => 'OAuth',
- 'AUTH_PROVIDER_OAUTH_SECRET' => 'Secret',
+ 'AUTH_PROVIDER_OAUTH_ERROR_ELEMENT_MISSING' => 'Both the key and secret of each enabled OAuth service provider must be provided. Only one was provided for an OAuth service provider.',
+ 'AUTH_PROVIDER_OAUTH_EXPLAIN' => 'Each OAuth provider requires a unique secret and key in order to authenticate with the external server.<br />These should be supplied by the OAuth service when you register your website with them and should be entered exactly as provided to you.<br />Any service that does not have both a key and a secret entered here will not be available for use by the forum users.',
+ 'AUTH_PROVIDER_OAUTH_KEY' => 'Key',
+ 'AUTH_PROVIDER_OAUTH_SERVICE_BITLY' => 'Bitly',
+ 'AUTH_PROVIDER_OAUTH_SERVICE_FACEBOOK' => 'Facebook',
+ 'AUTH_PROVIDER_OAUTH_SERVICE_GOOGLE' => 'Google',
+ 'AUTH_PROVIDER_OAUTH_TITLE' => 'OAuth',
+ 'AUTH_PROVIDER_OAUTH_SECRET' => 'Secret',
'APACHE_SETUP_BEFORE_USE' => 'You have to setup apache authentication before you switch phpBB to this authentication method. Keep in mind that the username you use for apache authentication has to be the same as your phpBB username. Apache authentication can only be used with mod_php (not with a CGI version) and safe_mode disabled.',