Removed redundant maximagesize = INF statements

[friendica.git] / src / Module / Contact / Revoke.php

diff --git a/src/Module/Contact/Revoke.php b/src/Module/Contact/Revoke.php
index 59b3bdafae803af66ca07bf072022dc5cf90a373..609ec65842e4a9394d78ab46af35264ce2b376af 100644 (file)
--- a/src/Module/Contact/Revoke.php
+++ b/src/Module/Contact/Revoke.php
@@ -28,6 +28,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\Database;
+use Friendica\DI;
 use Friendica\Model;
 use Friendica\Module\Contact;
 use Friendica\Module\Response;
@@ -38,7 +39,10 @@ use Psr\Log\LoggerInterface;
 
 class Revoke extends BaseModule
 {
-       /** @var array */
+       /**
+        * User-specific contact (uid != 0) array
+        * @var array
+        */
        protected $contact;
        
        /** @var Database */
@@ -50,11 +54,11 @@ class Revoke extends BaseModule
 
                $this->dba     = $dba;
 
-               if (!local_user()) {
+               if (!DI::userSession()->getLocalUserId()) {
                        return;
                }
 
-               $data = Model\Contact::getPublicAndUserContactID($this->parameters['id'], local_user());
+               $data = Model\Contact::getPublicAndUserContactID($this->parameters['id'], DI::userSession()->getLocalUserId());
                if (!$this->dba->isResult($data)) {
                        throw new HTTPException\NotFoundException($this->t('Unknown contact.'));
                }
@@ -76,27 +80,22 @@ class Revoke extends BaseModule
 
        protected function post(array $request = [])
        {
-               if (!local_user()) {
+               if (!DI::userSession()->getLocalUserId()) {
                        throw new HTTPException\UnauthorizedException();
                }
 
                self::checkFormSecurityTokenRedirectOnError('contact/' . $this->parameters['id'], 'contact_revoke');
 
-               $result = Model\Contact::revokeFollow($this->contact);
-               if ($result === true) {
-                       notice($this->t('Follow was successfully revoked.'));
-               } elseif ($result === null) {
-                       notice($this->t('Follow was successfully revoked, however the remote contact won\'t be aware of this revokation.'));
-               } else {
-                       notice($this->t('Unable to revoke follow, please try again later or contact the administrator.'));
-               }
+               Model\Contact::revokeFollow($this->contact);
+
+               DI::sysmsg()->addNotice($this->t('Follow was successfully revoked.'));
 
                $this->baseUrl->redirect('contact/' . $this->parameters['id']);
        }
 
        protected function content(array $request = []): string
        {
-               if (!local_user()) {
+               if (!DI::userSession()->getLocalUserId()) {
                        return Login::form($_SERVER['REQUEST_URI']);
                }