Completed
Push — master ( b5a957...040c1d )
by Paul
03:38
created
event/listener.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -76,14 +76,14 @@
 block discarded – undo
76 76
 	 */
77 77
 	public function __construct(session_helper_interface $helper, helper $controller_helper, user $user, request_interface $request, driver_interface $db, config $config, $php_ext, $root_path)
78 78
 	{
79
-		$this->helper				= $helper;
80
-		$this->controller_helper 	= $controller_helper;
81
-		$this->user					= $user;
79
+		$this->helper = $helper;
80
+		$this->controller_helper = $controller_helper;
81
+		$this->user = $user;
82 82
 		$this->request				= $request;
83
-		$this->config				= $config;
84
-		$this->db					= $db;
83
+		$this->config = $config;
84
+		$this->db = $db;
85 85
 		$this->php_ext				= $php_ext;
86
-		$this->root_path			= $root_path;
86
+		$this->root_path = $root_path;
87 87
 	}
88 88
 
89 89
 	/**
Please login to merge, or discard this patch.
acp/tfa_module.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 			'title'	=> 'ACP_TFA_SETTINGS',
44 44
 			'vars'	=> array(
45 45
 				'legend1'				=> 'ACP_TFA_SETTINGS',
46
-				'tfa_mode'				=> array('lang' => 'TFA_MODE',			'validate' => 'bool',	'type' => 'select', 'method' => 'select_tfa_method', 'explain' => true),
46
+				'tfa_mode'				=> array('lang' => 'TFA_MODE', 'validate' => 'bool', 'type' => 'select', 'method' => 'select_tfa_method', 'explain' => true),
47 47
 
48 48
 				'legend4'				=> 'ACP_SUBMIT_CHANGES',
49 49
 			)
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 			$l_explain = '';
147 147
 			if ($vars['explain'] && isset($user->lang[$vars['lang'] . '_EXPLAIN']))
148 148
 			{
149
-				$l_explain =  $user->lang[$vars['lang'] . '_EXPLAIN'];
149
+				$l_explain = $user->lang[$vars['lang'] . '_EXPLAIN'];
150 150
 			}
151 151
 
152 152
 			$content = build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars);
Please login to merge, or discard this patch.
helper/session_helper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -72,10 +72,10 @@
 block discarded – undo
72 72
 	 */
73 73
 	public function __construct(driver_interface $db, config $config, user $user, service_collection $modules, $registration_table, $user_table)
74 74
 	{
75
-		$this->db					= $db;
75
+		$this->db = $db;
76 76
 		$this->user_array			= $user;
77
-		$this->config				= $config;
78
-		$this->registration_table	= $registration_table;
77
+		$this->config = $config;
78
+		$this->registration_table = $registration_table;
79 79
 		$this->user_table			= $user_table;
80 80
 
81 81
 		$this->validateModules($modules);
Please login to merge, or discard this patch.
modules/u2f.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
         $this->request  = $request;
78 78
         $this->template = $template;
79 79
 
80
-        $this->registration_table	= $registration_table;
80
+        $this->registration_table = $registration_table;
81 81
 
82 82
         $this->u2f = new \paul999\u2f\U2F('https://' . $this->request->server('HTTP_HOST'));
83 83
     }
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
         try {
203 203
             $sql = 'SELECT u2f_request FROM ' . SESSIONS_TABLE . ' WHERE
204 204
 			    session_id = \'' . $this->db->sql_escape($this->user->data['session_id']) . '\' AND
205
-			    session_user_id = ' . (int)$this->user->data['user_id'];
205
+			    session_user_id = ' . (int) $this->user->data['user_id'];
206 206
             $result = $this->db->sql_query($sql);
207 207
             $row = $this->db->sql_fetchrow($result);
208 208
             $this->db->sql_freeresult($result);
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
                 'last_used' => time(),
230 230
             );
231 231
 
232
-            $sql = 'UPDATE ' . $this->registration_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE registration_id = ' . (int)$reg->id;
232
+            $sql = 'UPDATE ' . $this->registration_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE registration_id = ' . (int) $reg->id;
233 233
             $this->db->sql_query($sql);
234 234
         }
235 235
         catch (U2fError $error)
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
     private function convertRequests($requests)
250 250
     {
251 251
         $result = array();
252
-        foreach($requests as $request)
252
+        foreach ($requests as $request)
253 253
         {
254 254
             $result[] = new SignRequest($request->challenge, $request->keyHandle, $request->appId);
255 255
         }
@@ -347,13 +347,13 @@  discard block
 block discarded – undo
347 347
                 'LAST_USED'     => $this->user->format_date($row['last_used']),
348 348
             ));
349 349
 
350
-            $reg				= new registration_helper();
350
+            $reg = new registration_helper();
351 351
             $reg->setCounter($row['counter']);
352 352
             $reg->setCertificate($row['certificate']);
353 353
             $reg->setKeyHandle($row['key_handle']);
354 354
             $reg->setPublicKey($row['public_key']);
355
-            $reg->id			= $row['registration_id'];
356
-            $this->reg_data		= $reg;
355
+            $reg->id = $row['registration_id'];
356
+            $this->reg_data = $reg;
357 357
         }
358 358
         $this->db->sql_freeresult($result);
359 359
     }
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
         {
371 371
             $sql_where = $this->db->sql_in_set('registration_id', $data['keys']);
372 372
             $sql = 'DELETE FROM ' . $this->registration_table . '
373
-                                                WHERE user_id = ' . (int)$this->user->data['user_id'] . '
373
+                                                WHERE user_id = ' . (int) $this->user->data['user_id'] . '
374 374
                                                 AND ' . $sql_where;
375 375
 
376 376
             $this->db->sql_query($sql);
@@ -390,13 +390,13 @@  discard block
 block discarded – undo
390 390
 
391 391
         while ($row = $this->db->sql_fetchrow($result))
392 392
         {
393
-            $reg 				= new registration_helper();
393
+            $reg = new registration_helper();
394 394
             $reg->setCounter($row['counter']);
395 395
             $reg->setCertificate($row['certificate']);
396 396
             $reg->setKeyHandle($row['key_handle']);
397 397
             $reg->setPublicKey($row['public_key']);
398
-            $reg->id 			= $row['registration_id'];
399
-            $rows[] 			= $reg;
398
+            $reg->id = $row['registration_id'];
399
+            $rows[] = $reg;
400 400
         }
401 401
 
402 402
         $this->db->sql_freeresult($result);
Please login to merge, or discard this patch.
ucp/tfa_module.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -64,10 +64,10 @@
 block discarded – undo
64 64
 	 */
65 65
 	private function setup(user $user, template $template, request_interface $request, session_helper $session_helper)
66 66
 	{
67
-		$this->user 				= $user;
67
+		$this->user = $user;
68 68
 		$this->template 			= $template;
69 69
 		$this->request 				= $request;
70
-		$this->session_helper 		= $session_helper;
70
+		$this->session_helper = $session_helper;
71 71
 	}
72 72
 
73 73
 	/**
Please login to merge, or discard this patch.
controller/main_controller.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -87,15 +87,15 @@
 block discarded – undo
87 87
 	 */
88 88
 	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)
89 89
 	{
90
-		$this->controller_helper 	= $controller_helper;
91
-		$this->template 			= $template;
92
-		$this->db					= $db;
93
-		$this->user					= $user;
94
-		$this->request				= $request;
95
-		$this->config				= $config;
96
-		$this->session_helper		= $session_helper;
97
-		$this->root_path			= $root_path;
98
-		$this->php_ext				= $php_ext;
90
+		$this->controller_helper = $controller_helper;
91
+		$this->template = $template;
92
+		$this->db = $db;
93
+		$this->user = $user;
94
+		$this->request = $request;
95
+		$this->config = $config;
96
+		$this->session_helper = $session_helper;
97
+		$this->root_path = $root_path;
98
+		$this->php_ext = $php_ext;
99 99
 
100 100
 	}
101 101
 
Please login to merge, or discard this patch.