X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FContact%2FAdvanced.php;h=d722691ff7a6d878ba7ba064e751305030942253;hb=e198edf652479bd0a969b3aabb469361dba0fd6b;hp=8d0a4e0f3f1255c575f6f62ebb94f0c36cc5d206;hpb=f00792d370cfbf1d52b37e3eed7e80e682df9d8a;p=friendica.git
diff --git a/src/Module/Contact/Advanced.php b/src/Module/Contact/Advanced.php
index 8d0a4e0f3f..d722691ff7 100644
--- a/src/Module/Contact/Advanced.php
+++ b/src/Module/Contact/Advanced.php
@@ -1,6 +1,6 @@
dba = $dba;
- $this->logger = $logger;
- $this->page = $page;
+ $this->dba = $dba;
+ $this->page = $page;
if (!Session::isAuthenticated()) {
throw new ForbiddenException($this->t('Permission denied.'));
}
}
- public function post()
+ protected function post(array $request = [])
{
$cid = $this->parameters['id'];
@@ -73,12 +74,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,12 +85,7 @@ 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()]
);
@@ -106,11 +97,11 @@ 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'];
@@ -121,9 +112,6 @@ class Advanced extends BaseModule
$this->page['aside'] = Widget\VCard::getHTML($contact);
- $warning = $this->t('WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working.');
- $info = $this->t('Please use your browser \'Back\' button now if you are uncertain what to do on this page.');
-
$returnaddr = "contact/$cid";
// This data is fetched automatically for most networks.
@@ -139,22 +127,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],
]);
}