X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=2b8c20783ab4ce1bbf5470d5341919fe12797483;hb=7789ea25079801ee1425368e9bf2f7ce80d16d88;hp=38a72a741fd7e4ba2c3a0bfe62ab22034687fa79;hpb=f2d917114f949b3f76c04f99247092a16b1e3e9e;p=friendica.git diff --git a/mod/notes.php b/mod/notes.php index 38a72a741f..2b8c20783a 100644 --- a/mod/notes.php +++ b/mod/notes.php @@ -1,6 +1,22 @@ . + * */ use Friendica\App; @@ -9,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) @@ -24,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; } @@ -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);