X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=554429d0ec56655b2e59dfda2912455f18c4ac80;hb=a609e545b66808f8a8e6c9d2f8dab08acd968880;hp=b0709eb9523d7f7f3479f0ae876c40a20d700399;hpb=b892db0cf3d12518b306940a37b139a2a4c3e14c;p=friendica.git
diff --git a/mod/notes.php b/mod/notes.php
index b0709eb952..554429d0ec 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,6 +1,6 @@
getLocalUserId()) {
return;
}
@@ -38,43 +39,36 @@ function notes_init(App $a)
}
-function notes_content(App $a, $update = false)
+function notes_content(App $a, bool $update = false)
{
- if (!local_user()) {
- notice(DI::l10n()->t('Permission denied.'));
+ if (!DI::userSession()->getLocalUserId()) {
+ DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
return;
}
- $o = BaseProfile::getTabsHTML($a, 'notes', true);
+ $o = BaseProfile::getTabsHTML('notes', true, $a->getLoggedInUserNickname(), false);
if (!$update) {
$o .= '
' . DI::l10n()->t('Personal Notes') . '
';
$x = [
- 'is_owner' => true,
- 'allow_location' => (($a->user['allow_location']) ? true : false),
- 'default_location' => $a->user['default-location'],
- 'nickname' => $a->user['nickname'],
'lockstate' => 'lock',
- 'acl' => \Friendica\Core\ACL::getSelfOnlyHTML(local_user(), DI::l10n()->t('Personal notes are visible only by yourself.')),
- 'bang' => '',
- 'visitor' => 'block',
- 'profile_uid' => local_user(),
+ 'acl' => \Friendica\Core\ACL::getSelfOnlyHTML(DI::userSession()->getLocalUserId(), DI::l10n()->t('Personal notes are visible only by yourself.')),
'button' => DI::l10n()->t('Save'),
'acl_data' => '',
];
- $o .= status_editor($a, $x, $a->contact['id']);
+ $o .= DI::conversation()->statusEditor($x, $a->getContactId());
}
- $condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
- 'contact-id'=> $a->contact['id']];
+ $condition = ['uid' => DI::userSession()->getLocalUserId(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => Item::GRAVITY_PARENT,
+ 'contact-id'=> $a->getContactId()];
if (DI::mode()->isMobile()) {
- $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
+ $itemsPerPage = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'itemspage_mobile_network',
DI::config()->get('system', 'itemspage_network_mobile'));
} else {
- $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_network',
+ $itemsPerPage = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'itemspage_network',
DI::config()->get('system', 'itemspage_network'));
}
@@ -82,7 +76,7 @@ function notes_content(App $a, $update = false)
$params = ['order' => ['created' => true],
'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
- $r = Post::selectThreadForUser(local_user(), ['uri'], $condition, $params);
+ $r = Post::selectThreadForUser(DI::userSession()->getLocalUserId(), ['uri-id'], $condition, $params);
$count = 0;
@@ -91,7 +85,7 @@ function notes_content(App $a, $update = false)
$count = count($notes);
- $o .= conversation($a, $notes, 'notes', $update);
+ $o .= DI::conversation()->render($notes, Conversation::MODE_NOTES, $update);
}
$o .= $pager->renderMinimal($count);