paul999 / phpbb_2fa

controller/main_controller.php

Unused Use Statements -2 removed lines

@@ -11,8 +11,6 @@
 namespace paul999\tfa\controller;
 
 use paul999\tfa\helper\session_helper_interface;
-use phpbb\config\config;
-use phpbb\controller\helper;
 use phpbb\db\driver\driver_interface;
 use phpbb\exception\http_exception;
 use phpbb\log\log;

Spacing +11 added lines, -11 removed lines

@@ -81,14 +81,14 @@ 
 	 */
 	public function __construct(driver_interface $db, template $template, user $user, request_interface $request, log $log, session_helper_interface $session_helper, $root_path, $php_ext)
 	{
-		$this->template 			= $template;
-		$this->db					= $db;
-		$this->user					= $user;
+		$this->template = $template;
+		$this->db = $db;
+		$this->user = $user;
 		$this->request				= $request;
-		$this->session_helper		= $session_helper;
-		$this->root_path			= $root_path;
+		$this->session_helper = $session_helper;
+		$this->root_path = $root_path;
 		$this->php_ext				= $php_ext;
-		$this->log                  = $log;
+		$this->log = $log;
 	}
 
 	/**
@@ -123,9 +123,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);
 
@@ -146,7 +146,7 @@ 
 		{
 			if (!$module->login($user_id))
 			{
-				$this->log->add('critical', $this->user->data['user_id'], $this->user->ip, 'LOG_TFA_EXCEPTION',false, ['TFA_INCORRECT_KEY']);
+				$this->log->add('critical', $this->user->data['user_id'], $this->user->ip, 'LOG_TFA_EXCEPTION', false, ['TFA_INCORRECT_KEY']);
 				$this->template->assign_var('S_ERROR', $this->user->lang('TFA_INCORRECT_KEY'));
 				$this->session_helper->generate_page($user_id, $admin, $auto_login, $viewonline, $redirect);
 			}
@@ -190,8 +190,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);
 

helper/session_helper.php

Spacing +9 added lines, -9 removed lines

@@ -88,14 +88,14 @@ 
 	 */
 	public function __construct(driver_interface $db, config $config, user $user, service_collection $modules, template $template, helper $controller_helper, $registration_table, $user_table)
 	{
-		$this->db					= $db;
-		$this->user					= $user;
-		$this->config				= $config;
-		$this->template 			= $template;
+		$this->db = $db;
+		$this->user = $user;
+		$this->config = $config;
+		$this->template = $template;
 		$this->controller_helper 	= $controller_helper;
 		$this->registration_table	= $registration_table;
-		$this->user_table			= $user_table;
-		$this->module_data			= $modules;
+		$this->user_table = $user_table;
+		$this->module_data = $modules;
 
 
 	}
@@ -284,9 +284,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);
 
@@ -315,7 +315,7 @@ 
 	{
 		if (empty($userdata))
 		{
-			$sql = 'SELECT * FROM ' . $this->user_table . ' WHERE user_id = ' . (int) $user_id;
+			$sql = 'SELECT * FROM '.$this->user_table.' WHERE user_id = '.(int) $user_id;
 			$result = $this->db->sql_query($sql);
 			$userdata = $this->db->sql_fetchrow($result);
 			$this->db->sql_freeresult($result);

event/listener.php

Spacing +13 added lines, -13 removed lines

@@ -80,13 +80,13 @@ 
 	 */
 	public function __construct(session_helper_interface $session_helper, user $user, request_interface $request, driver_interface $db, template $template, config $config, $php_ext, $root_path)
 	{
-		$this->session_helper		= $session_helper;
-		$this->user					= $user;
-		$this->request				= $request;
-		$this->config				= $config;
-		$this->db					= $db;
+		$this->session_helper = $session_helper;
+		$this->user = $user;
+		$this->request = $request;
+		$this->config = $config;
+		$this->db = $db;
 		$this->template				= $template;
-		$this->php_ext				= $php_ext;
+		$this->php_ext = $php_ext;
 		$this->root_path			= $root_path;
 	}
 
@@ -137,7 +137,7 @@ 
 		if ($this->user->data['is_bot'] == false && $this->user->data['user_id'] != ANONYMOUS && $this->session_helper->is_tfa_required($this->user->data['user_id'], false, $this->user->data) && !$this->session_helper->is_tfa_registered($this->user->data['user_id']))
 		{
 			@define('SKIP_CHECK_DISABLED', true);
-			if ($this->user->page['page_name'] === 'memberlist.' . $this->php_ext && $this->request->variable('mode', '') == 'contactadmin')
+			if ($this->user->page['page_name'] === 'memberlist.'.$this->php_ext && $this->request->variable('mode', '') == 'contactadmin')
 			{
 				// We are at the contact admin page. We will allow this in all cases.
 				return;
@@ -145,19 +145,19 @@ 
 
 			$this->user->set_cookie('rn', $this->user->data['session_id'], time() + 3600 * 24, true);
 
-			$msg_title =  $this->user->lang['INFORMATION'];
+			$msg_title = $this->user->lang['INFORMATION'];
 			if ($this->session_helper->is_tfa_key_registred($this->user->data['user_id']))
 			{
 				// the user has keys registered, but they are not usable (Might be due to browser requirements, or others)
 				// We will not allow them to register a new key. They will need to contact the admin instead unfortunately.
 				$this->user->add_lang_ext('paul999/tfa', 'common');
 				$url = phpbb_get_board_contact_link($this->config, $this->root_path, $this->php_ext);
-				$msg_text = $this->user->lang('TFA_REQUIRED_KEY_AVAILABLE_BUT_UNUSABLE', '<a href="' . $url . '">', '</a>');
+				$msg_text = $this->user->lang('TFA_REQUIRED_KEY_AVAILABLE_BUT_UNUSABLE', '<a href="'.$url.'">', '</a>');
 				$this->user->session_kill();
 				$this->generate_fatal_error($msg_title, $msg_text);
 			}
 
-			$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, 3600);
 			$allowed_i = array();
 
@@ -169,19 +169,19 @@ 
 			$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}");
-			$msg_text = $this->user->lang('TFA_REQUIRED_KEY_MISSING', '<a href="' . $url . '">', '</a>');
+			$msg_text = $this->user->lang('TFA_REQUIRED_KEY_MISSING', '<a href="'.$url.'">', '</a>');
 
 			$this->generate_fatal_error($msg_title, $msg_text);
 		}
 
 		// If the user had no key when logged in, but now has a key, we will force him to use the key.
-		if ($this->user->data['is_bot'] == false && $this->user->data['user_id'] != ANONYMOUS && $this->request->variable($this->config['cookie_name'] . '_rn', '', false, request_interface::COOKIE) !== '' && $this->session_helper->is_tfa_required($this->user->data['user_id'], false, $this->user->data))
+		if ($this->user->data['is_bot'] == false && $this->user->data['user_id'] != ANONYMOUS && $this->request->variable($this->config['cookie_name'].'_rn', '', false, request_interface::COOKIE) !== '' && $this->session_helper->is_tfa_required($this->user->data['user_id'], false, $this->user->data))
 		{
 			$this->session_helper->generate_page($this->user->data['user_id'], false, $this->user->data['session_autologin'], $this->user->data['session_viewonline'], $this->user->page['page'], true);
 		}

modules/u2f.php

Spacing +12 added lines, -12 removed lines

@@ -59,14 +59,14 @@ 
 		$this->user     = $user;
 		$this->request  = $request;
 		$this->template = $template;
-		$this->root_path= $root_path;
+		$this->root_path = $root_path;
 
-		$this->registration_table	= $registration_table;
+		$this->registration_table = $registration_table;
 	}
 
 	private function getU2f() {
 		if (empty($this->u2f)) {
-			$this->u2f = new \paul999\u2f\U2F('https://' . $this->request->server('HTTP_HOST'));
+			$this->u2f = new \paul999\u2f\U2F('https://'.$this->request->server('HTTP_HOST'));
 		}
 		return $this->u2f;
 	}
@@ -210,9 +210,9 @@ 
 		try
 		{
 			$sql = 'SELECT u2f_request 
-				FROM ' . SESSIONS_TABLE . " 
+				FROM ' . SESSIONS_TABLE." 
 				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'];
 			$result = $this->db->sql_query($sql);
 			$row = $this->db->sql_fetchrow($result);
@@ -242,7 +242,7 @@ 
 				'last_used' => time(),
 			);
 
-			$sql = 'UPDATE ' . $this->registration_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE registration_id = ' . (int) $reg->getId();
+			$sql = 'UPDATE '.$this->registration_table.' SET '.$this->db->sql_build_array('UPDATE', $sql_ary).' WHERE registration_id = '.(int) $reg->getId();
 			$this->db->sql_query($sql);
 
 			return true;
@@ -339,7 +339,7 @@ 
 				'last_used' => time(),
 			);
 
-			$sql = 'INSERT INTO ' . $this->registration_table . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
+			$sql = 'INSERT INTO '.$this->registration_table.' '.$this->db->sql_build_array('INSERT', $sql_ary);
 			$this->db->sql_query($sql);
 
 			$sql_ary = array(
@@ -371,8 +371,8 @@ 
 	 */
 	public function delete($key)
 	{
-		$sql = 'DELETE FROM ' . $this->registration_table . '
-			WHERE user_id = ' . (int) $this->user->data['user_id'] . '
+		$sql = 'DELETE FROM '.$this->registration_table.'
+			WHERE user_id = ' . (int) $this->user->data['user_id'].'
 			AND registration_id =' . (int) $key;
 
 		$this->db->sql_query($sql);
@@ -414,7 +414,7 @@ 
 	 */
 	private function getRegistrations($user_id)
 	{
-		$sql = 'SELECT * FROM ' . $this->registration_table . ' WHERE user_id = ' . (int) $user_id;
+		$sql = 'SELECT * FROM '.$this->registration_table.' WHERE user_id = '.(int) $user_id;
 		$result = $this->db->sql_query($sql);
 		$rows = array();
 
@@ -502,9 +502,9 @@ 
 	 */
 	private function update_session($sql_ary)
 	{
-		$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);
 

modules/otp.php

Spacing +8 added lines, -8 removed lines

@@ -190,8 +190,8 @@ 
 				$sql_ary = array(
 					'last_used' => time(),
 				);
-				$sql = 'UPDATE ' . $this->otp_registration_table . ' 
-					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' 
+				$sql = 'UPDATE '.$this->otp_registration_table.' 
+					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary).' 
 					WHERE 
 						registration_id = ' . (int) $registration['registration_id'];
 				$this->db->sql_query($sql);
@@ -223,7 +223,7 @@ 
 		$secret = $this->otp->generateSecret();
 		$QR = $this->otp_helper->generateKeyURI('totp', $secret, $this->user->data['username'], generate_board_url(), 0);
 		$this->template->assign_vars(array(
-			'TFA_QR_CODE'				=> 'https://chart.googleapis.com/chart?chs=200x200&chld=M|0&cht=qr&chl=' . $QR,
+			'TFA_QR_CODE'				=> 'https://chart.googleapis.com/chart?chs=200x200&chld=M|0&cht=qr&chl='.$QR,
 			'TFA_SECRET'				=> $secret,
 			'L_TFA_ADD_OTP_KEY_EXPLAIN'	=> $this->user->lang('TFA_ADD_OTP_KEY_EXPLAIN', $secret),
 			'S_HIDDEN_FIELDS_MODULE'	=> build_hidden_fields(array(
@@ -242,7 +242,7 @@ 
 	public function register()
 	{
 		$secret = $this->request->variable('secret', '');
-		$otp	= $this->request->variable('register', '');
+		$otp = $this->request->variable('register', '');
 
 		if (!$this->otp->checkTOTP($secret, $otp))
 		{
@@ -256,7 +256,7 @@ 
 			'last_used' 	=> time(),
 		);
 
-		$sql = 'INSERT INTO ' . $this->otp_registration_table . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
+		$sql = 'INSERT INTO '.$this->otp_registration_table.' '.$this->db->sql_build_array('INSERT', $sql_ary);
 		$this->db->sql_query($sql);
 	}
 
@@ -279,8 +279,8 @@ 
 	 */
 	public function delete($key)
 	{
-		$sql = 'DELETE FROM ' . $this->otp_registration_table . '
-			WHERE user_id = ' . (int) $this->user->data['user_id'] . '
+		$sql = 'DELETE FROM '.$this->otp_registration_table.'
+			WHERE user_id = ' . (int) $this->user->data['user_id'].'
 			AND registration_id =' . (int) $key;
 
 		$this->db->sql_query($sql);
@@ -293,7 +293,7 @@ 
 	 */
 	private function getRegistrations($user_id)
 	{
-		$sql = 'SELECT * FROM ' . $this->otp_registration_table . ' WHERE user_id = ' . (int) $user_id;
+		$sql = 'SELECT * FROM '.$this->otp_registration_table.' WHERE user_id = '.(int) $user_id;
 		$result = $this->db->sql_query($sql);
 		$rows = $this->db->sql_fetchrowset($result);