diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-02-03 14:42:42 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-03-24 17:08:55 +0100 |
| commit | ca883f119614bf636802320e60822e1ed4992f2e (patch) | |
| tree | 02b8413f05ce2f2b16db7a9f2d647d132551087f /phpBB/phpbb/auth | |
| parent | 3d0153de605d8a37e233df4db8abd66216623d2e (diff) | |
| download | forums-ca883f119614bf636802320e60822e1ed4992f2e.tar forums-ca883f119614bf636802320e60822e1ed4992f2e.tar.gz forums-ca883f119614bf636802320e60822e1ed4992f2e.tar.bz2 forums-ca883f119614bf636802320e60822e1ed4992f2e.tar.xz forums-ca883f119614bf636802320e60822e1ed4992f2e.zip | |
[ticket/13564] Allow to specify user id for retrieving auth link data
PHPBB3-13564
Diffstat (limited to 'phpBB/phpbb/auth')
| -rw-r--r-- | phpBB/phpbb/auth/provider/base.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/auth/provider/oauth/oauth.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/auth/provider/provider_interface.php | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/phpBB/phpbb/auth/provider/base.php b/phpBB/phpbb/auth/provider/base.php index 4c49070eaf..dea27ccc25 100644 --- a/phpBB/phpbb/auth/provider/base.php +++ b/phpBB/phpbb/auth/provider/base.php @@ -61,7 +61,7 @@ abstract class base implements \phpbb\auth\provider\provider_interface /** * {@inheritdoc} */ - public function get_auth_link_data() + public function get_auth_link_data($user_id = 0) { return; } diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php index c0ce3f1fba..9fc3a107e6 100644 --- a/phpBB/phpbb/auth/provider/oauth/oauth.php +++ b/phpBB/phpbb/auth/provider/oauth/oauth.php @@ -553,13 +553,13 @@ class oauth extends \phpbb\auth\provider\base /** * {@inheritdoc} */ - public function get_auth_link_data() + public function get_auth_link_data($user_id = 0) { $block_vars = array(); // Get all external accounts tied to the current user $data = array( - 'user_id' => (int) $this->user->data['user_id'], + 'user_id' => ($user_id <= 0) ? (int) $this->user->data['user_id'] : (int) $user_id, ); $sql = 'SELECT oauth_provider_id, provider FROM ' . $this->auth_provider_oauth_token_account_assoc . ' WHERE ' . $this->db->sql_build_array('SELECT', $data); diff --git a/phpBB/phpbb/auth/provider/provider_interface.php b/phpBB/phpbb/auth/provider/provider_interface.php index 613297cefc..35e0f559a1 100644 --- a/phpBB/phpbb/auth/provider/provider_interface.php +++ b/phpBB/phpbb/auth/provider/provider_interface.php @@ -166,6 +166,10 @@ interface provider_interface /** * Returns an array of data necessary to build the ucp_auth_link page * + * @param int $user_id User ID for whom the data should be retrieved. + * defaults to 0, which is not a valid ID. The method + * should fall back to the current user's ID in this + * case. * @return array|null If this function is not implemented on an auth * provider then it returns null. If it is implemented * it will return an array of up to four elements of @@ -181,7 +185,7 @@ interface provider_interface * 'VARS' => array(...), * ) */ - public function get_auth_link_data(); + public function get_auth_link_data($user_id = 0); /** * Unlinks an external account from a phpBB account. |