@@ -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']) |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | 'title' => 'ACP_TFA_SETTINGS', |
44 | 44 | 'vars' => array( |
45 | 45 | 'legend1' => 'ACP_TFA_SETTINGS', |
46 | - 'tfa_mode' => array('lang' => 'TFA_MODE', 'validate' => 'bool', 'type' => 'select', 'method' => 'select_tfa_method', 'explain' => true), |
|
46 | + 'tfa_mode' => array('lang' => 'TFA_MODE', 'validate' => 'bool', 'type' => 'select', 'method' => 'select_tfa_method', 'explain' => true), |
|
47 | 47 | |
48 | 48 | 'legend4' => 'ACP_SUBMIT_CHANGES', |
49 | 49 | ) |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | $l_explain = ''; |
147 | 147 | if ($vars['explain'] && isset($user->lang[$vars['lang'] . '_EXPLAIN'])) |
148 | 148 | { |
149 | - $l_explain = $user->lang[$vars['lang'] . '_EXPLAIN']; |
|
149 | + $l_explain = $user->lang[$vars['lang'] . '_EXPLAIN']; |
|
150 | 150 | } |
151 | 151 | |
152 | 152 | $content = build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars); |
@@ -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\acp; |
12 | 12 |
@@ -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\acp; |
12 | 12 |
@@ -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\acp; |
12 | 12 |
@@ -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\acp; |
12 | 12 |
@@ -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\acp; |
12 | 12 |
@@ -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\acp; |
12 | 12 |
@@ -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\acp; |
12 | 12 |
@@ -64,10 +64,10 @@ |
||
64 | 64 | */ |
65 | 65 | private function setup(user $user, template $template, request_interface $request, session_helper $session_helper) |
66 | 66 | { |
67 | - $this->user = $user; |
|
67 | + $this->user = $user; |
|
68 | 68 | $this->template = $template; |
69 | 69 | $this->request = $request; |
70 | - $this->session_helper = $session_helper; |
|
70 | + $this->session_helper = $session_helper; |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | /** |
@@ -101,13 +101,11 @@ discard block |
||
101 | 101 | meta_refresh(3, $this->u_action); |
102 | 102 | $message = $this->user->lang['TFA_KEY_ADDED'] . '<br /><br />' . sprintf($this->user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>'); |
103 | 103 | trigger_error($message); |
104 | - } |
|
105 | - else |
|
104 | + } else |
|
106 | 105 | { |
107 | 106 | $error[] = $this->user->lang('TFA_MODULE_NOT_FOUND', $class); |
108 | 107 | } |
109 | - } |
|
110 | - catch (\Exception $e) |
|
108 | + } catch (\Exception $e) |
|
111 | 109 | { |
112 | 110 | $error[] = $e->getMessage(); |
113 | 111 | } |
@@ -130,8 +128,7 @@ discard block |
||
130 | 128 | if (!check_form_key('ucp_tfa_keys')) |
131 | 129 | { |
132 | 130 | $error[] = 'FORM_INVALID'; |
133 | - } |
|
134 | - else |
|
131 | + } else |
|
135 | 132 | { |
136 | 133 | switch ($mode) |
137 | 134 | { |
@@ -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\acp; |
12 | 12 |