X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=2b8c20783ab4ce1bbf5470d5341919fe12797483;hb=1ca58968f273df183fdd81f15b65d3fdb1914964;hp=536029338f815f174969a696fdfc0d59c60976b8;hpb=1bc4b2e0788ac11d3b377013b410f2250fff68aa;p=friendica.git
diff --git a/mod/notes.php b/mod/notes.php
index 536029338f..2b8c20783a 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,6 +1,22 @@
.
+ *
*/
use Friendica\App;
@@ -9,7 +25,8 @@ use Friendica\Content\Pager;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Item;
-use Friendica\Model\Profile;
+use Friendica\Model\Post;
+use Friendica\Module\BaseProfile;
function notes_init(App $a)
{
@@ -24,11 +41,11 @@ function notes_init(App $a)
function notes_content(App $a, $update = false)
{
if (!local_user()) {
- notice(DI::l10n()->t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.'));
return;
}
- $o = Profile::getTabs($a, 'notes', true);
+ $o = BaseProfile::getTabsHTML($a, 'notes', true);
if (!$update) {
$o .= '
' . DI::l10n()->t('Personal Notes') . '
';
@@ -39,7 +56,7 @@ function notes_content(App $a, $update = false)
'default_location' => $a->user['default-location'],
'nickname' => $a->user['nickname'],
'lockstate' => 'lock',
- 'acl' => '',
+ 'acl' => \Friendica\Core\ACL::getSelfOnlyHTML(local_user(), DI::l10n()->t('Personal notes are visible only by yourself.')),
'bang' => '',
'visitor' => 'block',
'profile_uid' => local_user(),
@@ -53,20 +70,28 @@ function notes_content(App $a, $update = false)
$condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
'contact-id'=> $a->contact['id']];
- $pager = new Pager(DI::args()->getQueryString(), 40);
+ if (DI::mode()->isMobile()) {
+ $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
+ DI::config()->get('system', 'itemspage_network_mobile'));
+ } else {
+ $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_network',
+ DI::config()->get('system', 'itemspage_network'));
+ }
+
+ $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage);
$params = ['order' => ['created' => true],
'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
- $r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params);
+ $r = Post::selectThreadForUser(local_user(), ['uri-id'], $condition, $params);
$count = 0;
if (DBA::isResult($r)) {
- $notes = Item::inArray($r);
+ $notes = Post::toArray($r);
$count = count($notes);
- $o .= conversation($a, $notes, $pager, 'notes', $update);
+ $o .= conversation($a, $notes, 'notes', $update);
}
$o .= $pager->renderMinimal($count);