X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FContact%2FAdvanced.php;h=5420390aa606f44b087df25e60ae949a982ad302;hb=79235b6db1c9badd6c9602d54ad0d550e4bec2fd;hp=3a45acb85c5dfffccb3bf10b7b835a9e4b70211c;hpb=e56a53647bd5469551bf4f9ef2df50a5dd16b943;p=friendica.git
diff --git a/src/Module/Contact/Advanced.php b/src/Module/Contact/Advanced.php
index 3a45acb85c..5420390aa6 100644
--- a/src/Module/Contact/Advanced.php
+++ b/src/Module/Contact/Advanced.php
@@ -28,8 +28,8 @@ 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;
@@ -56,7 +56,7 @@ class Advanced extends BaseModule
$this->dba = $dba;
$this->page = $page;
- if (!Session::isAuthenticated()) {
+ if (!DI::userSession()->isAuthenticated()) {
throw new ForbiddenException($this->t('Permission denied.'));
}
}
@@ -65,7 +65,7 @@ class Advanced extends BaseModule
{
$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,7 +96,7 @@ class Advanced extends BaseModule
}
if (!$r) {
- notice($this->t('Contact update failed.'));
+ DI::sysmsg()->addNotice($this->t('Contact update failed.'));
}
}
@@ -114,16 +104,13 @@ class Advanced extends BaseModule
{
$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('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 +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],
]);
}