Merge pull request #12984 from MrPetovan/bug/12983-dropzone-translation

[friendica.git] / src / Model / User.php

diff --git a/src/Model/User.php b/src/Model/User.php
index 5b749ec1dc7b8613a393f0c27be94245c0198336..11d55e7f7e26529fa507f8ddacd2b5a60124b385 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -35,7 +35,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Module\Register;
+use Friendica\Module;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Security\TwoFactor\Model\AppSpecificPassword;
 use Friendica\Network\HTTPException;
@@ -816,14 +816,14 @@ class User
         * Empties the password reset token field just in case.
         *
         * @param int    $uid
-        * @param string $pasword_hashed
+        * @param string $password_hashed
         * @return bool
         * @throws Exception
         */
-       private static function updatePasswordHashed(int $uid, string $pasword_hashed): bool
+       private static function updatePasswordHashed(int $uid, string $password_hashed): bool
        {
                $fields = [
-                       'password' => $pasword_hashed,
+                       'password' => $password_hashed,
                        'pwdreset' => null,
                        'pwdreset_time' => null,
                        'legacy_password' => false
@@ -1890,17 +1890,17 @@ class User
                }
 
                $register_policy = DI::config()->get('config', 'register_policy');
-               if (!in_array($register_policy, [Register::OPEN, Register::CLOSED])) {
+               if (!in_array($register_policy, [Module\Register::OPEN, Module\Register::CLOSED])) {
                        Logger::debug('Unsupported register policy.', ['policy' => $register_policy]);
                        return;
                }
 
                $users = DBA::count('user', ['blocked' => false, 'account_removed' => false, 'account_expired' => false]);
-               if (($users >= $max_registered_users) && ($register_policy == Register::OPEN)) {
-                       DI::config()->set('config', 'register_policy', Register::CLOSED);
+               if (($users >= $max_registered_users) && ($register_policy == Module\Register::OPEN)) {
+                       DI::config()->set('config', 'register_policy', Module\Register::CLOSED);
                        Logger::notice('Max users reached, registration is closed.', ['users' => $users, 'max' => $max_registered_users]);
-               } elseif (($users < $max_registered_users) && ($register_policy == Register::CLOSED)) {
-                       DI::config()->set('config', 'register_policy', Register::OPEN);
+               } elseif (($users < $max_registered_users) && ($register_policy == Module\Register::CLOSED)) {
+                       DI::config()->set('config', 'register_policy', Module\Register::OPEN);
                        Logger::notice('Below maximum users, registration is opened.', ['users' => $users, 'max' => $max_registered_users]);
                } else {
                        Logger::debug('Unchanged register policy', ['policy' => $register_policy, 'users' => $users, 'max' => $max_registered_users]);