Remove deprecated App::getBaseURL() - process methods to DI::baseUrl()->get()

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

diff --git a/src/Model/User.php b/src/Model/User.php
index fd12bdaaf2f1bfab0b0e6ed4c4159f6ea18ce3c6..22a8b04744c87a17d1e8589ac1898b2cf94cceec 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -18,6 +18,7 @@ use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\TwoFactor\AppSpecificPassword;
 use Friendica\Object\Image;
 use Friendica\Util\Crypto;
@@ -587,7 +588,6 @@ class User
         */
        public static function create(array $data)
        {
-               $a = \get_app();
                $return = ['user' => null, 'password' => ''];
 
                $using_invites = Config::get('system', 'invitation_only');
@@ -633,7 +633,7 @@ class User
                                $_SESSION['register'] = 1;
                                $_SESSION['openid'] = $openid_url;
 
-                               $openid = new LightOpenID($a->getHostName());
+                               $openid = new LightOpenID(DI::baseUrl()->getHostname());
                                $openid->identity = $openid_url;
                                $openid->returnUrl = System::baseUrl() . '/openid';
                                $openid->required = ['namePerson/friendly', 'contact/email', 'namePerson'];
@@ -836,9 +836,9 @@ class User
                        if ($Image->isValid()) {
                                $Image->scaleToSquare(300);
 
-                               $hash = Photo::newResource();
+                               $resource_id = Photo::newResource();
 
-                               $r = Photo::store($Image, $uid, 0, $hash, $filename, L10n::t('Profile Photos'), 4);
+                               $r = Photo::store($Image, $uid, 0, $resource_id, $filename, L10n::t('Profile Photos'), 4);
 
                                if ($r === false) {
                                        $photo_failure = true;
@@ -846,7 +846,7 @@ class User
 
                                $Image->scaleDown(80);
 
-                               $r = Photo::store($Image, $uid, 0, $hash, $filename, L10n::t('Profile Photos'), 5);
+                               $r = Photo::store($Image, $uid, 0, $resource_id, $filename, L10n::t('Profile Photos'), 5);
 
                                if ($r === false) {
                                        $photo_failure = true;
@@ -854,14 +854,14 @@ class User
 
                                $Image->scaleDown(48);
 
-                               $r = Photo::store($Image, $uid, 0, $hash, $filename, L10n::t('Profile Photos'), 6);
+                               $r = Photo::store($Image, $uid, 0, $resource_id, $filename, L10n::t('Profile Photos'), 6);
 
                                if ($r === false) {
                                        $photo_failure = true;
                                }
 
                                if (!$photo_failure) {
-                                       Photo::update(['profile' => 1], ['resource-id' => $hash]);
+                                       Photo::update(['profile' => 1], ['resource-id' => $resource_id]);
                                }
                        }
                }
@@ -916,6 +916,7 @@ class User
         *
         * It's here as a function because the mail is sent from different parts
         *
+        * @param L10n\L10n   $l10n     The used language
         * @param array  $user     User record array
         * @param string $sitename
         * @param string $siteurl
@@ -923,9 +924,9 @@ class User
         * @return NULL|boolean from notification() and email() inherited
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function sendRegisterOpenEmail($user, $sitename, $siteurl, $password)
+       public static function sendRegisterOpenEmail(L10n\L10n $l10n, $user, $sitename, $siteurl, $password)
        {
-               $preamble = Strings::deindent(L10n::t(
+               $preamble = Strings::deindent($l10n->t(
                        '
                                Dear %1$s,
                                Thank you for registering at %2$s. Your account has been created.
@@ -933,7 +934,7 @@ class User
                        $user['username'],
                        $sitename
                ));
-               $body = Strings::deindent(L10n::t(
+               $body = Strings::deindent($l10n->t(
                        '
                        The login details are as follows: