The item notifications now are based upon the "user-item" field

[friendica.git] / mod / unfollow.php

diff --git a/mod/unfollow.php b/mod/unfollow.php
index a66c88aefd2d9dcfe993c4d81cef222f11efcbd7..280ca164e6b7c3efb62dca042804fea50f1eb6c6 100644 (file)
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -7,8 +7,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;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
@@ -20,12 +20,12 @@ function unfollow_post(App $a)
 
        if (!local_user()) {
                notice(L10n::t('Permission denied.'));
-               $a->internalRedirect('login');
+               DI::baseUrl()->redirect('login');
                // NOTREACHED
        }
 
        $uid = local_user();
-       $url = Strings::escapeTags(trim(defaults($_REQUEST, 'url', '')));
+       $url = Strings::escapeTags(trim($_REQUEST['url'] ?? ''));
 
        $condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
                $uid, Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url),
@@ -34,17 +34,17 @@ function unfollow_post(App $a)
 
        if (!DBA::isResult($contact)) {
                notice(L10n::t("You aren't following this contact."));
-               $a->internalRedirect($base_return_path);
+               DI::baseUrl()->redirect($base_return_path);
                // NOTREACHED
        }
 
        if (!empty($_REQUEST['cancel'])) {
-               $a->internalRedirect($base_return_path . '/' . $contact['id']);
+               DI::baseUrl()->redirect($base_return_path . '/' . $contact['id']);
        }
 
        if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
                notice(L10n::t('Unfollowing is currently not supported by your network.'));
-               $a->internalRedirect($base_return_path . '/' . $contact['id']);
+               DI::baseUrl()->redirect($base_return_path . '/' . $contact['id']);
                // NOTREACHED
        }
 
@@ -65,7 +65,7 @@ function unfollow_post(App $a)
        }
 
        info(L10n::t('Contact unfollowed'));
-       $a->internalRedirect($return_path);
+       DI::baseUrl()->redirect($return_path);
        // NOTREACHED
 }
 
@@ -75,7 +75,7 @@ function unfollow_content(App $a)
 
        if (!local_user()) {
                notice(L10n::t('Permission denied.'));
-               $a->internalRedirect('login');
+               DI::baseUrl()->redirect('login');
                // NOTREACHED
        }
 
@@ -90,24 +90,24 @@ function unfollow_content(App $a)
 
        if (!DBA::isResult($contact)) {
                notice(L10n::t("You aren't following this contact."));
-               $a->internalRedirect($base_return_path);
+               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.'));
-               $a->internalRedirect($base_return_path . '/' . $contact['id']);
+               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.'));
-               $a->internalRedirect($base_return_path);
+               DI::baseUrl()->redirect($base_return_path);
                // NOTREACHED
        }
 
@@ -141,7 +141,7 @@ function unfollow_content(App $a)
                '$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')]);