paul999 / phpbb_2fa

controller/main_controller.php

Unused Use Statements -1 removed lines

@@ -11,7 +11,6 @@
 namespace paul999\tfa\controller;
 
 use paul999\tfa\helper\session_helper_interface;
-use paul999\tfa\modules\module_interface;
 use phpbb\config\config;
 use phpbb\controller\helper;
 use phpbb\db\driver\driver_interface;

Spacing +14 added lines, -14 removed lines

@@ -87,15 +87,15 @@ 
 	 */
 	public function __construct(helper $controller_helper, driver_interface $db, template $template, user $user, request_interface $request, config $config, 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->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;
 
 	}
 
@@ -121,7 +121,7 @@ 
 			throw new BadRequestHttpException($this->user->lang('TFA_SOMETHING_WENT_WRONG'));
 		}
 		$random = $this->request->variable('random', '');
-		$cookie = $this->request->variable($this->config['cookie_name'] . 'rm', '', false, request_interface::COOKIE);
+		$cookie = $this->request->variable($this->config['cookie_name'].'rm', '', false, request_interface::COOKIE);
 
 		if ($this->user->data['tfa_random'] !== $cookie || $cookie !== $random || $this->user->data['tfa_random'] !== $random || strlen($random) != 40)
 		{
@@ -131,9 +131,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);
 
@@ -171,8 +171,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);
 

event/listener.php

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
 use phpbb\template\template;
 use phpbb\user;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
 /**

Spacing +10 added lines, -10 removed lines

@@ -89,12 +89,12 @@ 
 	 */
 	public function __construct(session_helper_interface $session_helper, helper $controller_helper, user $user, request_interface $request, driver_interface $db, config $config, template $template, $php_ext, $root_path)
 	{
-		$this->session_helper		= $session_helper;
-		$this->controller_helper 	= $controller_helper;
-		$this->user					= $user;
+		$this->session_helper = $session_helper;
+		$this->controller_helper = $controller_helper;
+		$this->user = $user;
 		$this->request				= $request;
-		$this->config				= $config;
-		$this->db					= $db;
+		$this->config = $config;
+		$this->db = $db;
 		$this->php_ext				= $php_ext;
 		$this->root_path			= $root_path;
 		$this->template				= $template;
@@ -136,7 +136,7 @@ 
 		}
 		if ($this->user->data['is_bot'] == false && $this->user->data['user_id'] != ANONYMOUS && $this->session_helper->isTfaRequired($this->user->data['user_id'], false, $this->user->data) && !$this->session_helper->isTfaRegistered($this->user->data['user_id']))
 		{
-			$sql = 'SELECT module_id FROM ' . MODULES_TABLE . ' WHERE module_langname = \'UCP_TFA\' OR module_langname = \'UCP_TFA_MANAGE\'';
+			$sql = 'SELECT module_id FROM '.MODULES_TABLE.' WHERE module_langname = \'UCP_TFA\' OR module_langname = \'UCP_TFA_MANAGE\'';
 			$result = $this->db->sql_query($sql);
 			$allowed_i = array();
 
@@ -148,13 +148,13 @@ 
 			$ucp_mode = "-paul999-tfa-ucp-tfa_module";
 			$allowed_i[] = $ucp_mode;
 
-			if ($this->user->page['page_name'] == 'ucp.' . $this->php_ext && in_array($this->request->variable('i', ''), $allowed_i))
+			if ($this->user->page['page_name'] == 'ucp.'.$this->php_ext && in_array($this->request->variable('i', ''), $allowed_i))
 			{
 				return; // We are at our UCP page, so skip any other checks. This page is always available
 			}
 			$this->user->add_lang_ext('paul999/tfa', 'common');
 			$url = append_sid("{$this->root_path}ucp.{$this->php_ext}", "i={$ucp_mode}");
-			trigger_error($this->user->lang('TFA_REQUIRED_KEY_MISSING', '<a href="' . $url . '">', '</a>'), E_USER_WARNING);
+			trigger_error($this->user->lang('TFA_REQUIRED_KEY_MISSING', '<a href="'.$url.'">', '</a>'), E_USER_WARNING);
 
 		}
 	}
@@ -234,9 +234,9 @@ 
 						'tfa_random' 	=> $random,
 						'tfa_uid'		=> $user_id,
 					);
-					$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);
 

Braces +2 added lines, -4 removed lines

@@ -182,8 +182,7 @@ 
 					// We simply return and continue the login procedure (The normal way :)),
 					// and will disable all pages untill he has added a 2FA key.
 					return $event;
-				}
-				else
+				} else
 				{
 					$this->user->add_lang_ext('paul999/tfa', 'common');
 					$user_id = $event['user_id'];
@@ -196,8 +195,7 @@ 
 					if (!empty($class) && $class != '_')
 					{
 						$module = $this->session_helper->findModule($class);
-					}
-					else
+					} else
 					{
 						/**
 						 * @var module_interface $row

migrations/update_sessions2.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 	{
 		return array(
 			'add_columns'        => array(
-				$this->table_prefix . 'sessions'        => array(
+				$this->table_prefix.'sessions'        => array(
 					'u2f_request'    => array('TEXT', null),
 				),
 			),
@@ -35,7 +35,7 @@ 
 	{
 		return array(
 			'drop_columns'        => array(
-				$this->table_prefix . 'sessions'        => array(
+				$this->table_prefix.'sessions'        => array(
 					'u2f_request',
 				),
 			),