@@ -69,26 +69,26 @@ discard block |
||
69 | 69 | * @var string |
70 | 70 | */ |
71 | 71 | private $php_ext; |
72 | - /** |
|
73 | - * @var phpbb\log\log |
|
74 | - */ |
|
75 | - private $log; |
|
76 | - |
|
77 | - /** |
|
78 | - * Constructor |
|
79 | - * |
|
80 | - * @access public |
|
81 | - * @param helper $controller_helper |
|
82 | - * @param driver_interface $db |
|
83 | - * @param template $template |
|
84 | - * @param user $user |
|
85 | - * @param request_interface $request |
|
86 | - * @param config $config |
|
87 | - * @param log $log |
|
88 | - * @param session_helper_interface $session_helper |
|
89 | - * @param string $root_path |
|
90 | - * @param string $php_ext |
|
91 | - */ |
|
72 | + /** |
|
73 | + * @var phpbb\log\log |
|
74 | + */ |
|
75 | + private $log; |
|
76 | + |
|
77 | + /** |
|
78 | + * Constructor |
|
79 | + * |
|
80 | + * @access public |
|
81 | + * @param helper $controller_helper |
|
82 | + * @param driver_interface $db |
|
83 | + * @param template $template |
|
84 | + * @param user $user |
|
85 | + * @param request_interface $request |
|
86 | + * @param config $config |
|
87 | + * @param log $log |
|
88 | + * @param session_helper_interface $session_helper |
|
89 | + * @param string $root_path |
|
90 | + * @param string $php_ext |
|
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 | 94 | $this->controller_helper = $controller_helper; |
@@ -100,8 +100,8 @@ discard block |
||
100 | 100 | $this->session_helper = $session_helper; |
101 | 101 | $this->root_path = $root_path; |
102 | 102 | $this->php_ext = $php_ext; |
103 | - $this->log = $log; |
|
104 | - } |
|
103 | + $this->log = $log; |
|
104 | + } |
|
105 | 105 | |
106 | 106 | /** |
107 | 107 | * @param int $user_id |
@@ -165,12 +165,12 @@ discard block |
||
165 | 165 | catch (http_exception $ex) // @TODO: Replace exception with own exception |
166 | 166 | { |
167 | 167 | |
168 | - $this->log->add('error', $this->user->data['user_id'], $this->user->ip, 'LOG_TFA_EXCEPTION', $ex->getMessage()); |
|
168 | + $this->log->add('error', $this->user->data['user_id'], $this->user->ip, 'LOG_TFA_EXCEPTION', $ex->getMessage()); |
|
169 | 169 | |
170 | - if ($admin) { |
|
171 | - // Also log it to admin log just to be sure. |
|
172 | - $this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_TFA_EXCEPTION', $ex->getMessage()); |
|
173 | - } |
|
170 | + if ($admin) { |
|
171 | + // Also log it to admin log just to be sure. |
|
172 | + $this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_TFA_EXCEPTION', $ex->getMessage()); |
|
173 | + } |
|
174 | 174 | if ($ex->getStatusCode() == 400) |
175 | 175 | { |
176 | 176 | $this->template->assign_var('S_ERROR', $this->user->lang($ex->getMessage())); |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | AND session_user_id = " . (int) $user_id; |
206 | 206 | $this->db->sql_query($sql); |
207 | 207 | |
208 | - $this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_ADMIN_AUTH_SUCCESS'); |
|
208 | + $this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_ADMIN_AUTH_SUCCESS'); |
|
209 | 209 | |
210 | 210 | redirect(append_sid("{$this->root_path}adm/index.{$this->php_ext}", false, true, $this->user->data['session_id'])); |
211 | 211 | } |