@@ -199,8 +199,7 @@ |
||
199 | 199 | // We simply return and continue the login procedure (The normal way :)), |
200 | 200 | // and will disable all pages until he has added a 2FA key. |
201 | 201 | return $event; |
202 | - } |
|
203 | - else |
|
202 | + } else |
|
204 | 203 | { |
205 | 204 | $this->session_helper->generate_page($event['login']['user_row']['user_id'], $event['admin'], $event['autologin'], !$this->request->is_set_post('viewonline'), $this->request->variable('redirect', '')); |
206 | 205 | } |
@@ -161,8 +161,7 @@ discard block |
||
161 | 161 | $this->template->assign_var('S_ERROR', $this->user->lang('TFA_INCORRECT_KEY')); |
162 | 162 | $this->session_helper->generate_page($user_id, $admin, $auto_login, $viewonline, $redirect); |
163 | 163 | } |
164 | - } |
|
165 | - catch (http_exception $ex) // @TODO: Replace exception with own exception |
|
164 | + } catch (http_exception $ex) // @TODO: Replace exception with own exception |
|
166 | 165 | { |
167 | 166 | |
168 | 167 | $this->log->add('error', $this->user->data['user_id'], $this->user->ip, 'LOG_TFA_EXCEPTION', $ex->getMessage()); |
@@ -175,8 +174,7 @@ discard block |
||
175 | 174 | { |
176 | 175 | $this->template->assign_var('S_ERROR', $this->user->lang($ex->getMessage())); |
177 | 176 | $this->session_helper->generate_page($user_id, $admin, $auto_login, $viewonline, $redirect); |
178 | - } |
|
179 | - else |
|
177 | + } else |
|
180 | 178 | { |
181 | 179 | throw $ex; |
182 | 180 | } |