Update "storage" console command

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

diff --git a/src/Model/User.php b/src/Model/User.php
index 9fe6e742862cb1dc656bf0e4ff8537a660546c9e..602ba9b33f545aa230af6aa74d0e01fa22996400 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -7,7 +7,6 @@ namespace Friendica\Model;
 
 use DivineOmega\PasswordExposed;
 use Exception;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
@@ -17,6 +16,7 @@ use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\Model\Photo;
 use Friendica\Object\Image;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
@@ -317,6 +317,7 @@ class User
         *
         * @param string $password
         * @return string
+        * @throws Exception
         */
        public static function hashPassword($password)
        {
@@ -333,9 +334,26 @@ class User
         * @param int    $uid
         * @param string $password
         * @return bool
+        * @throws Exception
         */
        public static function updatePassword($uid, $password)
        {
+               $password = trim($password);
+
+               if (empty($password)) {
+                       throw new Exception(L10n::t('Empty passwords are not allowed.'));
+               }
+
+               if (!Config::get('system', 'disable_password_exposed', false) && self::isPasswordExposed($password)) {
+                       throw new Exception(L10n::t('The new password has been exposed in a public data dump, please choose another.'));
+               }
+
+               $allowed_characters = '!"#$%&\'()*+,-./;<=>?@[\]^_`{|}~';
+
+               if (!preg_match('/^[a-z0-9' . preg_quote($allowed_characters, '/') . ']+$/i', $password)) {
+                       throw new Exception(L10n::t('The password can\'t contain accentuated letters, white spaces or colons (:)'));
+               }
+
                return self::updatePasswordHashed($uid, self::hashPassword($password));
        }
 
@@ -400,13 +418,15 @@ class User
         * - Create self-contact
         * - Create profile image
         *
-        * @param array $data
-        * @return string
-        * @throw Exception
+        * @param  array $data
+        * @return array
+        * @throws \ErrorException
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws Exception
         */
        public static function create(array $data)
        {
-               $a = get_app();
+               $a = \get_app();
                $return = ['user' => null, 'password' => ''];
 
                $using_invites = Config::get('system', 'invitation_only');
@@ -681,12 +701,12 @@ class User
                                }
 
                                if (!$photo_failure) {
-                                       DBA::update('photo', ['profile' => 1], ['resource-id' => $hash]);
+                                       Photo::update(['profile' => 1], ['resource-id' => $hash]);
                                }
                        }
                }
 
-               Addon::callHooks('register_account', $uid);
+               Hook::callAll('register_account', $uid);
 
                $return['user'] = $user;
                return $return;
@@ -771,7 +791,7 @@ class User
                        If you ever want to delete your account, you can do so at %3$s/removeme
 
                        Thank you and welcome to %2$s.',
-                       $user['email'], $sitename, $siteurl, $user['username'], $password
+                       $user['nickname'], $sitename, $siteurl, $user['username'], $password
                ));
 
                return notification([
@@ -795,7 +815,7 @@ class User
                        return false;
                }
 
-               $a = get_app();
+               $a = \get_app();
 
                Logger::log('Removing user: ' . $uid);