paul999 / phpbb_2fa

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