https://reisub.nsupdate.info/git
/
friendica.git
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #14097 from annando/enable-user-defined-channel
[friendica.git/.git]
/
mod
/
notes.php
diff --git
a/mod/notes.php
b/mod/notes.php
index
b0709eb
..
c756a5f
100644
(file)
--- a/
mod/notes.php
+++ b/
mod/notes.php
@@
-1,6
+1,6
@@
<?php
/**
<?php
/**
- * @copyright Copyright (C) 20
20, Friendica
+ * @copyright Copyright (C) 20
10-2024, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
*
* @license GNU AGPL version 3 or any later version
*
@@
-20,6
+20,7
@@
*/
use Friendica\App;
*/
use Friendica\App;
+use Friendica\Content\Conversation;
use Friendica\Content\Nav;
use Friendica\Content\Pager;
use Friendica\Database\DBA;
use Friendica\Content\Nav;
use Friendica\Content\Pager;
use Friendica\Database\DBA;
@@
-30,7
+31,7
@@
use Friendica\Module\BaseProfile;
function notes_init(App $a)
{
function notes_init(App $a)
{
- if (!
local_user
()) {
+ if (!
DI::userSession()->getLocalUserId
()) {
return;
}
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
()) {
-
n
otice(DI::l10n()->t('Permission denied.'));
+ if (!
DI::userSession()->getLocalUserId
()) {
+
DI::sysmsg()->addN
otice(DI::l10n()->t('Permission denied.'));
return;
}
return;
}
- $o = BaseProfile::getTabsHTML(
$a, 'notes', tru
e);
+ $o = BaseProfile::getTabsHTML(
'notes', true, $a->getLoggedInUserNickname(), fals
e);
if (!$update) {
$o .= '<h3>' . DI::l10n()->t('Personal Notes') . '</h3>';
$x = [
if (!$update) {
$o .= '<h3>' . DI::l10n()->t('Personal Notes') . '</h3>';
$x = [
- 'is_owner' => true,
- 'allow_location' => (($a->user['allow_location']) ? true : false),
- 'default_location' => $a->user['default-location'],
- 'nickname' => $a->user['nickname'],
'lockstate' => 'lock',
'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' => '',
];
'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()) {
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 {
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'));
}
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()]];
$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;
$count = 0;
@@
-91,7
+85,7
@@
function notes_content(App $a, $update = false)
$count = count($notes);
$count = count($notes);
- $o .=
conversation($a, $notes, 'notes'
, $update);
+ $o .=
DI::conversation()->render($notes, Conversation::MODE_NOTES
, $update);
}
$o .= $pager->renderMinimal($count);
}
$o .= $pager->renderMinimal($count);