1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

[ticket/11700] Fix authentication acp after develop merge

PHPBB3-11700
This commit is contained in:
Nils Adermann
2013-09-16 03:22:13 +02:00
parent 09cfa01d58
commit 1fa673bded
6 changed files with 36 additions and 28 deletions

View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\auth\provider\oauth\service;
/**
* @ignore
*/
@@ -20,29 +22,29 @@ if (!defined('IN_PHPBB'))
*
* @package auth
*/
class phpbb_auth_provider_oauth_service_facebook extends phpbb_auth_provider_oauth_service_base
class facebook extends base
{
/**
* phpBB config
*
* @var phpbb_config
* @var phpbb\config\config
*/
protected $config;
/**
* phpBB request
*
* @var phpbb_request
* @var phpbb\request\request_interface
*/
protected $request;
/**
* Constructor
*
* @param phpbb_config $config
* @param phpbb_request $request
* @param phpbb\config\config $config
* @param phpbb\request\request_interface $request
*/
public function __construct(phpbb_config $config, phpbb_request $request)
public function __construct(\phpbb\config\config $config, \phpbb\request\request_interface $request)
{
$this->config = $config;
$this->request = $request;
@@ -66,7 +68,7 @@ class phpbb_auth_provider_oauth_service_facebook extends phpbb_auth_provider_oau
{
if (!($this->service_provider instanceof \OAuth\OAuth2\Service\Facebook))
{
throw new phpbb_auth_provider_oauth_service_exception('AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE');
throw new exception('AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE');
}
// This was a callback request, get the token
@@ -86,7 +88,7 @@ class phpbb_auth_provider_oauth_service_facebook extends phpbb_auth_provider_oau
{
if (!($this->service_provider instanceof \OAuth\OAuth2\Service\Facebook))
{
throw new phpbb_auth_provider_oauth_service_exception('AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE');
throw new exception('AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE');
}
// Send a request with it