Completed
Push — master ( 6cfe9f...d6cbe8 )
by Paul
13s queued 10s
created
event/listener.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -199,8 +199,7 @@
 block discarded – undo
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
 				}
Please login to merge, or discard this patch.
controller/main_controller.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -162,8 +162,7 @@  discard block
 block discarded – undo
162 162
 				$this->template->assign_var('S_ERROR', $this->user->lang('TFA_INCORRECT_KEY'));
163 163
 				$this->session_helper->generate_page($user_id, $admin, $auto_login, $viewonline, $redirect);
164 164
 			}
165
-		}
166
-		catch (http_exception $ex) // @TODO: Replace exception with own exception
165
+		} catch (http_exception $ex) // @TODO: Replace exception with own exception
167 166
 		{
168 167
 
169 168
 			$this->log->add('critical', $this->user->data['user_id'], $this->user->ip, 'LOG_TFA_EXCEPTION', false, [$ex->getMessage()]);
@@ -177,8 +176,7 @@  discard block
 block discarded – undo
177 176
 			{
178 177
 				$this->template->assign_var('S_ERROR', $this->user->lang($ex->getMessage()));
179 178
 				$this->session_helper->generate_page($user_id, $admin, $auto_login, $viewonline, $redirect);
180
-			}
181
-			else
179
+			} else
182 180
 			{
183 181
 				throw $ex;
184 182
 			}
Please login to merge, or discard this patch.