Happy New Year 2023!

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

diff --git a/src/Module/Contact/Advanced.php b/src/Module/Contact/Advanced.php
index 8d0a4e0f3f1255c575f6f62ebb94f0c36cc5d206..bcf48da1ff2ef0742b9c9602d9e8e076a948a816 100644 (file)
--- a/src/Module/Contact/Advanced.php
+++ b/src/Module/Contact/Advanced.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,18 +21,21 @@
 
 namespace Friendica\Module\Contact;
 
+use Friendica\App;
 use Friendica\App\Page;
 use Friendica\BaseModule;
 use Friendica\Content\Widget;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Database\Database;
+use Friendica\DI;
 use Friendica\Model;
 use Friendica\Module\Contact;
+use Friendica\Module\Response;
 use Friendica\Network\HTTPException\BadRequestException;
 use Friendica\Network\HTTPException\ForbiddenException;
+use Friendica\Util\Profiler;
 use Friendica\Util\Strings;
 use Psr\Log\LoggerInterface;
 
@@ -43,29 +46,26 @@ class Advanced extends BaseModule
 {
        /** @var Database */
        protected $dba;
-       /** @var LoggerInterface */
-       protected $logger;
        /** @var Page */
        protected $page;
 
-       public function __construct(Database $dba, LoggerInterface $logger, Page $page, L10n $l10n, array $parameters = [])
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, App\Page $page, LoggerInterface $logger, Profiler $profiler, Response $response, Database $dba, array $server, array $parameters = [])
        {
-               parent::__construct($l10n, $parameters);
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-               $this->dba    = $dba;
-               $this->logger = $logger;
-               $this->page   = $page;
+               $this->dba  = $dba;
+               $this->page = $page;
 
-               if (!Session::isAuthenticated()) {
+               if (!DI::userSession()->isAuthenticated()) {
                        throw new ForbiddenException($this->t('Permission denied.'));
                }
        }
 
-       public function post()
+       protected function post(array $request = [])
        {
                $cid = $this->parameters['id'];
 
-               $contact = Model\Contact::selectFirst([], ['id' => $cid, 'uid' => local_user()]);
+               $contact = Model\Contact::selectFirst([], ['id' => $cid, 'uid' => DI::userSession()->getLocalUserId()]);
                if (empty($contact)) {
                        throw new BadRequestException($this->t('Contact not found.'));
                }
@@ -73,12 +73,7 @@ class Advanced extends BaseModule
                $name        = ($_POST['name'] ?? '') ?: $contact['name'];
                $nick        = $_POST['nick'] ?? '';
                $url         = $_POST['url'] ?? '';
-               $alias       = $_POST['alias'] ?? '';
-               $request     = $_POST['request'] ?? '';
-               $confirm     = $_POST['confirm'] ?? '';
-               $notify      = $_POST['notify'] ?? '';
                $poll        = $_POST['poll'] ?? '';
-               $attag       = $_POST['attag'] ?? '';
                $photo       = $_POST['photo'] ?? '';
                $nurl        = Strings::normaliseLink($url);
 
@@ -89,14 +84,9 @@ class Advanced extends BaseModule
                                'nick'        => $nick,
                                'url'         => $url,
                                'nurl'        => $nurl,
-                               'alias'       => $alias,
-                               'request'     => $request,
-                               'confirm'     => $confirm,
-                               'notify'      => $notify,
                                'poll'        => $poll,
-                               'attag'       => $attag,
                        ],
-                       ['id' => $contact['id'], 'uid' => local_user()]
+                       ['id' => $contact['id'], 'uid' => DI::userSession()->getLocalUserId()]
                );
 
                if ($photo) {
@@ -106,24 +96,21 @@ class Advanced extends BaseModule
                }
 
                if (!$r) {
-                       notice($this->t('Contact update failed.'));
+                       DI::sysmsg()->addNotice($this->t('Contact update failed.'));
                }
        }
 
-       public function content(): string
+       protected function content(array $request = []): string
        {
                $cid = $this->parameters['id'];
 
-               $contact = Model\Contact::selectFirst([], ['id' => $cid, 'uid' => local_user()]);
+               $contact = Model\Contact::selectFirst([], ['id' => $cid, 'uid' => DI::userSession()->getLocalUserId()]);
                if (empty($contact)) {
                        throw new BadRequestException($this->t('Contact not found.'));
                }
 
                $this->page['aside'] = Widget\VCard::getHTML($contact);
 
-               $warning = $this->t('<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.');
-               $info    = $this->t('Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.');
-
                $returnaddr = "contact/$cid";
 
                // This data is fetched automatically for most networks.
@@ -139,22 +126,15 @@ class Advanced extends BaseModule
                $tpl = Renderer::getMarkupTemplate('contact/advanced.tpl');
                return Renderer::replaceMacros($tpl, [
                        '$tab_str'           => $tab_str,
-                       '$warning'           => $warning,
-                       '$info'              => $info,
                        '$returnaddr'        => $returnaddr,
                        '$return'            => $this->t('Return to contact editor'),
                        '$contact_id'        => $contact['id'],
                        '$lbl_submit'        => $this->t('Submit'),
 
                        '$name'    => ['name', $this->t('Name'), $contact['name'], '', '', $readonly],
-                       '$nick'    => ['nick', $this->t('Account Nickname'), $contact['nick'], '', '', $readonly],
-                       '$attag'   => ['attag', $this->t('@Tagname - overrides Name/Nickname'), $contact['attag']],
-                       '$url'     => ['url', $this->t('Account URL'), $contact['url'], '', '', $readonly],
-                       '$alias'   => ['alias', $this->t('Account URL Alias'), $contact['alias'], '', '', $readonly],
-                       '$request' => ['request', $this->t('Friend Request URL'), $contact['request'], '', '', $readonly],
-                       'confirm'  => ['confirm', $this->t('Friend Confirm URL'), $contact['confirm'], '', '', $readonly],
-                       'notify'   => ['notify', $this->t('Notification Endpoint URL'), $contact['notify'], '', '', $readonly],
-                       'poll'     => ['poll', $this->t('Poll/Feed URL'), $contact['poll'], '', '', $readonly],
+                       '$nick'    => ['nick', $this->t('Account Nickname'), $contact['nick'], '', '', 'readonly'],
+                       '$url'     => ['url', $this->t('Account URL'), $contact['url'], '', '', 'readonly'],
+                       'poll'     => ['poll', $this->t('Poll/Feed URL'), $contact['poll'], '', '', ($contact['network'] == Protocol::FEED) ? '' : 'readonly'],
                        'photo'    => ['photo', $this->t('New photo from this URL'), '', '', '', $readonly],
                ]);
        }