paul999 / phpbb_2fa

event/listener.php

Indentation +3 added lines, -3 removed lines

@@ -126,12 +126,12 @@
 			return;
 		}
 		if (strpos($this->user->page['page_name'], 'app' . $this->php_ext) !== false && strrpos($this->user->page['page_name'], 'paul999/tfa') !== false) {
-            @define('SKIP_CHECK_DISABLED', true);
-        }
+			@define('SKIP_CHECK_DISABLED', true);
+		}
 
 		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);
+			@define('SKIP_CHECK_DISABLED', true);
 			$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();

Spacing +11 added lines, -11 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;
 	}
 
@@ -125,14 +125,14 @@ 
 		{
 			return;
 		}
-		if (strpos($this->user->page['page_name'], 'app' . $this->php_ext) !== false && strrpos($this->user->page['page_name'], 'paul999/tfa') !== false) {
+		if (strpos($this->user->page['page_name'], 'app'.$this->php_ext) !== false && strrpos($this->user->page['page_name'], 'paul999/tfa') !== false) {
             @define('SKIP_CHECK_DISABLED', true);
         }
 
 		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);
-			$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();
 
@@ -144,14 +144,14 @@ 
 			$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_title =  $this->user->lang['INFORMATION'];
+			$msg_text = $this->user->lang('TFA_REQUIRED_KEY_MISSING', '<a href="'.$url.'">', '</a>');
+			$msg_title = $this->user->lang['INFORMATION'];
 
 			page_header($msg_title);
 

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