X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=1f67e486d6a6d06ab98bddb4116dd70874575611;hb=d7c832748289b24741e34bc44e4906fc71a45d84;hp=f83195ff1ccdb1e1a16f75375d8df20bd1b27ad9;hpb=af6dbc654f82225cfc647fe2072662acae388e47;p=friendica.git
diff --git a/mod/notes.php b/mod/notes.php
index f83195ff1c..1f67e486d6 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -5,9 +5,9 @@
use Friendica\App;
use Friendica\Content\Nav;
+use Friendica\Content\Pager;
use Friendica\Core\L10n;
use Friendica\Database\DBA;
-use Friendica\Database\DBM;
use Friendica\Model\Item;
use Friendica\Model\Profile;
@@ -17,13 +17,7 @@ function notes_init(App $a)
return;
}
- $profile = 0;
-
- $which = $a->user['nickname'];
-
Nav::setSelected('home');
-
- //Profile::load($a, $which, $profile);
}
@@ -34,10 +28,7 @@ function notes_content(App $a, $update = false)
return;
}
- require_once 'include/security.php';
- require_once 'include/conversation.php';
-
- $o = Profile::getTabs($a, true);
+ $o = Profile::getTabs($a, 'notes', true);
if (!$update) {
$o .= '
' . L10n::t('Personal Notes') . '
';
@@ -60,30 +51,25 @@ function notes_content(App $a, $update = false)
}
$condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
- 'wall' => false, 'allow_cid' => '<' . $a->contact['id'] . '>', 'contact-id'=> $a->contact['id']];
+ 'contact-id'=> $a->contact['id']];
- $a->set_pager_itemspage(40);
+ $pager = new Pager($a->query_string, 40);
$params = ['order' => ['created' => true],
- 'limit' => [$a->pager['start'], $a->pager['itemspage']]];
- $r = Item::selectForUser(local_user(), ['id'], $condition, $params);
-
- if (DBM::is_result($r)) {
- $parents_arr = [];
-
- while ($rr = Item::fetch($r)) {
- $parents_arr[] = $rr['id'];
- }
- DBA::close($r);
-
- $condition = ['uid' => local_user(), 'parent' => $parents_arr];
- $result = Item::selectForUser(local_user(), [], $condition);
- if (DBM::is_result($result)) {
- $items = conv_sort(Item::inArray($result), 'commented');
- $o .= conversation($a, $items, 'notes', $update);
- }
+ 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
+ $r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params);
+
+ $count = 0;
+
+ if (DBA::isResult($r)) {
+ $notes = Item::inArray($r);
+
+ $count = count($notes);
+
+ $o .= conversation($a, $notes, $pager, 'notes', $update);
}
- $o .= alt_pager($a, count($r));
+ $o .= $pager->renderMinimal($count);
+
return $o;
}