Merge pull request #8227 from annando/daemon-checks

[friendica.git] / src / Module / Settings / TwoFactor / Recovery.php

diff --git a/src/Module/Settings/TwoFactor/Recovery.php b/src/Module/Settings/TwoFactor/Recovery.php
index 6937fa503f4eec65a0bc3bfe92cb8fff668d84c5..089283d3324d7cd1627479e1521797418a250450 100644 (file)
--- a/src/Module/Settings/TwoFactor/Recovery.php
+++ b/src/Module/Settings/TwoFactor/Recovery.php
@@ -1,42 +1,39 @@
 <?php
 
-
 namespace Friendica\Module\Settings\TwoFactor;
 
-
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 use Friendica\Model\TwoFactor\RecoveryCode;
-use Friendica\Module\BaseSettingsModule;
-use Friendica\Module\Login;
+use Friendica\Module\BaseSettings;
+use Friendica\Module\Security\Login;
 
 /**
  * // Page 3: 2FA enabled but not verified, show recovery codes
  *
  * @package Friendica\Module\TwoFactor
  */
-class Recovery extends BaseSettingsModule
+class Recovery extends BaseSettings
 {
-       public static function init()
+       public static function init(array $parameters = [])
        {
                if (!local_user()) {
                        return;
                }
 
-               $secret = PConfig::get(local_user(), '2fa', 'secret');
+               $secret = DI::pConfig()->get(local_user(), '2fa', 'secret');
 
                if (!$secret) {
-                       self::getApp()->internalRedirect('settings/2fa');
+                       DI::baseUrl()->redirect('settings/2fa');
                }
 
                if (!self::checkFormSecurityToken('settings_2fa_password', 't')) {
-                       notice(L10n::t('Please enter your password to access this page.'));
-                       self::getApp()->internalRedirect('settings/2fa');
+                       notice(DI::l10n()->t('Please enter your password to access this page.'));
+                       DI::baseUrl()->redirect('settings/2fa');
                }
        }
 
-       public static function post()
+       public static function post(array $parameters = [])
        {
                if (!local_user()) {
                        return;
@@ -47,19 +44,19 @@ class Recovery extends BaseSettingsModule
 
                        if ($_POST['action'] == 'regenerate') {
                                RecoveryCode::regenerateForUser(local_user());
-                               notice(L10n::t('New recovery codes successfully generated.'));
-                               self::getApp()->internalRedirect('settings/2fa/recovery?t=' . self::getFormSecurityToken('settings_2fa_password'));
+                               notice(DI::l10n()->t('New recovery codes successfully generated.'));
+                               DI::baseUrl()->redirect('settings/2fa/recovery?t=' . self::getFormSecurityToken('settings_2fa_password'));
                        }
                }
        }
 
-       public static function content()
+       public static function content(array $parameters = [])
        {
                if (!local_user()) {
                        return Login::form('settings/2fa/recovery');
                }
 
-               parent::content();
+               parent::content($parameters);
 
                if (!RecoveryCode::countValidForUser(local_user())) {
                        RecoveryCode::generateForUser(local_user());
@@ -67,20 +64,20 @@ class Recovery extends BaseSettingsModule
 
                $recoveryCodes = RecoveryCode::getListForUser(local_user());
 
-               $verified = PConfig::get(local_user(), '2fa', 'verified');
+               $verified = DI::pConfig()->get(local_user(), '2fa', 'verified');
                
                return Renderer::replaceMacros(Renderer::getMarkupTemplate('settings/twofactor/recovery.tpl'), [
                        '$form_security_token'     => self::getFormSecurityToken('settings_2fa_recovery'),
                        '$password_security_token' => self::getFormSecurityToken('settings_2fa_password'),
 
-                       '$title'              => L10n::t('Two-factor recovery codes'),
-                       '$help_label'         => L10n::t('Help'),
-                       '$message'            => L10n::t('<p>Recovery codes can be used to access your account in the event you lose access to your device and cannot receive two-factor authentication codes.</p><p><strong>Put these in a safe spot!</strong> If you lose your device and don’t have the recovery codes you will lose access to your account.</p>'),
+                       '$title'              => DI::l10n()->t('Two-factor recovery codes'),
+                       '$help_label'         => DI::l10n()->t('Help'),
+                       '$message'            => DI::l10n()->t('<p>Recovery codes can be used to access your account in the event you lose access to your device and cannot receive two-factor authentication codes.</p><p><strong>Put these in a safe spot!</strong> If you lose your device and don’t have the recovery codes you will lose access to your account.</p>'),
                        '$recovery_codes'     => $recoveryCodes,
-                       '$regenerate_message' => L10n::t('When you generate new recovery codes, you must copy the new codes. Your old codes won’t work anymore.'),
-                       '$regenerate_label'   => L10n::t('Generate new recovery codes'),
+                       '$regenerate_message' => DI::l10n()->t('When you generate new recovery codes, you must copy the new codes. Your old codes won’t work anymore.'),
+                       '$regenerate_label'   => DI::l10n()->t('Generate new recovery codes'),
                        '$verified'           => $verified,
-                       '$verify_label'       => L10n::t('Next: Verification'),
+                       '$verify_label'       => DI::l10n()->t('Next: Verification'),
                ]);
        }
 }