X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FContact%2FRevoke.php;h=609ec65842e4a9394d78ab46af35264ce2b376af;hb=79235b6db1c9badd6c9602d54ad0d550e4bec2fd;hp=e5bf71ed0889d08f20d2c64742944c1112e16eac;hpb=ce578a77453fd421e9598c994ef008ad7e128de6;p=friendica.git

diff --git a/src/Module/Contact/Revoke.php b/src/Module/Contact/Revoke.php
index e5bf71ed08..609ec65842 100644
--- a/src/Module/Contact/Revoke.php
+++ b/src/Module/Contact/Revoke.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
- * @license   GNU AGPL version 3 or any later version
+ * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -21,46 +21,46 @@
 
 namespace Friendica\Module\Contact;
 
-use Friendica\App\Arguments;
-use Friendica\App\BaseURL;
+use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Content\Nav;
 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;
 use Friendica\Module\Security\Login;
 use Friendica\Network\HTTPException;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 class Revoke extends BaseModule
 {
-	/** @var array */
+	/**
+	 * User-specific contact (uid != 0) array
+	 * @var array
+	 */
 	protected $contact;
 	
 	/** @var Database */
 	protected $dba;
-	/** @var BaseURL */
-	protected $baseUrl;
-	/** @var Arguments */
-	protected $args;
-	
-	public function __construct(Database $dba, BaseURL $baseUrl, Arguments $args, L10n $l10n, array $parameters = [])
+
+	public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Database $dba, Response $response, array $server, array $parameters = [])
 	{
-		parent::__construct($l10n, $parameters);
+		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
 		$this->dba     = $dba;
-		$this->baseUrl = $baseUrl;
-		$this->args    = $args;
 
-		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->l10n->t('Unknown contact.'));
+			throw new HTTPException\NotFoundException($this->t('Unknown contact.'));
 		}
 
 		if (empty($data['user'])) {
@@ -70,37 +70,32 @@ class Revoke extends BaseModule
 		$this->contact = Model\Contact::getById($data['user']);
 
 		if ($this->contact['deleted']) {
-			throw new HTTPException\NotFoundException($this->l10n->t('Contact is deleted.'));
+			throw new HTTPException\NotFoundException($this->t('Contact is deleted.'));
 		}
 
 		if (!empty($this->contact['network']) && $this->contact['network'] == Protocol::PHANTOM) {
-			throw new HTTPException\NotFoundException($this->l10n->t('Contact is being deleted.'));
+			throw new HTTPException\NotFoundException($this->t('Contact is being deleted.'));
 		}
 	}
 
-	public function post()
+	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->l10n->t('Follow was successfully revoked.'));
-		} elseif ($result === null) {
-			notice($this->l10n->t('Follow was successfully revoked, however the remote contact won\'t be aware of this revokation.'));
-		} else {
-			notice($this->l10n->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']);
 	}
 
-	public function content(): string
+	protected function content(array $request = []): string
 	{
-		if (!local_user()) {
+		if (!DI::userSession()->getLocalUserId()) {
 			return Login::form($_SERVER['REQUEST_URI']);
 		}
 
@@ -108,10 +103,10 @@ class Revoke extends BaseModule
 
 		return Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_drop_confirm.tpl'), [
 			'$l10n' => [
-				'header'  => $this->l10n->t('Revoke Follow'),
-				'message' => $this->l10n->t('Do you really want to revoke this contact\'s follow? This cannot be undone and they will have to manually follow you back again.'),
-				'confirm' => $this->l10n->t('Yes'),
-				'cancel'  => $this->l10n->t('Cancel'),
+				'header'  => $this->t('Revoke Follow'),
+				'message' => $this->t('Do you really want to revoke this contact\'s follow? This cannot be undone and they will have to manually follow you back again.'),
+				'confirm' => $this->t('Yes'),
+				'cancel'  => $this->t('Cancel'),
 			],
 			'$contact'       => Contact::getContactTemplateVars($this->contact),
 			'$method'        => 'post',