Merge remote-tracking branch 'upstream/develop' into item-notification

[friendica.git] / mod / profiles.php

diff --git a/mod/profiles.php b/mod/profiles.php
index 46bc36db5313d8142f3b1c4815f534678a66ac84..575d3443fb4d59bd3e73a5a9eb0a9261abe52569 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -13,9 +13,9 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
@@ -41,7 +41,7 @@ function profiles_init(App $a) {
                );
                if (! DBA::isResult($r)) {
                        notice(L10n::t('Profile not found.') . EOL);
-                       $a->internalRedirect('profiles');
+                       DI::baseUrl()->redirect('profiles');
                        return; // NOTREACHED
                }
 
@@ -62,7 +62,7 @@ function profiles_init(App $a) {
                        info(L10n::t('Profile deleted.').EOL);
                }
 
-               $a->internalRedirect('profiles');
+               DI::baseUrl()->redirect('profiles');
                return; // NOTREACHED
        }
 
@@ -96,10 +96,10 @@ function profiles_init(App $a) {
 
                info(L10n::t('New profile created.') . EOL);
                if (DBA::isResult($r3) && count($r3) == 1) {
-                       $a->internalRedirect('profiles/' . $r3[0]['id']);
+                       DI::baseUrl()->redirect('profiles/' . $r3[0]['id']);
                }
 
-               $a->internalRedirect('profiles');
+               DI::baseUrl()->redirect('profiles');
        }
 
        if (($a->argc > 2) && ($a->argv[1] === 'clone')) {
@@ -134,10 +134,10 @@ function profiles_init(App $a) {
                );
                info(L10n::t('New profile created.') . EOL);
                if ((DBA::isResult($r3)) && (count($r3) == 1)) {
-                       $a->internalRedirect('profiles/'.$r3[0]['id']);
+                       DI::baseUrl()->redirect('profiles/'.$r3[0]['id']);
                }
 
-               $a->internalRedirect('profiles');
+               DI::baseUrl()->redirect('profiles');
 
                return; // NOTREACHED
        }
@@ -512,8 +512,8 @@ function profiles_content(App $a) {
                        return;
                }
 
-               $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('profed_head.tpl'), [
-                       '$baseurl' => System::baseUrl(true),
+               DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('profed_head.tpl'), [
+                       '$baseurl' => DI::baseUrl()->get(true),
                ]);
 
                $opt_tpl = Renderer::getMarkupTemplate("profile-hide-friends.tpl");
@@ -587,7 +587,7 @@ function profiles_content(App $a) {
                        '$lbl_ex2' => L10n::t('Example: fishing photography software'),
 
                        '$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''),
-                       '$baseurl' => System::baseUrl(true),
+                       '$baseurl' => DI::baseUrl()->get(true),
                        '$profile_id' => $r[0]['id'],
                        '$profile_name' => ['profile_name', L10n::t('Profile Name:'), $r[0]['profile-name'], L10n::t('Required'), '*'],
                        '$is_default'   => $is_default,
@@ -640,7 +640,7 @@ function profiles_content(App $a) {
                        );
                        if (DBA::isResult($r)) {
                                //Go to the default profile.
-                               $a->internalRedirect('profiles/' . $r[0]['id']);
+                               DI::baseUrl()->redirect('profiles/' . $r[0]['id']);
                        }
                }
 
@@ -654,7 +654,7 @@ function profiles_content(App $a) {
                        $profiles = '';
                        foreach ($r as $rr) {
                                $profiles .= Renderer::replaceMacros($tpl, [
-                                       '$photo'        => $a->removeBaseURL($rr['thumb']),
+                                       '$photo'        => DI::baseUrl()->remove($rr['thumb']),
                                        '$id'           => $rr['id'],
                                        '$alt'          => L10n::t('Profile Image'),
                                        '$profile_name' => $rr['profile-name'],