Merge pull request #8141 from annando/brief2

[friendica.git] / mod / unfollow.php

diff --git a/mod/unfollow.php b/mod/unfollow.php
index c7ad413d225e34eda1cac94a99244043da3d1d41..f64c2a4c961f77d0e0c283461ca9ce8f84d76dcd 100644 (file)
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -4,10 +4,8 @@
  */
 
 use Friendica\App;
-use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -20,7 +18,7 @@ function unfollow_post(App $a)
        $base_return_path = 'contact';
 
        if (!local_user()) {
-               notice(L10n::t('Permission denied.'));
+               notice(DI::l10n()->t('Permission denied.'));
                DI::baseUrl()->redirect('login');
                // NOTREACHED
        }
@@ -34,7 +32,7 @@ function unfollow_post(App $a)
        $contact = DBA::selectFirst('contact', [], $condition);
 
        if (!DBA::isResult($contact)) {
-               notice(L10n::t("You aren't following this contact."));
+               notice(DI::l10n()->t("You aren't following this contact."));
                DI::baseUrl()->redirect($base_return_path);
                // NOTREACHED
        }
@@ -44,7 +42,7 @@ function unfollow_post(App $a)
        }
 
        if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
-               notice(L10n::t('Unfollowing is currently not supported by your network.'));
+               notice(DI::l10n()->t('Unfollowing is currently not supported by your network.'));
                DI::baseUrl()->redirect($base_return_path . '/' . $contact['id']);
                // NOTREACHED
        }
@@ -65,7 +63,7 @@ function unfollow_post(App $a)
                $return_path = $base_return_path . '/' . $contact['id'];
        }
 
-       info(L10n::t('Contact unfollowed'));
+       info(DI::l10n()->t('Contact unfollowed'));
        DI::baseUrl()->redirect($return_path);
        // NOTREACHED
 }
@@ -75,7 +73,7 @@ function unfollow_content(App $a)
        $base_return_path = 'contact';
 
        if (!local_user()) {
-               notice(L10n::t('Permission denied.'));
+               notice(DI::l10n()->t('Permission denied.'));
                DI::baseUrl()->redirect('login');
                // NOTREACHED
        }
@@ -90,24 +88,24 @@ function unfollow_content(App $a)
        $contact = DBA::selectFirst('contact', ['url', 'network', 'addr', 'name'], $condition);
 
        if (!DBA::isResult($contact)) {
-               notice(L10n::t("You aren't following this contact."));
+               notice(DI::l10n()->t("You aren't following this contact."));
                DI::baseUrl()->redirect($base_return_path);
                // NOTREACHED
        }
 
        if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
-               notice(L10n::t('Unfollowing is currently not supported by your network.'));
+               notice(DI::l10n()->t('Unfollowing is currently not supported by your network.'));
                DI::baseUrl()->redirect($base_return_path . '/' . $contact['id']);
                // NOTREACHED
        }
 
-       $request = System::baseUrl() . '/unfollow';
+       $request = DI::baseUrl() . '/unfollow';
        $tpl = Renderer::getMarkupTemplate('auto_request.tpl');
 
        $self = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]);
 
        if (!DBA::isResult($self)) {
-               notice(L10n::t('Permission denied.'));
+               notice(DI::l10n()->t('Permission denied.'));
                DI::baseUrl()->redirect($base_return_path);
                // NOTREACHED
        }
@@ -116,7 +114,7 @@ function unfollow_content(App $a)
        $_SESSION['fastlane'] = $contact['url'];
 
        $o = Renderer::replaceMacros($tpl, [
-               '$header'        => L10n::t('Disconnect/Unfollow'),
+               '$header'        => DI::l10n()->t('Disconnect/Unfollow'),
                '$desc'          => '',
                '$pls_answer'    => '',
                '$does_know_you' => '',
@@ -126,26 +124,26 @@ function unfollow_content(App $a)
                '$statusnet'     => '',
                '$diaspora'      => '',
                '$diasnote'      => '',
-               '$your_address'  => L10n::t('Your Identity Address:'),
+               '$your_address'  => DI::l10n()->t('Your Identity Address:'),
                '$invite_desc'   => '',
                '$emailnet'      => '',
-               '$submit'        => L10n::t('Submit Request'),
-               '$cancel'        => L10n::t('Cancel'),
+               '$submit'        => DI::l10n()->t('Submit Request'),
+               '$cancel'        => DI::l10n()->t('Cancel'),
                '$nickname'      => '',
                '$name'          => $contact['name'],
                '$url'           => $contact['url'],
                '$zrl'           => Contact::magicLink($contact['url']),
-               '$url_label'     => L10n::t('Profile URL'),
+               '$url_label'     => DI::l10n()->t('Profile URL'),
                '$myaddr'        => $self['url'],
                '$request'       => $request,
                '$keywords'      => '',
                '$keywords_label'=> ''
        ]);
 
-       $a->page['aside'] = '';
+       DI::page()['aside'] = '';
        Profile::load($a, '', 0, Contact::getDetailsByURL($contact['url']));
 
-       $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => L10n::t('Status Messages and Posts')]);
+       $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => DI::l10n()->t('Status Messages and Posts')]);
 
        // Show last public posts
        $o .= Contact::getPostsFromUrl($contact['url']);