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 +10 added lines, -10 removed lines

@@ -76,14 +76,14 @@ 
 	 */
 	public function __construct(session_helper_interface $helper, helper $controller_helper, user $user, request_interface $request, driver_interface $db, config $config, $php_ext, $root_path)
 	{
-		$this->helper				= $helper;
-		$this->controller_helper 	= $controller_helper;
-		$this->user					= $user;
+		$this->helper = $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->root_path = $root_path;
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 		}
 		if ($this->user->data['is_bot'] == false && $this->user->data['user_id'] != ANONYMOUS)
 		{
-			$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();
 
@@ -129,7 +129,7 @@ 
 			$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
 			}
@@ -137,7 +137,7 @@ 
 			{
 				$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);
 			}
 		}
 	}
@@ -175,7 +175,7 @@ 
 						'admin'			=> (int) $event['admin'],
 						'auto_login'	=> (int) $event['auto_login'],
 						'viewonline'	=> (int) !$this->request->is_set_post('viewonline'),
-						)) . '?redirect=' . $redirect
+						)).'?redirect='.$redirect
 					);
 				}
 			}

controller/main_controller.php

Braces +1 added lines, -2 removed lines

@@ -127,8 +127,7 @@
 		if (!empty($default))
 		{
 			$module = $this->session_helper->findModule($class);
-		}
-		else
+		} else
 		{
 			foreach ($modules as $row)
 			{

Spacing +11 added lines, -11 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;
 
 	}
 
@@ -225,8 +225,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);
 

ucp/tfa_module.php

Braces +3 added lines, -6 removed lines

@@ -101,13 +101,11 @@ 
 				meta_refresh(3, $this->u_action);
 				$message = $this->user->lang['TFA_KEY_ADDED'] . '<br /><br />' . sprintf($this->user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 				trigger_error($message);
-			}
-			else
+			} else
 			{
 				$error[] = $this->user->lang('TFA_MODULE_NOT_FOUND', $class);
 			}
-		}
-		catch (\Exception $e)
+		} catch (\Exception $e)
 		{
 			$error[] = $e->getMessage();
 		}
@@ -130,8 +128,7 @@ 
 			if (!check_form_key('ucp_tfa_keys'))
 			{
 				$error[] = 'FORM_INVALID';
-			}
-			else
+			} else
 			{
 				switch ($mode)
 				{

Spacing +4 added lines, -4 removed lines

@@ -60,10 +60,10 @@ 
 	 */
 	private function setup(user $user, template $template, request_interface $request, session_helper $session_helper)
 	{
-		$this->user 				= $user;
+		$this->user = $user;
 		$this->template 			= $template;
 		$this->request 				= $request;
-		$this->session_helper 		= $session_helper;
+		$this->session_helper = $session_helper;
 	}
 
 	/**
@@ -99,7 +99,7 @@ 
 				$module->register();
 
 				meta_refresh(3, $this->u_action);
-				$message = $this->user->lang['TFA_KEY_ADDED'] . '<br /><br />' . sprintf($this->user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+				$message = $this->user->lang['TFA_KEY_ADDED'].'<br /><br />'.sprintf($this->user->lang['RETURN_UCP'], '<a href="'.$this->u_action.'">', '</a>');
 				trigger_error($message);
 			}
 			else
@@ -184,7 +184,7 @@ 
 				}
 			}
 			meta_refresh(3, $this->u_action);
-			$message = $this->user->lang['TFA_KEYS_DELETED'] . '<br /><br />' . sprintf($this->user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+			$message = $this->user->lang['TFA_KEYS_DELETED'].'<br /><br />'.sprintf($this->user->lang['RETURN_UCP'], '<a href="'.$this->u_action.'">', '</a>');
 			trigger_error($message);
 		}
 	}

acp/tfa_module.php

Spacing +7 added lines, -7 removed lines

@@ -43,7 +43,7 @@ 
 			'title'	=> 'ACP_TFA_SETTINGS',
 			'vars'	=> array(
 				'legend1'				=> 'ACP_TFA_SETTINGS',
-				'tfa_mode'				=> array('lang' => 'TFA_MODE',			'validate' => 'bool',	'type' => 'select', 'method' => 'select_tfa_method', 'explain' => true),
+				'tfa_mode'				=> array('lang' => 'TFA_MODE', 'validate' => 'bool', 'type' => 'select', 'method' => 'select_tfa_method', 'explain' => true),
 
 				'legend4'				=> 'ACP_SUBMIT_CHANGES',
 			)
@@ -97,12 +97,12 @@ 
 
 		if ($submit)
 		{
-			$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_TFA_CONFIG_' . strtoupper($mode));
+			$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_TFA_CONFIG_'.strtoupper($mode));
 
 			$message = $user->lang('CONFIG_UPDATED');
 			$message_type = E_USER_NOTICE;
 
-			trigger_error($message . adm_back_link($this->u_action), $message_type);
+			trigger_error($message.adm_back_link($this->u_action), $message_type);
 		}
 
 		if (!$request->is_secure())
@@ -115,7 +115,7 @@ 
 
 		$template->assign_vars(array(
 			'L_TITLE'			=> $user->lang[$display_vars['title']],
-			'L_TITLE_EXPLAIN'	=> $user->lang[$display_vars['title'] . '_EXPLAIN'],
+			'L_TITLE_EXPLAIN'	=> $user->lang[$display_vars['title'].'_EXPLAIN'],
 
 			'S_ERROR'			=> (sizeof($error)) ? true : false,
 			'ERROR_MSG'			=> implode('<br />', $error),
@@ -144,9 +144,9 @@ 
 			$type = explode(':', $vars['type']);
 
 			$l_explain = '';
-			if ($vars['explain'] && isset($user->lang[$vars['lang'] . '_EXPLAIN']))
+			if ($vars['explain'] && isset($user->lang[$vars['lang'].'_EXPLAIN']))
 			{
-				$l_explain =  $user->lang[$vars['lang'] . '_EXPLAIN'];
+				$l_explain = $user->lang[$vars['lang'].'_EXPLAIN'];
 			}
 
 			$content = build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars);
@@ -187,7 +187,7 @@ 
 		foreach ($act_ary as $key => $data)
 		{
 			$selected = ($data == $selected_value) ? ' selected="selected"' : '';
-			$act_options .= '<option value="' . $data . '"' . $selected . '>' . $user->lang($key) . '</option>';
+			$act_options .= '<option value="'.$data.'"'.$selected.'>'.$user->lang($key).'</option>';
 		}
 		return $act_options;
 	}

modules/u2f.php

Spacing +19 added lines, -19 removed lines

@@ -75,9 +75,9 @@ 
 		$this->request  = $request;
 		$this->template = $template;
 
-		$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 @@ 
 			return false;
 		}
 		$sql = 'SELECT COUNT(registration_id) as reg_id 
-					FROM ' . $this->registration_table . ' 
+					FROM ' . $this->registration_table.' 
 					WHERE 
 						user_id = ' . (int) $user_id;
 		$result = $this->db->sql_query($sql);
@@ -184,9 +184,9 @@ 
 			'u2f_request'	=> $registrations
 		);
 
-		$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);
 		$count = $this->db->sql_affectedrows();
@@ -197,9 +197,9 @@ 
 			{
 				// Reset sessions table. We had multiple sessions with same ID!!!
 				$sql_ary['u2f_request'] = '';
-				$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);
 			}
@@ -219,9 +219,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);
@@ -251,7 +251,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);
 		}
 		catch (U2fError $error)
@@ -260,7 +260,7 @@ 
 		}
 		catch (\InvalidArgumentException $invalid)
 		{
-			throw new BadRequestHttpException($this->user->lang('TFA_SOMETHING_WENT_WRONG') . '<br />' . $invalid->getMessage(), $invalid);
+			throw new BadRequestHttpException($this->user->lang('TFA_SOMETHING_WENT_WRONG').'<br />'.$invalid->getMessage(), $invalid);
 		}
 	}
 
@@ -332,7 +332,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(
@@ -354,8 +354,8 @@ 
 	public function show_ucp()
 	{
 		$sql = 'SELECT *
-			FROM ' . $this->registration_table . '
-			WHERE user_id = ' . (int) $this->user->data['user_id'] . '
+			FROM ' . $this->registration_table.'
+			WHERE user_id = ' . (int) $this->user->data['user_id'].'
 			ORDER BY registration_id ASC';
 
 		$result = $this->db->sql_query($sql);
@@ -392,8 +392,8 @@ 
 		if (isset($data['keys']))
 		{
 			$sql_where = $this->db->sql_in_set('registration_id', $data['keys']);
-			$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 ' . $sql_where;
 
 			$this->db->sql_query($sql);
@@ -407,7 +407,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();
 
@@ -495,9 +495,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);
 

Braces +8 added lines, -11 removed lines

@@ -147,8 +147,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;
 		}
@@ -236,10 +235,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, $response->errorCode);
@@ -253,12 +254,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);
 		}
@@ -295,8 +294,7 @@ 
 		if ($count == 0)
 		{
 			trigger_error('TFA_UNABLE_TO_UPDATE_SESSION');
-		}
-		else if ($count > 1)
+		} else if ($count > 1)
 		{
 			// Reset sessions table. We had multiple sessions with same ID!!!
 			$sql_ary['u2f_request'] = '';
@@ -340,8 +338,7 @@ 
 			);
 
 			$this->update_session($sql_ary);
-		}
-		catch (U2fError $err)
+		} catch (U2fError $err)
 		{
 			$this->createError($err);
 		}

migrations/set_role_data.php

Spacing +2 added lines, -2 removed lines

@@ -42,8 +42,8 @@
 	protected function role_exists($role)
 	{
 		$sql = 'SELECT role_id
-		FROM ' . ACL_ROLES_TABLE . "
-		WHERE role_name = '" . $this->db->sql_escape($role) . "'";
+		FROM ' . ACL_ROLES_TABLE."
+		WHERE role_name = '" . $this->db->sql_escape($role)."'";
 		$result = $this->db->sql_query_limit($sql, 1);
 		$role_id = $this->db->sql_fetchfield('role_id');
 		$this->db->sql_freeresult($result);

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

helper/session_helper.php

Spacing +6 added lines, -6 removed lines

@@ -72,11 +72,11 @@ 
 	 */
 	public function __construct(driver_interface $db, config $config, user $user, service_collection $modules, $registration_table, $user_table)
 	{
-		$this->db					= $db;
-		$this->user					= $user;
-		$this->config				= $config;
-		$this->registration_table	= $registration_table;
-		$this->user_table			= $user_table;
+		$this->db = $db;
+		$this->user = $user;
+		$this->config = $config;
+		$this->registration_table = $registration_table;
+		$this->user_table = $user_table;
 
 		$this->validateModules($modules);
 	}
@@ -202,7 +202,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);