paul999 / phpbb_2fa

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

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

ucp/tfa_module.php

Spacing +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
 				{
 					$module->register();
 					meta_refresh(3, $this->u_action);
-					$message = $this->user->lang('TFA_KEY_ADDED') . '<br /><br />' . $this->user->lang('RETURN_UCP', '<a href="' . $this->u_action . '">', '</a>');
+					$message = $this->user->lang('TFA_KEY_ADDED').'<br /><br />'.$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 />' . $this->user->lang('RETURN_UCP', '<a href="' . $this->u_action . '">', '</a>');
+		$message = $this->user->lang('TFA_KEYS_DELETED').'<br /><br />'.$this->user->lang('RETURN_UCP', '<a href="'.$this->u_action.'">', '</a>');
 		trigger_error($message);
 	}
 }

Braces +4 added lines, -8 removed lines

@@ -111,18 +111,15 @@ 
 						'S_UCP_ACTION'    => $this->u_action,
 					));
 					$this->tpl_name = $module->register_start();
-				}
-				else
+				} else
 				{
 					$error[] = 'TFA_MODULE_NO_REGISTER';
 				}
-			}
-			else
+			} else
 			{
 				$error[] = $this->user->lang('TFA_MODULE_NOT_FOUND', $class);
 			}
-		}
-		catch (\Exception $e)
+		} catch (\Exception $e)
 		{
 			$error[] = $e->getMessage();
 		}
@@ -154,8 +151,7 @@ 
 					if (!check_form_key('ucp_tfa_keys'))
 					{
 						$error[] = 'FORM_INVALID';
-					}
-					else
+					} else
 					{
 							$this->delete_keys();
 					}

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

modules/abstract_module.php

Spacing +4 added lines, -4 removed lines

@@ -38,8 +38,8 @@ 
 	protected function show_ucp_complete($table, $where = '')
 	{
 		$sql = 'SELECT *
-			FROM ' . $this->db->sql_escape($table) . '
-			WHERE user_id = ' . (int) $this->user->data['user_id'] . ' ' . $where . '
+			FROM ' . $this->db->sql_escape($table).'
+			WHERE user_id = ' . (int) $this->user->data['user_id'].' '.$where.'
 			ORDER BY registration_id ASC';
 
 		$result = $this->db->sql_query($sql);
@@ -69,8 +69,8 @@ 
 	protected function check_table_for_user($table, $user_id, $where = '')
 	{
 		$sql = 'SELECT COUNT(registration_id) as reg_id 
-			FROM ' . $this->db->sql_escape($table) . '
-			WHERE user_id = ' . (int) $user_id . ' ' . $where;
+			FROM ' . $this->db->sql_escape($table).'
+			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/backup_key.php

Spacing +5 added lines, -5 removed lines

@@ -181,8 +181,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);
@@ -263,8 +263,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);
@@ -277,7 +277,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);
 

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(
 					'tfa_random'    => array('TEXT', null),
 					'tfa_uid'		=> array('UINT', 0),
 				),
@@ -36,7 +36,7 @@ 
 	{
 		return array(
 			'drop_columns'        => array(
-				$this->table_prefix . 'sessions'        => array(
+				$this->table_prefix.'sessions'        => array(
 					'tfa_random',
 				),
 			),