paul999 / phpbb_2fa

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

@@ -79,13 +79,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;
 	}
 
@@ -136,7 +136,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']))
 		{
 			@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;
@@ -144,19 +144,19 @@ 
 
 			$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->isTfaKeyRegistred($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.
 				$this->user->add_lang_ext('paul999/tfa', 'common');
 				$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();
 
@@ -168,19 +168,19 @@ 
 			$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}");
-			$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->isTfaRequired($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->isTfaRequired($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 +15 added lines, -15 removed lines

@@ -91,16 +91,16 @@ 
 	 */
 	public function __construct(helper $controller_helper, driver_interface $db, template $template, user $user, request_interface $request, config $config, log $log, 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->log                  = $log;
+		$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->log = $log;
 	}
 
 	/**
@@ -135,9 +135,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);
 
@@ -158,7 +158,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);
 			}
@@ -202,8 +202,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', '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', '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;
 	}