paul999 / phpbb_2fa

modules/otp.php

Spacing +8 added lines, -8 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);
@@ -210,7 +210,7 @@ 
 		$secret = $this->otp->generateSecret();
 		$QR = $this->otp_helper->generateKeyURI('totp', $secret, $this->user->data['username'], 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);
 

event/listener.php

Braces +1 added lines, -2 removed lines

@@ -199,8 +199,7 @@
 					// We simply return and continue the login procedure (The normal way :)),
 					// and will disable all pages until he has added a 2FA key.
 					return $event;
-				}
-				else
+				} else
 				{
 					$this->session_helper->generate_page($event['login']['user_row']['user_id'], $event['admin'], $event['autologin'], !$this->request->is_set_post('viewonline'), $this->request->variable('redirect', ''));
 				}

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;
 	}
 
@@ -138,7 +138,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;
@@ -146,18 +146,18 @@ 
 
 			$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.
 				$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,18 +169,18 @@ 
 			$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
 			}
 			$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);
 		}

controller/main_controller.php

Braces +2 added lines, -4 removed lines

@@ -162,8 +162,7 @@ 
 				$this->template->assign_var('S_ERROR', $this->user->lang('TFA_INCORRECT_KEY'));
 				$this->session_helper->generate_page($user_id, $admin, $auto_login, $viewonline, $redirect);
 			}
-		}
-		catch (http_exception $ex) // @TODO: Replace exception with own exception
+		} catch (http_exception $ex) // @TODO: Replace exception with own exception
 		{
 
 			$this->log->add('critical', $this->user->data['user_id'], $this->user->ip, 'LOG_TFA_EXCEPTION', false, [$ex->getMessage()]);
@@ -177,8 +176,7 @@ 
 			{
 				$this->template->assign_var('S_ERROR', $this->user->lang($ex->getMessage()));
 				$this->session_helper->generate_page($user_id, $admin, $auto_login, $viewonline, $redirect);
-			}
-			else
+			} else
 			{
 				throw $ex;
 			}

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

acp/tfa_module.php

Spacing +8 added lines, -8 removed lines

@@ -43,8 +43,8 @@ 
 			'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_acp'               => array('lang' => 'TFA_ACP',  'validate' => 'int', 'type' => 'radio:no_yes', 'explain' => true),
+				'tfa_mode'				=> array('lang' => 'TFA_MODE', 'validate' => 'int', 'type' => 'select', 'method' => 'select_tfa_method', 'explain' => true),
+				'tfa_acp'               => array('lang' => 'TFA_ACP', 'validate' => 'int', 'type' => 'radio:no_yes', 'explain' => true),
 
 				'legend4'				=> 'ACP_SUBMIT_CHANGES',
 			)
@@ -98,12 +98,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())
@@ -116,7 +116,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),
@@ -145,9 +145,9 @@ 
 			$type = explode(':', $vars['type']);
 
 			$l_explain = '';
-			if ($vars['explain'] && array_key_exists($vars['lang'] . '_EXPLAIN', $user->lang))
+			if ($vars['explain'] && array_key_exists($vars['lang'].'_EXPLAIN', $user->lang))
 			{
-				$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 +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;
 	}
 
 	/**
@@ -283,9 +283,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);
 
@@ -314,7 +314,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);

language/pl/common.php

Indentation +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	$lang, array(
 		'TFA_REQUIRED_KEY_MISSING'      => 'Administrator tego forum wymaga, abyś dodał klucz Uwierzytelniania Dwuskładnikowego aby uzyskać dostęp do (pewnych) części tego forum, jednak do Twojego konta nie są przypisane żadne (odpowiednie) klucze. Nowy klucz bezpieczeństwa możesz dodać %s tutaj%s
 		<br />Ze względów bezpieczeństwa, dostęp do forum został dla Ciebie zablokowany do momentu aż dodasz klucz bezpieczeństwa do swojego konta. Podczas dodawania klucza może być wymagane podanie hasła!',
-          	'TFA_REQUIRED_KEY_AVAILABLE_BUT_UNUSABLE' => 'Administrator tego forum wymaga, abyś dodał klucz Uwierzytelniania Dwuskładnikowego aby uzyskać dostęp do (pewnych) części tego forum. Zarejstrowałeś już jakieś klucze, ale niestety z rozmaitych przyczyn nie jesteś w stanie ich użyć. Być może być to wina niewłaściwej przeglądarki. 
+		  	'TFA_REQUIRED_KEY_AVAILABLE_BUT_UNUSABLE' => 'Administrator tego forum wymaga, abyś dodał klucz Uwierzytelniania Dwuskładnikowego aby uzyskać dostęp do (pewnych) części tego forum. Zarejstrowałeś już jakieś klucze, ale niestety z rozmaitych przyczyn nie jesteś w stanie ich użyć. Być może być to wina niewłaściwej przeglądarki. 
 		<br />Ze względów bezpieczeństwa, nie pozwalamy na dodanie kluczy osobom które są nie w pełni zalogowane. Spróbuj z przeglądarką która działała wcześniej, użyj kluczy zapasowych, albo w ostateczności skontaktuj się z administratorami forum aby wyzerowali twoje klucze przechowywane na serwerze, umożliwiajac ci dodanie właściwych.',
 		// Controller
 		'ERR_NO_MATCHING_REQUEST'       => 'Nie znaleziono pasującego żądania',