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

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;
 	}

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

modules/otp.php

Spacing +9 added lines, -9 removed lines

@@ -177,8 +177,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);
@@ -208,9 +208,9 @@ 
 	public function register_start()
 	{
 		$secret = $this->otp->generateSecret();
-		$QR = $this->otp_helper->generateKeyURI('totp', $secret, generate_board_url(), '',0, 'sha1');
+		$QR = $this->otp_helper->generateKeyURI('totp', $secret, generate_board_url(), '', 0, 'sha1');
 		$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(
@@ -230,7 +230,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, 'sha1'))
 		{
@@ -244,7 +244,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);
 	}
 
@@ -267,8 +267,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);
@@ -281,7 +281,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);
 

modules/abstract_module.php

Spacing +6 added lines, -6 removed lines

@@ -38,10 +38,10 @@ 
 	protected function show_ucp_complete($table, $where = '')
 	{
 		$sql = 'SELECT *
-			FROM ' . $table . '
+			FROM ' . $table.'
 			WHERE 
-				user_id = ' . (int) $this->user->data['user_id'] . '
-				' . $where . '
+				user_id = ' . (int) $this->user->data['user_id'].'
+				' . $where.'
 			ORDER BY registration_id ASC';
 
 		$result = $this->db->sql_query($sql);
@@ -71,10 +71,10 @@ 
 	protected function check_table_for_user($table, $user_id, $where = '')
 	{
 		$sql = 'SELECT COUNT(registration_id) as reg_id 
-					FROM ' . $table . ' 
+					FROM ' . $table.' 
 					WHERE 
-						user_id = ' . (int) $user_id .
-						' ' . $where;
+						user_id = ' . (int) $user_id.
+						' '.$where;
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
 		$this->db->sql_freeresult($result);

modules/u2f.php

Spacing +14 added lines, -14 removed lines

@@ -61,11 +61,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'));
 	}
 
 	/**
@@ -111,7 +111,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();
 	}
@@ -194,9 +194,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);
@@ -226,7 +226,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;
@@ -237,7 +237,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);
 		}
 		return false;
 	}
@@ -322,7 +322,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 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);
@@ -397,7 +397,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();
 
@@ -485,9 +485,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);