Merge pull request #9690 from MrPetovan/bug/9672-empty-acl-public

[friendica.git] / src / Module / Security / TwoFactor / Verify.php

diff --git a/src/Module/Security/TwoFactor/Verify.php b/src/Module/Security/TwoFactor/Verify.php
index 08545b061ecb6d0453cff864520ad5e7c4f2ee8d..d7a44f0c56ab7f72376e60d3272da34ca20ad32b 100644 (file)
--- a/src/Module/Security/TwoFactor/Verify.php
+++ b/src/Module/Security/TwoFactor/Verify.php
@@ -1,11 +1,27 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module\Security\TwoFactor;
 
 use Friendica\BaseModule;
-use Friendica\App\Authentication;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\DI;
@@ -33,18 +49,16 @@ class Verify extends BaseModule
 
                        $code = $_POST['verify_code'] ?? '';
 
-                       $valid = (new Google2FA())->verifyKey(PConfig::get(local_user(), '2fa', 'secret'), $code);
+                       $valid = (new Google2FA())->verifyKey(DI::pConfig()->get(local_user(), '2fa', 'secret'), $code);
 
                        // The same code can't be used twice even if it's valid
                        if ($valid && Session::get('2fa') !== $code) {
                                Session::set('2fa', $code);
 
                                // Resume normal login workflow
-                               /** @var Authentication $authentication */
-                               $authentication = self::getClass(Authentication::class);
-                               $authentication->setForUser($a, $a->user, true, true);
+                               DI::auth()->setForUser($a, $a->user, true, true);
                        } else {
-                               self::$errors[] = L10n::t('Invalid code, please retry.');
+                               self::$errors[] = DI::l10n()->t('Invalid code, please retry.');
                        }
                }
        }
@@ -52,24 +66,24 @@ class Verify extends BaseModule
        public static function content(array $parameters = [])
        {
                if (!local_user()) {
-                       DI::app()->internalRedirect();
+                       DI::baseUrl()->redirect();
                }
 
                // Already authenticated with 2FA token
                if (Session::get('2fa')) {
-                       DI::app()->internalRedirect();
+                       DI::baseUrl()->redirect();
                }
 
                return Renderer::replaceMacros(Renderer::getMarkupTemplate('twofactor/verify.tpl'), [
                        '$form_security_token' => self::getFormSecurityToken('twofactor_verify'),
 
-                       '$title'            => L10n::t('Two-factor authentication'),
-                       '$message'          => L10n::t('<p>Open the two-factor authentication app on your device to get an authentication code and verify your identity.</p>'),
-                       '$errors_label'     => L10n::tt('Error', 'Errors', count(self::$errors)),
+                       '$title'            => DI::l10n()->t('Two-factor authentication'),
+                       '$message'          => DI::l10n()->t('<p>Open the two-factor authentication app on your device to get an authentication code and verify your identity.</p>'),
+                       '$errors_label'     => DI::l10n()->tt('Error', 'Errors', count(self::$errors)),
                        '$errors'           => self::$errors,
-                       '$recovery_message' => L10n::t('Don’t have your phone? <a href="%s">Enter a two-factor recovery code</a>', '2fa/recovery'),
-                       '$verify_code'      => ['verify_code', L10n::t('Please enter a code from your authentication app'), '', '', 'required', 'autofocus placeholder="000000"', 'tel'],
-                       '$verify_label'     => L10n::t('Verify code and complete login'),
+                       '$recovery_message' => DI::l10n()->t('Don’t have your phone? <a href="%s">Enter a two-factor recovery code</a>', '2fa/recovery'),
+                       '$verify_code'      => ['verify_code', DI::l10n()->t('Please enter a code from your authentication app'), '', '', DI::l10n()->t('Required'), 'autofocus autocomplete="off" placeholder="000000"', 'tel'],
+                       '$verify_label'     => DI::l10n()->t('Verify code and complete login'),
                ]);
        }
 }