X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=67f8fcab29f08b9bedd2acf7f0d73335c90a4805;hb=9c36b63b33b7bae4da27a5d6257df9e74cf7c5f2;hp=69b544472f6bba4013659fc3087ce6be29f9e75e;hpb=78114c13d5ce27b36682a960859056d4ebf9d9be;p=friendica.git
diff --git a/mod/notes.php b/mod/notes.php
index 69b544472f..67f8fcab29 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,13 +1,31 @@
.
+ *
*/
+
use Friendica\App;
use Friendica\Content\Nav;
-use Friendica\Core\L10n;
-use Friendica\Database\DBM;
-use Friendica\Model\Profile;
+use Friendica\Content\Pager;
+use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Item;
+use Friendica\Module\BaseProfile;
function notes_init(App $a)
{
@@ -15,30 +33,21 @@ function notes_init(App $a)
return;
}
- $profile = 0;
-
- $which = $a->user['nickname'];
-
Nav::setSelected('home');
-
- //Profile::load($a, $which, $profile);
}
function notes_content(App $a, $update = false)
{
if (!local_user()) {
- notice(L10n::t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.') . EOL);
return;
}
- require_once 'include/security.php';
- require_once 'include/conversation.php';
-
- $o = Profile::getTabs($a, true);
+ $o = BaseProfile::getTabsHTML($a, 'notes', true);
if (!$update) {
- $o .= '
' . L10n::t('Personal Notes') . '
';
+ $o .= '' . DI::l10n()->t('Personal Notes') . '
';
$x = [
'is_owner' => true,
@@ -50,42 +59,41 @@ function notes_content(App $a, $update = false)
'bang' => '',
'visitor' => 'block',
'profile_uid' => local_user(),
- 'button' => L10n::t('Save'),
+ 'button' => DI::l10n()->t('Save'),
'acl_data' => '',
];
$o .= status_editor($a, $x, $a->contact['id']);
}
- $condition = ["`uid` = ? AND `type` = 'note' AND `id` = `parent` AND NOT `wall`
- AND `allow_cid` = ? AND `contact-id` = ?",
- local_user(), '<' . $a->contact['id'] . '>', $a->contact['id']];
+ $condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
+ 'contact-id'=> $a->contact['id']];
- $notes = dba::count('item', $condition);
+ 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'));
+ }
- $a->set_pager_total($notes);
- $a->set_pager_itemspage(40);
+ $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage);
$params = ['order' => ['created' => true],
- 'limit' => [$a->pager['start'], $a->pager['itemspage']]];
- $r = Item::selectForUser(local_user(), ['item_id'], $condition, $params);
-
- if (DBM::is_result($r)) {
- $parents_arr = [];
-
- while ($rr = dba::fetch($r)) {
- $parents_arr[] = $rr['item_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(dba::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, 'notes', $update);
}
- $o .= paginate($a);
+ $o .= $pager->renderMinimal($count);
+
return $o;
}