@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * |
|
4 | - * 2FA extension for the phpBB Forum Software package. |
|
5 | - * |
|
6 | - * @copyright (c) 2015 Paul Sohier |
|
7 | - * @license GNU General Public License, version 2 (GPL-2.0) |
|
8 | - * |
|
9 | - */ |
|
3 | + * |
|
4 | + * 2FA extension for the phpBB Forum Software package. |
|
5 | + * |
|
6 | + * @copyright (c) 2015 Paul Sohier |
|
7 | + * @license GNU General Public License, version 2 (GPL-2.0) |
|
8 | + * |
|
9 | + */ |
|
10 | 10 | |
11 | 11 | /** |
12 | 12 | * DO NOT CHANGE |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * |
|
4 | - * 2FA extension for the phpBB Forum Software package. |
|
5 | - * |
|
6 | - * @copyright (c) 2015 Paul Sohier |
|
7 | - * @license GNU General Public License, version 2 (GPL-2.0) |
|
8 | - * |
|
9 | - */ |
|
3 | + * |
|
4 | + * 2FA extension for the phpBB Forum Software package. |
|
5 | + * |
|
6 | + * @copyright (c) 2015 Paul Sohier |
|
7 | + * @license GNU General Public License, version 2 (GPL-2.0) |
|
8 | + * |
|
9 | + */ |
|
10 | 10 | |
11 | 11 | /** |
12 | 12 | * DO NOT CHANGE |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * |
|
4 | - * 2FA extension for the phpBB Forum Software package. |
|
5 | - * |
|
6 | - * @copyright (c) 2015 Paul Sohier |
|
7 | - * @license GNU General Public License, version 2 (GPL-2.0) |
|
8 | - * |
|
9 | - */ |
|
3 | + * |
|
4 | + * 2FA extension for the phpBB Forum Software package. |
|
5 | + * |
|
6 | + * @copyright (c) 2015 Paul Sohier |
|
7 | + * @license GNU General Public License, version 2 (GPL-2.0) |
|
8 | + * |
|
9 | + */ |
|
10 | 10 | |
11 | 11 | /** |
12 | 12 | * DO NOT CHANGE |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * |
|
4 | - * 2FA extension for the phpBB Forum Software package. |
|
5 | - * |
|
6 | - * @copyright (c) 2015 Paul Sohier |
|
7 | - * @license GNU General Public License, version 2 (GPL-2.0) |
|
8 | - * |
|
9 | - */ |
|
3 | + * |
|
4 | + * 2FA extension for the phpBB Forum Software package. |
|
5 | + * |
|
6 | + * @copyright (c) 2015 Paul Sohier |
|
7 | + * @license GNU General Public License, version 2 (GPL-2.0) |
|
8 | + * |
|
9 | + */ |
|
10 | 10 | |
11 | 11 | /** |
12 | 12 | * DO NOT CHANGE |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * |
|
4 | - * 2FA extension for the phpBB Forum Software package. |
|
5 | - * |
|
6 | - * @copyright (c) 2015 Paul Sohier |
|
7 | - * @license GNU General Public License, version 2 (GPL-2.0) |
|
8 | - * |
|
9 | - */ |
|
3 | + * |
|
4 | + * 2FA extension for the phpBB Forum Software package. |
|
5 | + * |
|
6 | + * @copyright (c) 2015 Paul Sohier |
|
7 | + * @license GNU General Public License, version 2 (GPL-2.0) |
|
8 | + * |
|
9 | + */ |
|
10 | 10 | |
11 | 11 | /** |
12 | 12 | * DO NOT CHANGE |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * |
|
4 | - * 2FA extension for the phpBB Forum Software package. |
|
5 | - * |
|
6 | - * @copyright (c) 2015 Paul Sohier |
|
7 | - * @license GNU General Public License, version 2 (GPL-2.0) |
|
8 | - * |
|
9 | - */ |
|
3 | + * |
|
4 | + * 2FA extension for the phpBB Forum Software package. |
|
5 | + * |
|
6 | + * @copyright (c) 2015 Paul Sohier |
|
7 | + * @license GNU General Public License, version 2 (GPL-2.0) |
|
8 | + * |
|
9 | + */ |
|
10 | 10 | |
11 | 11 | namespace paul999\tfa\ucp; |
12 | 12 |
@@ -199,7 +199,7 @@ |
||
199 | 199 | 'LAST_USED' => $this->user->format_date($row['last_used']), |
200 | 200 | )); |
201 | 201 | |
202 | - $reg = new registration_helper(); |
|
202 | + $reg = new registration_helper(); |
|
203 | 203 | $reg->setCounter($row['counter']); |
204 | 204 | $reg->setCertificate($row['certificate']); |
205 | 205 | $reg->setKeyHandle($row['key_handle']); |
@@ -131,12 +131,10 @@ discard block |
||
131 | 131 | $message = $this->user->lang['TFA_KEY_ADDED'] . '<br /><br />' . sprintf($this->user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>'); |
132 | 132 | trigger_error($message); |
133 | 133 | |
134 | - } |
|
135 | - catch (U2fError $err) |
|
134 | + } catch (U2fError $err) |
|
136 | 135 | { |
137 | 136 | $this->createError($err, $error); |
138 | - } |
|
139 | - catch (\InvalidArgumentException $e) |
|
137 | + } catch (\InvalidArgumentException $e) |
|
140 | 138 | { |
141 | 139 | $error[] = $e->getMessage(); |
142 | 140 | } |
@@ -161,8 +159,7 @@ discard block |
||
161 | 159 | if (!check_form_key('ucp_tfa_keys')) |
162 | 160 | { |
163 | 161 | $error[] = 'FORM_INVALID'; |
164 | - } |
|
165 | - else |
|
162 | + } else |
|
166 | 163 | { |
167 | 164 | switch ($mode) |
168 | 165 | { |
@@ -218,8 +215,7 @@ discard block |
||
218 | 215 | if ($count == 0) |
219 | 216 | { |
220 | 217 | trigger_error('TFA_UNABLE_TO_UPDATE_SESSION'); |
221 | - } |
|
222 | - else if ($count > 1) |
|
218 | + } else if ($count > 1) |
|
223 | 219 | { |
224 | 220 | // Reset sessions table. We had multiple sessions with same ID!!! |
225 | 221 | $sql_ary['u2f_request'] = ''; |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * |
|
4 | - * 2FA extension for the phpBB Forum Software package. |
|
5 | - * |
|
6 | - * @copyright (c) 2015 Paul Sohier |
|
7 | - * @license GNU General Public License, version 2 (GPL-2.0) |
|
8 | - * |
|
9 | - */ |
|
3 | + * |
|
4 | + * 2FA extension for the phpBB Forum Software package. |
|
5 | + * |
|
6 | + * @copyright (c) 2015 Paul Sohier |
|
7 | + * @license GNU General Public License, version 2 (GPL-2.0) |
|
8 | + * |
|
9 | + */ |
|
10 | 10 | |
11 | 11 | namespace paul999\tfa\ucp; |
12 | 12 |
@@ -76,14 +76,14 @@ |
||
76 | 76 | */ |
77 | 77 | public function __construct(session_helper_interface $helper, helper $controller_helper, user $user, request_interface $request, driver_interface $db, config $config, $php_ext, $root_path) |
78 | 78 | { |
79 | - $this->helper = $helper; |
|
80 | - $this->controller_helper = $controller_helper; |
|
81 | - $this->user = $user; |
|
79 | + $this->helper = $helper; |
|
80 | + $this->controller_helper = $controller_helper; |
|
81 | + $this->user = $user; |
|
82 | 82 | $this->request = $request; |
83 | - $this->config = $config; |
|
84 | - $this->db = $db; |
|
83 | + $this->config = $config; |
|
84 | + $this->db = $db; |
|
85 | 85 | $this->php_ext = $php_ext; |
86 | - $this->root_path = $root_path; |
|
86 | + $this->root_path = $root_path; |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | /** |
@@ -162,8 +162,7 @@ |
||
162 | 162 | // We simply return and continue the login procedure (The normal way :)), |
163 | 163 | // and will disable all pages untill he has added a 2FA key. |
164 | 164 | return; |
165 | - } |
|
166 | - else |
|
165 | + } else |
|
167 | 166 | { |
168 | 167 | $redirect = $this->request->variable('redirect', "{$this->root_path}index.{$this->php_ext}"); |
169 | 168 | if ($event['admin']) |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * |
|
4 | - * 2FA extension for the phpBB Forum Software package. |
|
5 | - * |
|
6 | - * @copyright (c) 2015 Paul Sohier |
|
7 | - * @license GNU General Public License, version 2 (GPL-2.0) |
|
8 | - * |
|
9 | - */ |
|
3 | + * |
|
4 | + * 2FA extension for the phpBB Forum Software package. |
|
5 | + * |
|
6 | + * @copyright (c) 2015 Paul Sohier |
|
7 | + * @license GNU General Public License, version 2 (GPL-2.0) |
|
8 | + * |
|
9 | + */ |
|
10 | 10 | |
11 | 11 | namespace paul999\tfa\migrations; |
12 | 12 |