diff options
| author | mrgoldy <gijsmartens1@gmail.com> | 2019-05-05 21:41:06 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-11-03 11:48:08 +0100 |
| commit | 219955fa6cf7de3fadf96f99292c4e411b3decfc (patch) | |
| tree | 7079391407541c3275f679d87f6f57bab24fadcb | |
| parent | 95a696c4daa7f481c71362f87d9b6c6cae34cbf4 (diff) | |
| download | forums-219955fa6cf7de3fadf96f99292c4e411b3decfc.tar forums-219955fa6cf7de3fadf96f99292c4e411b3decfc.tar.gz forums-219955fa6cf7de3fadf96f99292c4e411b3decfc.tar.bz2 forums-219955fa6cf7de3fadf96f99292c4e411b3decfc.tar.xz forums-219955fa6cf7de3fadf96f99292c4e411b3decfc.zip | |
[ticket/16008] Remove empty line, re-add @changed and remove duplicate code
PHPBB3-16008
| -rw-r--r-- | phpBB/phpbb/auth/provider/oauth/oauth.php | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php index a1538761f1..20810149dd 100644 --- a/phpBB/phpbb/auth/provider/oauth/oauth.php +++ b/phpBB/phpbb/auth/provider/oauth/oauth.php @@ -242,7 +242,7 @@ class oauth extends \phpbb\auth\provider\base * @var array redirect_data Data to be appended to the redirect url * @var ServiceInterface service OAuth service * @since 3.2.3-RC1 - * @changed 3.2.6-RC1 Added redirect_data + * @changed 3.2.6-RC1 Added redirect_data */ $vars = [ 'row', @@ -282,7 +282,7 @@ class oauth extends \phpbb\auth\provider\base /** * Check if the user is banned. - * The fourth parameter, return, has to be true, otherwise the OAuth login is still called and + * The fourth parameter (return) has to be true, otherwise the OAuth login is still called and * an uncaught exception is thrown as there is no token stored in the database. */ $ban = $this->user->check_ban($row['user_id'], $row['user_ip'], $row['user_email'], true); @@ -305,31 +305,6 @@ class oauth extends \phpbb\auth\provider\base ]; } - /** - * Check if the user is banned. - * The fourth parameter, return, has to be true, - * otherwise the OAuth login is still called and - * an uncaught exception is thrown as there is no - * token stored in the database. - */ - $ban = $this->user->check_ban($row['user_id'], $row['user_ip'], $row['user_email'], true); - if (!empty($ban)) - { - $till_date = !empty($ban['ban_end']) ? $this->user->format_date($ban['ban_end']) : ''; - $message = !empty($ban['ban_end']) ? 'BOARD_BAN_TIME' : 'BOARD_BAN_PERM'; - - $contact_link = phpbb_get_board_contact_link($this->config, $this->phpbb_root_path, $this->php_ext); - $message = $this->user->lang($message, $till_date, '<a href="' . $contact_link . '">', '</a>'); - $message .= !empty($ban['ban_give_reason']) ? '<br /><br />' . $this->user->lang('BOARD_BAN_REASON', $ban['ban_give_reason']) : ''; - $message .= !empty($ban['ban_triggered_by']) ? '<br /><br /><em>' . $this->user->lang('BAN_TRIGGERED_BY_' . strtoupper($ban['ban_triggered_by'])) . '</em>' : ''; - - return array( - 'status' => LOGIN_BREAK, - 'error_msg' => $message, - 'user_row' => $row, - ); - } - // Update token storage to store the user_id $storage->set_user_id($row['user_id']); |