paul999 / phpbb_2fa

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

controller/main_controller.php

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

Spacing +2 added lines, -2 removed lines

@@ -102,7 +102,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);
 				}
 				if ($module->can_register())
@@ -227,7 +227,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' => 'int',	'type' => 'select', 'method' => 'select_tfa_method', 'explain' => true),
+				'tfa_mode'				=> array('lang' => 'TFA_MODE', 'validate' => 'int', '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;
 	}

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);
 	}
@@ -204,7 +204,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 +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 && $this->helper->isTfaRequired($this->user->data['user_id'], false, $this->user->data) && !$this->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();
 
@@ -129,13 +129,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);
 
 		}
 	}
@@ -173,7 +173,7 @@ 
 						'admin'			=> (int) $event['admin'],
 						'auto_login'	=> (int) $event['auto_login'],
 						'viewonline'	=> (int) !$this->request->is_set_post('viewonline'),
-						)) . '?redirect=' . $redirect
+						)).'?redirect='.$redirect
 					);
 				}
 			}

modules/otp.php

Spacing +6 added lines, -6 removed lines

@@ -122,7 +122,7 @@ 
 	public function is_usable($user_id)
 	{
 		$sql = 'SELECT COUNT(registration_id) as reg_id 
-					FROM ' . $this->otp_registration_table . ' 
+					FROM ' . $this->otp_registration_table.' 
 					WHERE 
 						user_id = ' . (int) $user_id;
 		$result = $this->db->sql_query($sql);
@@ -206,7 +206,7 @@ 
 		$secret = $this->otp->generateSecret();
 		$QR = $this->otp_helper->generateKeyURI('totp', $secret, generate_board_url());
 		$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'			=> build_hidden_fields(array(
@@ -226,7 +226,7 @@ 
 	public function register()
 	{
 		$secret = $this->request->variable('secret', '');
-		$otp	= $this->request->variable('otp', '');
+		$otp = $this->request->variable('otp', '');
 
 		if (!$this->otp->checkTOTP($secret, $otp))
 		{
@@ -240,7 +240,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);
 	}
 
@@ -263,8 +263,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);