paul999 / phpbb_2fa

migrations/initial_backup_schema.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 	{
 		return array(
 			'add_tables'	=> array(
-				$this->table_prefix . 'tfa_back_reg'	=> array(
+				$this->table_prefix.'tfa_back_reg'	=> array(
 					'COLUMNS'	=> array(
 						'registration_id'		=> array('UINT', null, 'auto_increment'),
 						'user_id'				=> array('UINT', 0),
@@ -38,7 +38,7 @@ 
 	{
 		return array(
 			'drop_tables'	=> array(
-				$this->table_prefix . 'tfa_back_reg',
+				$this->table_prefix.'tfa_back_reg',
 			),
 		);
 	}

migrations/initial_otp_schema.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 	{
 		return array(
 			'add_tables'	=> array(
-				$this->table_prefix . 'tfa_otp_reg'	=> array(
+				$this->table_prefix.'tfa_otp_reg'	=> array(
 					'COLUMNS'	=> array(
 						'registration_id'		=> array('UINT', null, 'auto_increment'),
 						'user_id'				=> array('UINT', 0),
@@ -37,7 +37,7 @@ 
 	{
 		return array(
 			'drop_tables'	=> array(
-				$this->table_prefix . 'tfa_otp_reg',
+				$this->table_prefix.'tfa_otp_reg',
 			),
 		);
 	}

modules/backup_key.php

Spacing +5 added lines, -5 removed lines

@@ -182,8 +182,8 @@ 
 					'last_used' => time(),
 					'valid'		=> false,
 				);
-				$sql = 'UPDATE ' . $this->backup_registration_table . ' 
-							SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' 
+				$sql = 'UPDATE '.$this->backup_registration_table.' 
+							SET ' . $this->db->sql_build_array('UPDATE', $sql_ary).' 
 							WHERE 
 								registration_id = ' . (int) $registration['registration_id'];
 				$this->db->sql_query($sql);
@@ -265,8 +265,8 @@ 
 	 */
 	public function delete($key)
 	{
-		$sql = 'DELETE FROM ' . $this->backup_registration_table . '
-					WHERE user_id = ' . (int) $this->user->data['user_id'] . '
+		$sql = 'DELETE FROM '.$this->backup_registration_table.'
+					WHERE user_id = ' . (int) $this->user->data['user_id'].'
 					AND registration_id =' . (int) $key;
 
 		$this->db->sql_query($sql);
@@ -279,7 +279,7 @@ 
 	 */
 	private function getRegistrations($user_id)
 	{
-		$sql = 'SELECT * FROM ' . $this->backup_registration_table . ' WHERE user_id = ' . (int) $user_id;
+		$sql = 'SELECT * FROM '.$this->backup_registration_table.' WHERE user_id = '.(int) $user_id;
 		$result = $this->db->sql_query($sql);
 		$rows = $this->db->sql_fetchrowset($result);
 

helper/session_helper.php

Spacing +8 added lines, -8 removed lines

@@ -88,13 +88,13 @@ 
 	 */
 	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->user_table = $user_table;
 
 		$this->validateModules($modules);
 
@@ -258,9 +258,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);
 
@@ -288,7 +288,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);

controller/main_controller.php

Spacing +14 added lines, -14 removed lines

@@ -86,15 +86,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;
 
 	}
 
@@ -129,10 +129,10 @@ 
 			'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_user_id = ' . (int)$this->user->data['user_id'];
+								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);
 
 		if (empty($class))
@@ -180,8 +180,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);
 

Braces +1 added lines, -2 removed lines

@@ -155,8 +155,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 (BadRequestHttpException $ex) // @TODO: Replace exception with own exception
+		} catch (BadRequestHttpException $ex) // @TODO: Replace exception with own exception
 		{
 			$this->template->assign_var('S_ERROR', $ex->getMessage());
 			$this->session_helper->generate_page($user_id, $admin, $auto_login, $viewonline, $redirect);