paul999 / phpbb_2fa

event/listener.php

Braces +1 added lines, -2 removed lines

@@ -162,8 +162,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;
-				}
-				else
+				} else
 				{
 					$redirect = $this->request->variable('redirect', "{$this->root_path}index.{$this->php_ext}");
 					if ($event['admin'])

Spacing +8 added lines, -8 removed lines

@@ -73,13 +73,13 @@ 
 	 */
 	public function __construct(session_helper_interface $session_helper, user $user, request_interface $request, driver_interface $db, config $config, $php_ext, $root_path)
 	{
-		$this->session_helper		= $session_helper;
-		$this->user					= $user;
+		$this->session_helper = $session_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->root_path = $root_path;
 	}
 
 	/**
@@ -120,7 +120,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, 3600);
 			$allowed_i = array();
 
@@ -132,13 +132,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);
 
 		}
 	}

migrations/initial_schema.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 	{
 		return array(
 			'add_tables'	=> array(
-				$this->table_prefix . 'tfa_registration'	=> array(
+				$this->table_prefix.'tfa_registration'	=> array(
 					'COLUMNS'	=> array(
 						'registration_id'		=> array('UINT', null, 'auto_increment'),
 						'user_id'				=> array('UINT', 0),
@@ -40,7 +40,7 @@ 
 	{
 		return array(
 			'drop_tables'	=> array(
-				$this->table_prefix . 'tfa_registration',
+				$this->table_prefix.'tfa_registration',
 			),
 		);
 	}

migrations/update_sessions.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',
 				),
 			),

ucp/tfa_module.php

Braces +4 added lines, -8 removed lines

@@ -108,18 +108,15 @@ 
 				if ($module->can_register())
 				{
 					$this->tpl_name = $module->register_start();
-				}
-				else
+				} else
 				{
 					$error[] = 'TFA_MODULE_NO_REGISTER';
 				}
-			}
-			else
+			} else
 			{
 				$error[] = $this->user->lang('TFA_MODULE_NOT_FOUND', $class);
 			}
-		}
-		catch (\Exception $e)
+		} catch (\Exception $e)
 		{
 			$error[] = $e->getMessage();
 		}
@@ -151,8 +148,7 @@ 
 					if (!check_form_key('ucp_tfa_keys'))
 					{
 						$error[] = 'FORM_INVALID';
-					}
-					else
+					} else
 					{
 						if ($this->request->variable('md', false, false, \phpbb\request\request_interface::POST))
 						{

Spacing +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
 				{
 					$module->register();
 					meta_refresh(3, $this->u_action);
-					$message = $this->user->lang('TFA_KEY_ADDED') . '<br /><br />' . $this->user->lang('RETURN_UCP', '<a href="' . $this->u_action . '">', '</a>');
+					$message = $this->user->lang('TFA_KEY_ADDED').'<br /><br />'.$this->user->lang('RETURN_UCP', '<a href="'.$this->u_action.'">', '</a>');
 					trigger_error($message);
 				}
 				if ($module->can_register())
@@ -227,7 +227,7 @@ 
 			}
 		}
 		meta_refresh(3, $this->u_action);
-		$message = $this->user->lang('TFA_KEYS_DELETED') . '<br /><br />' . $this->user->lang('RETURN_UCP', '<a href="' . $this->u_action . '">', '</a>');
+		$message = $this->user->lang('TFA_KEYS_DELETED').'<br /><br />'.$this->user->lang('RETURN_UCP', '<a href="'.$this->u_action.'">', '</a>');
 		trigger_error($message);
 	}
 }

modules/u2f.php

Braces +7 added lines, -9 removed lines

@@ -152,8 +152,7 @@ 
 		if (!empty($secure))
 		{
 			return 'on' == strtolower($secure) || '1' == $secure;
-		}
-		else if ('443' == $this->request->server('SERVER_PORT'))
+		} else if ('443' == $this->request->server('SERVER_PORT'))
 		{
 			return true;
 		}
@@ -234,10 +233,12 @@ 
 
 			if (property_exists($response, 'errorCode'))
 			{
-				if ($response->errorCode == 4) // errorCode 4 means that this device wasn't registered
+				if ($response->errorCode == 4) {
+					// errorCode 4 means that this device wasn't registered
 				{
 					throw new AccessDeniedHttpException($this->user->lang('TFA_NOT_REGISTERED'));
 				}
+				}
 				throw new BadRequestHttpException($this->user->lang('TFA_SOMETHING_WENT_WRONG'));
 			}
 			$result = new AuthenticationResponse($response->signatureData, $response->clientData, $response->keyHandle); // Do not need to include errorCode, as we already handled it.
@@ -251,12 +252,10 @@ 
 
 			$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);
-		}
-		catch (U2fError $error)
+		} catch (U2fError $error)
 		{
 			$this->createError($error);
-		}
-		catch (\InvalidArgumentException $invalid)
+		} catch (\InvalidArgumentException $invalid)
 		{
 			throw new BadRequestHttpException($this->user->lang('TFA_SOMETHING_WENT_WRONG') . '<br />' . $invalid->getMessage(), $invalid);
 		}
@@ -351,8 +350,7 @@ 
 			);
 
 			$this->update_session($sql_ary);
-		}
-		catch (U2fError $err)
+		} catch (U2fError $err)
 		{
 			$this->createError($err);
 		}

Spacing +14 added lines, -14 removed lines

@@ -60,11 +60,11 @@ 
 		$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;
 
-		$this->u2f = new \paul999\u2f\U2F('https://' . $this->request->server('HTTP_HOST'));
+		$this->u2f = new \paul999\u2f\U2F('https://'.$this->request->server('HTTP_HOST'));
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 */
 	public function is_potentially_usable($user_id = false)
 	{
-		$browsercap = new Browscap($this->root_path . 'cache/');
+		$browsercap = new Browscap($this->root_path.'cache/');
 		$info = $browsercap->getBrowser($this->request->server('HTTP_USER_AGENT'));
 		return strtolower($info->Browser) === 'chrome' && $this->is_ssl();
 	}
@@ -192,9 +192,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);
@@ -224,7 +224,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;
@@ -235,7 +235,7 @@ 
 		}
 		catch (\InvalidArgumentException $invalid)
 		{
-			throw new http_exception(400, 'TFA_SOMETHING_WENT_WRONG' . '<br />' . $invalid->getMessage(), array(), $invalid);
+			throw new http_exception(400, 'TFA_SOMETHING_WENT_WRONG'.'<br />'.$invalid->getMessage(), array(), $invalid);
 		}
 		return false;
 	}
@@ -320,7 +320,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(
@@ -352,8 +352,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);
@@ -395,7 +395,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();
 
@@ -483,9 +483,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);
 

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',
 				),
 			),

migrations/initial_backup_schema.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 	{
 		return array(
 			'add_tables'	=> array(
-				$this->table_prefix . 'tfa_back_reg'	=> array(
+				$this->table_prefix.'tfa_back_reg'	=> array(
 					'COLUMNS'	=> array(
 						'registration_id'		=> array('UINT', null, 'auto_increment'),
 						'user_id'				=> array('UINT', 0),
@@ -38,7 +38,7 @@ 
 	{
 		return array(
 			'drop_tables'	=> array(
-				$this->table_prefix . 'tfa_back_reg',
+				$this->table_prefix.'tfa_back_reg',
 			),
 		);
 	}

migrations/initial_otp_schema.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 	{
 		return array(
 			'add_tables'	=> array(
-				$this->table_prefix . 'tfa_otp_reg'	=> array(
+				$this->table_prefix.'tfa_otp_reg'	=> array(
 					'COLUMNS'	=> array(
 						'registration_id'		=> array('UINT', null, 'auto_increment'),
 						'user_id'				=> array('UINT', 0),
@@ -37,7 +37,7 @@ 
 	{
 		return array(
 			'drop_tables'	=> array(
-				$this->table_prefix . 'tfa_otp_reg',
+				$this->table_prefix.'tfa_otp_reg',
 			),
 		);
 	}

helper/session_helper.php

Spacing +8 added lines, -8 removed lines

@@ -87,13 +87,13 @@ 
 	 */
 	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->user_table = $user_table;
 
 		$this->validateModules($modules);
 
@@ -257,9 +257,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);
 
@@ -287,7 +287,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);