paul999 / phpbb_2fa

modules/otp.php

Spacing +10 added lines, -10 removed lines

@@ -107,7 +107,7 @@ 
 	public function is_usable($user_id)
 	{
 		$sql = 'SELECT COUNT(registration_id) as reg_id 
-					FROM ' . $this->otp_registration_table . ' 
+					FROM ' . $this->otp_registration_table.' 
 					WHERE 
 						user_id = ' . (int) $user_id;
 		$result = $this->db->sql_query($sql);
@@ -180,8 +180,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,9 +210,9 @@ 
 	public function register_start()
 	{
 		$secret = $this->otp->generateSecret();
-		$QR = $this->otp_helper->generateKeyURI('totp', $secret, generate_board_url(), '',0, 'sha1');
+		$QR = $this->otp_helper->generateKeyURI('totp', $secret, 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(
@@ -232,7 +232,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'))
 		{
@@ -246,7 +246,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);
 	}
 
@@ -269,8 +269,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);
@@ -283,7 +283,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);
 

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

controller/main_controller.php

Spacing +13 added lines, -13 removed lines

@@ -87,15 +87,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;
 
 	}
 
@@ -130,9 +130,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);
 
@@ -170,8 +170,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);