Merge pull request #10479 from MrPetovan/task/9378-merge-share-template

[friendica.git] / mod / notes.php

diff --git a/mod/notes.php b/mod/notes.php
index 34cf404ca8b752efa3d892279125c830b1c0323e..2b8c20783ab4ce1bbf5470d5341919fe12797483 100644 (file)
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -25,6 +25,7 @@ use Friendica\Content\Pager;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Item;
+use Friendica\Model\Post;
 use Friendica\Module\BaseProfile;
 
 function notes_init(App $a)
@@ -40,7 +41,7 @@ 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;
        }
 
@@ -55,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(),
@@ -69,16 +70,24 @@ 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);