@@ -76,14 +76,14 @@ |
||
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 | /** |
@@ -43,7 +43,7 @@ discard block |
||
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 |
||
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); |
@@ -72,10 +72,10 @@ |
||
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); |
@@ -64,10 +64,10 @@ |
||
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 | /** |
@@ -87,15 +87,15 @@ |
||
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 |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | $this->request = $request; |
76 | 76 | $this->template = $template; |
77 | 77 | |
78 | - $this->registration_table = $registration_table; |
|
78 | + $this->registration_table = $registration_table; |
|
79 | 79 | |
80 | 80 | $this->u2f = new \paul999\u2f\U2F('https://' . $this->request->server('HTTP_HOST')); |
81 | 81 | } |
@@ -348,13 +348,13 @@ discard block |
||
348 | 348 | 'LAST_USED' => $this->user->format_date($row['last_used']), |
349 | 349 | )); |
350 | 350 | |
351 | - $reg = new registration_helper(); |
|
351 | + $reg = new registration_helper(); |
|
352 | 352 | $reg->setCounter($row['counter']); |
353 | 353 | $reg->setCertificate($row['certificate']); |
354 | 354 | $reg->setKeyHandle($row['key_handle']); |
355 | 355 | $reg->setPublicKey($row['public_key']); |
356 | - $reg->id = $row['registration_id']; |
|
357 | - $this->reg_data[] = $reg; |
|
356 | + $reg->id = $row['registration_id']; |
|
357 | + $this->reg_data[] = $reg; |
|
358 | 358 | } |
359 | 359 | $this->db->sql_freeresult($result); |
360 | 360 | } |
@@ -391,13 +391,13 @@ discard block |
||
391 | 391 | |
392 | 392 | while ($row = $this->db->sql_fetchrow($result)) |
393 | 393 | { |
394 | - $reg = new registration_helper(); |
|
394 | + $reg = new registration_helper(); |
|
395 | 395 | $reg->setCounter($row['counter']); |
396 | 396 | $reg->setCertificate($row['certificate']); |
397 | 397 | $reg->setKeyHandle($row['key_handle']); |
398 | 398 | $reg->setPublicKey($row['public_key']); |
399 | - $reg->id = $row['registration_id']; |
|
400 | - $rows[] = $reg; |
|
399 | + $reg->id = $row['registration_id']; |
|
400 | + $rows[] = $reg; |
|
401 | 401 | } |
402 | 402 | |
403 | 403 | $this->db->sql_freeresult($result); |