From 3cbb97316066b606548af5d24b4fe2199533cffe Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Fri, 2 Aug 2013 14:37:15 -0400
Subject: [feature/oauth] Pass users_table as parameter to OAuth in construct

PHPBB3-11673
---
 phpBB/phpbb/auth/provider/oauth/oauth.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb')

diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php
index 786caf5463..4973cde349 100644
--- a/phpBB/phpbb/auth/provider/oauth/oauth.php
+++ b/phpBB/phpbb/auth/provider/oauth/oauth.php
@@ -74,6 +74,13 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
 	*/
 	protected $service_providers;
 
+	/**
+	* Users table
+	*
+	* @var string
+	*/
+	protected $users_table;
+
 	/**
 	* Cached current uri object
 	*
@@ -91,8 +98,9 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
 	* @param	string			$auth_provider_oauth_token_storage_table
 	* @param	string			$auth_provider_oauth_token_account_assoc
 	* @param	phpbb_di_service_collection	$service_providers Contains phpbb_auth_provider_oauth_service_interface
+	* @param	string			$users)table
 	*/
-	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $auth_provider_oauth_token_storage_table, $auth_provider_oauth_token_account_assoc, phpbb_di_service_collection $service_providers)
+	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $auth_provider_oauth_token_storage_table, $auth_provider_oauth_token_account_assoc, phpbb_di_service_collection $service_providers, $users_table)
 	{
 		$this->db = $db;
 		$this->config = $config;
@@ -101,6 +109,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
 		$this->auth_provider_oauth_token_storage_table = $auth_provider_oauth_token_storage_table;
 		$this->auth_provider_oauth_token_account_assoc = $auth_provider_oauth_token_account_assoc;
 		$this->service_providers = $service_providers;
+		$this->users_table = $users_table;
 	}
 
 	/**
@@ -184,7 +193,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
 
 			// Retrieve the user's account
 			$sql = 'SELECT user_id, username, user_password, user_passchg, user_pass_convert, user_email, user_type, user_login_attempts
-			FROM ' . USERS_TABLE . "
+			FROM ' . $this->users_table . "
 			WHERE user_id = '" . $this->db->sql_escape($row['user_id']) . "'";
 			$result = $this->db->sql_query($sql);
 			$row = $this->db->sql_fetchrow($result);
-- 
cgit v1.2.1