paul999 / phpbb_2fa

event/listener.php

Braces +1 added lines, -2 removed lines

@@ -199,8 +199,7 @@
 					// We simply return and continue the login procedure (The normal way :)),
 					// and will disable all pages until he has added a 2FA key.
 					return $event;
-				}
-				else
+				} else
 				{
 					$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', ''));
 				}

controller/main_controller.php

Indentation +28 added lines, -28 removed lines

@@ -69,26 +69,26 @@ 
 	 * @var string
 	 */
 	private $php_ext;
-    /**
-     * @var phpbb\log\log
-     */
-    private $log;
-
-    /**
-     * Constructor
-     *
-     * @access public
-     * @param helper $controller_helper
-     * @param driver_interface $db
-     * @param template $template
-     * @param user $user
-     * @param request_interface $request
-     * @param config $config
-     * @param log $log
-     * @param session_helper_interface $session_helper
-     * @param string $root_path
-     * @param string $php_ext
-     */
+	/**
+	 * @var phpbb\log\log
+	 */
+	private $log;
+
+	/**
+	 * Constructor
+	 *
+	 * @access public
+	 * @param helper $controller_helper
+	 * @param driver_interface $db
+	 * @param template $template
+	 * @param user $user
+	 * @param request_interface $request
+	 * @param config $config
+	 * @param log $log
+	 * @param session_helper_interface $session_helper
+	 * @param string $root_path
+	 * @param string $php_ext
+	 */
 	public function __construct(helper $controller_helper, driver_interface $db, template $template, user $user, request_interface $request, config $config, log $log, session_helper_interface $session_helper, $root_path, $php_ext)
 	{
 		$this->controller_helper 	= $controller_helper;
@@ -100,8 +100,8 @@ 
 		$this->session_helper		= $session_helper;
 		$this->root_path			= $root_path;
 		$this->php_ext				= $php_ext;
-        $this->log                  = $log;
-    }
+		$this->log                  = $log;
+	}
 
 	/**
 	 * @param int  $user_id
@@ -165,12 +165,12 @@ 
 		catch (http_exception $ex) // @TODO: Replace exception with own exception
 		{
 
-            $this->log->add('error', $this->user->data['user_id'], $this->user->ip, 'LOG_TFA_EXCEPTION', $ex->getMessage());
+			$this->log->add('error', $this->user->data['user_id'], $this->user->ip, 'LOG_TFA_EXCEPTION', $ex->getMessage());
 
-            if ($admin) {
-                // Also log it to admin  log just to be sure.
-                $this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_TFA_EXCEPTION', $ex->getMessage());
-            }
+			if ($admin) {
+				// Also log it to admin  log just to be sure.
+				$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_TFA_EXCEPTION', $ex->getMessage());
+			}
 			if ($ex->getStatusCode() == 400)
 			{
 				$this->template->assign_var('S_ERROR', $this->user->lang($ex->getMessage()));
@@ -205,7 +205,7 @@ 
 					AND session_user_id = " . (int) $user_id;
 				$this->db->sql_query($sql);
 
-                $this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_ADMIN_AUTH_SUCCESS');
+				$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_ADMIN_AUTH_SUCCESS');
 
 				redirect(append_sid("{$this->root_path}adm/index.{$this->php_ext}", false, true, $this->user->data['session_id']));
 			}

Spacing +14 added lines, -14 removed lines

@@ -91,16 +91,16 @@ 
      */
 	public function __construct(helper $controller_helper, driver_interface $db, template $template, user $user, request_interface $request, config $config, log $log, session_helper_interface $session_helper, $root_path, $php_ext)
 	{
-		$this->controller_helper 	= $controller_helper;
-		$this->template 			= $template;
-		$this->db					= $db;
-		$this->user					= $user;
-		$this->request				= $request;
-		$this->config				= $config;
-		$this->session_helper		= $session_helper;
-		$this->root_path			= $root_path;
-		$this->php_ext				= $php_ext;
-        $this->log                  = $log;
+		$this->controller_helper = $controller_helper;
+		$this->template = $template;
+		$this->db = $db;
+		$this->user = $user;
+		$this->request = $request;
+		$this->config = $config;
+		$this->session_helper = $session_helper;
+		$this->root_path = $root_path;
+		$this->php_ext = $php_ext;
+        $this->log = $log;
     }
 
 	/**
@@ -135,9 +135,9 @@ 
 			'tfa_random' => '',
 			'tfa_uid'    => 0,
 		);
-		$sql = 'UPDATE ' . SESSIONS_TABLE . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
+		$sql = 'UPDATE '.SESSIONS_TABLE.' SET '.$this->db->sql_build_array('UPDATE', $sql_ary)."
 			WHERE
-				session_id = '" . $this->db->sql_escape($this->user->data['session_id']) . "' AND
+				session_id = '" . $this->db->sql_escape($this->user->data['session_id'])."' AND
 				session_user_id = " . (int) $this->user->data['user_id'];
 		$this->db->sql_query($sql);
 
@@ -200,8 +200,8 @@ 
 			if ($admin)
 			{
 				// the login array is used because the user ids do not differ for re-authentication
-				$sql = 'DELETE FROM ' . SESSIONS_TABLE . "
-					WHERE session_id = '" . $this->db->sql_escape($old_session_id) . "'
+				$sql = 'DELETE FROM '.SESSIONS_TABLE."
+					WHERE session_id = '" . $this->db->sql_escape($old_session_id)."'
 					AND session_user_id = " . (int) $user_id;
 				$this->db->sql_query($sql);
 

Braces +2 added lines, -4 removed lines

@@ -161,8 +161,7 @@ 
 				$this->template->assign_var('S_ERROR', $this->user->lang('TFA_INCORRECT_KEY'));
 				$this->session_helper->generate_page($user_id, $admin, $auto_login, $viewonline, $redirect);
 			}
-		}
-		catch (http_exception $ex) // @TODO: Replace exception with own exception
+		} catch (http_exception $ex) // @TODO: Replace exception with own exception
 		{
 
             $this->log->add('error', $this->user->data['user_id'], $this->user->ip, 'LOG_TFA_EXCEPTION', $ex->getMessage());
@@ -175,8 +174,7 @@ 
 			{
 				$this->template->assign_var('S_ERROR', $this->user->lang($ex->getMessage()));
 				$this->session_helper->generate_page($user_id, $admin, $auto_login, $viewonline, $redirect);
-			}
-			else
+			} else
 			{
 				throw $ex;
 			}