Completed
Pull Request — master (#17)
by Paul
01:21
created
controller/main_controller.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -91,16 +91,16 @@  discard block
 block discarded – undo
91 91
 	 */
92 92
 	public function __construct(helper $controller_helper, driver_interface $db, template $template, user $user, request_interface $request, config $config, log $log, session_helper_interface $session_helper, $root_path, $php_ext)
93 93
 	{
94
-		$this->controller_helper 	= $controller_helper;
95
-		$this->template 			= $template;
96
-		$this->db					= $db;
97
-		$this->user					= $user;
98
-		$this->request				= $request;
99
-		$this->config				= $config;
100
-		$this->session_helper		= $session_helper;
101
-		$this->root_path			= $root_path;
102
-		$this->php_ext				= $php_ext;
103
-		$this->log                  = $log;
94
+		$this->controller_helper = $controller_helper;
95
+		$this->template = $template;
96
+		$this->db = $db;
97
+		$this->user = $user;
98
+		$this->request = $request;
99
+		$this->config = $config;
100
+		$this->session_helper = $session_helper;
101
+		$this->root_path = $root_path;
102
+		$this->php_ext = $php_ext;
103
+		$this->log = $log;
104 104
 	}
105 105
 
106 106
 	/**
@@ -135,9 +135,9 @@  discard block
 block discarded – undo
135 135
 			'tfa_random' => '',
136 136
 			'tfa_uid'    => 0,
137 137
 		);
138
-		$sql = 'UPDATE ' . SESSIONS_TABLE . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
138
+		$sql = 'UPDATE '.SESSIONS_TABLE.' SET '.$this->db->sql_build_array('UPDATE', $sql_ary)."
139 139
 			WHERE
140
-				session_id = '" . $this->db->sql_escape($this->user->data['session_id']) . "' AND
140
+				session_id = '" . $this->db->sql_escape($this->user->data['session_id'])."' AND
141 141
 				session_user_id = " . (int) $this->user->data['user_id'];
142 142
 		$this->db->sql_query($sql);
143 143
 
@@ -201,8 +201,8 @@  discard block
 block discarded – undo
201 201
 			if ($admin)
202 202
 			{
203 203
 				// the login array is used because the user ids do not differ for re-authentication
204
-				$sql = 'DELETE FROM ' . SESSIONS_TABLE . "
205
-					WHERE session_id = '" . $this->db->sql_escape($old_session_id) . "'
204
+				$sql = 'DELETE FROM '.SESSIONS_TABLE."
205
+					WHERE session_id = '" . $this->db->sql_escape($old_session_id)."'
206 206
 					AND session_user_id = " . (int) $user_id;
207 207
 				$this->db->sql_query($sql);
208 208
 
Please login to merge, or discard this patch.