@@ -69,8 +69,8 @@ |
||
| 69 | 69 | |
| 70 | 70 | 'TFA_DOUBLE_PRIORITY' => 'The choosen priority (%d) for module %s is already in use for module %s', |
| 71 | 71 | |
| 72 | - // Module names |
|
| 73 | - 'MODULE_U2F' => 'U2F', |
|
| 72 | + // Module names |
|
| 73 | + 'MODULE_U2F' => 'U2F', |
|
| 74 | 74 | |
| 75 | 75 | ) |
| 76 | 76 | ); |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | { |
| 201 | 201 | foreach ($keys as $row) |
| 202 | 202 | { |
| 203 | - $row = explode('_', $row); |
|
| 203 | + $row = explode('_', $row); |
|
| 204 | 204 | if (isset($row[0])) |
| 205 | 205 | { |
| 206 | 206 | $module = $this->session_helper->findModule($row['class']); |
@@ -211,8 +211,8 @@ discard block |
||
| 211 | 211 | } |
| 212 | 212 | } |
| 213 | 213 | } |
| 214 | - meta_refresh(3, $this->u_action); |
|
| 215 | - $message = $this->user->lang['TFA_KEYS_DELETED'] . '<br /><br />' . sprintf($this->user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>'); |
|
| 216 | - trigger_error($message); |
|
| 214 | + meta_refresh(3, $this->u_action); |
|
| 215 | + $message = $this->user->lang['TFA_KEYS_DELETED'] . '<br /><br />' . sprintf($this->user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>'); |
|
| 216 | + trigger_error($message); |
|
| 217 | 217 | } |
| 218 | 218 | } |
@@ -12,11 +12,11 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | interface module_interface |
| 14 | 14 | { |
| 15 | - /** |
|
| 16 | - * Get a language key for this specific module. |
|
| 17 | - * @return string |
|
| 18 | - */ |
|
| 19 | - public function get_translatable_name(); |
|
| 15 | + /** |
|
| 16 | + * Get a language key for this specific module. |
|
| 17 | + * @return string |
|
| 18 | + */ |
|
| 19 | + public function get_translatable_name(); |
|
| 20 | 20 | |
| 21 | 21 | /** |
| 22 | 22 | * Return if this module is enabled by the admin |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | * Do the actual registration of a new security key. |
| 98 | 98 | * |
| 99 | 99 | * @return boolean Result of the registration. |
| 100 | - * @throws BadRequestHttpException |
|
| 100 | + * @throws BadRequestHttpException |
|
| 101 | 101 | */ |
| 102 | 102 | public function register(); |
| 103 | 103 | |
@@ -50,10 +50,10 @@ discard block |
||
| 50 | 50 | */ |
| 51 | 51 | private $registration_table; |
| 52 | 52 | |
| 53 | - /** |
|
| 54 | - * @var string |
|
| 55 | - */ |
|
| 56 | - private $root_path; |
|
| 53 | + /** |
|
| 54 | + * @var string |
|
| 55 | + */ |
|
| 56 | + private $root_path; |
|
| 57 | 57 | |
| 58 | 58 | /** |
| 59 | 59 | * @var \paul999\u2f\U2F |
@@ -65,22 +65,22 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | private $reg_data; |
| 67 | 67 | |
| 68 | - /** |
|
| 69 | - * u2f constructor. |
|
| 70 | - * @param driver_interface $db |
|
| 71 | - * @param user $user |
|
| 72 | - * @param request_interface $request |
|
| 73 | - * @param template $template |
|
| 74 | - * @param string $registration_table |
|
| 75 | - * @param string $root_path |
|
| 76 | - */ |
|
| 68 | + /** |
|
| 69 | + * u2f constructor. |
|
| 70 | + * @param driver_interface $db |
|
| 71 | + * @param user $user |
|
| 72 | + * @param request_interface $request |
|
| 73 | + * @param template $template |
|
| 74 | + * @param string $registration_table |
|
| 75 | + * @param string $root_path |
|
| 76 | + */ |
|
| 77 | 77 | public function __construct(driver_interface $db, user $user, request_interface $request, template $template, $registration_table, $root_path) |
| 78 | 78 | { |
| 79 | 79 | $this->db = $db; |
| 80 | 80 | $this->user = $user; |
| 81 | 81 | $this->request = $request; |
| 82 | 82 | $this->template = $template; |
| 83 | - $this->root_path= $root_path; |
|
| 83 | + $this->root_path= $root_path; |
|
| 84 | 84 | |
| 85 | 85 | $this->registration_table = $registration_table; |
| 86 | 86 | |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | /** |
| 289 | 289 | * Start of registration |
| 290 | 290 | * @return string |
| 291 | - */ |
|
| 291 | + */ |
|
| 292 | 292 | public function register_start() |
| 293 | 293 | { |
| 294 | 294 | $data = $this->u2f->getRegisterData($this->reg_data); |
@@ -318,13 +318,13 @@ discard block |
||
| 318 | 318 | 'U2F_SIGN' => json_encode($data[1], JSON_UNESCAPED_SLASHES), |
| 319 | 319 | )); |
| 320 | 320 | |
| 321 | - return 'tfa_u2f_ucp_new'; |
|
| 321 | + return 'tfa_u2f_ucp_new'; |
|
| 322 | 322 | } |
| 323 | 323 | |
| 324 | 324 | /** |
| 325 | 325 | * Actual registration |
| 326 | 326 | * @return void |
| 327 | - * @throws BadRequestHttpException |
|
| 327 | + * @throws BadRequestHttpException |
|
| 328 | 328 | */ |
| 329 | 329 | public function register() |
| 330 | 330 | { |
@@ -374,7 +374,7 @@ discard block |
||
| 374 | 374 | while ($row = $this->db->sql_fetchrow($result)) |
| 375 | 375 | { |
| 376 | 376 | $this->template->assign_block_vars('keys', array( |
| 377 | - 'CLASS' => 'u2f', |
|
| 377 | + 'CLASS' => 'u2f', |
|
| 378 | 378 | 'ID' => $row['registration_id'], |
| 379 | 379 | 'REGISTERED' => $this->user->format_date($row['registered']), |
| 380 | 380 | 'LAST_USED' => $this->user->format_date($row['last_used']), |
@@ -411,24 +411,24 @@ discard block |
||
| 411 | 411 | } |
| 412 | 412 | } |
| 413 | 413 | |
| 414 | - /** |
|
| 415 | - * If this module can add new keys (Or other things) |
|
| 416 | - * |
|
| 417 | - * @return boolean |
|
| 418 | - */ |
|
| 419 | - public function can_register() |
|
| 420 | - { |
|
| 421 | - return $this->is_potentially_usable(false); |
|
| 422 | - } |
|
| 423 | - |
|
| 424 | - /** |
|
| 425 | - * Get a language key for this specific module. |
|
| 426 | - * @return string |
|
| 427 | - */ |
|
| 428 | - public function get_translatable_name() |
|
| 429 | - { |
|
| 430 | - return 'MODULE_U2F'; |
|
| 431 | - } |
|
| 414 | + /** |
|
| 415 | + * If this module can add new keys (Or other things) |
|
| 416 | + * |
|
| 417 | + * @return boolean |
|
| 418 | + */ |
|
| 419 | + public function can_register() |
|
| 420 | + { |
|
| 421 | + return $this->is_potentially_usable(false); |
|
| 422 | + } |
|
| 423 | + |
|
| 424 | + /** |
|
| 425 | + * Get a language key for this specific module. |
|
| 426 | + * @return string |
|
| 427 | + */ |
|
| 428 | + public function get_translatable_name() |
|
| 429 | + { |
|
| 430 | + return 'MODULE_U2F'; |
|
| 431 | + } |
|
| 432 | 432 | |
| 433 | 433 | /** |
| 434 | 434 | * Select all registration objects from the database |
@@ -180,7 +180,7 @@ |
||
| 180 | 180 | return $this->user_array[$user_id]; |
| 181 | 181 | } |
| 182 | 182 | |
| 183 | - $this->user_array[$user_id] = false; // Preset to false. |
|
| 183 | + $this->user_array[$user_id] = false; // Preset to false. |
|
| 184 | 184 | |
| 185 | 185 | /** |
| 186 | 186 | * @var int $priority |