X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=f1cf6cfde566d413e339058599403a1cc0f30ec9;hb=560746eb3bf50696413ab6c4a4719cb013ee9121;hp=af7bd71793bc854b656c17f020df7e39198c6b7b;hpb=4e44b07dfe07dde78fe8a095fbb43d9ec1ffcb53;p=friendica.git
diff --git a/mod/notes.php b/mod/notes.php
index af7bd71793..f1cf6cfde5 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,15 +1,31 @@
.
+ *
*/
use Friendica\App;
use Friendica\Content\Nav;
-use Friendica\Core\L10n;
-use Friendica\Database\dba;
-use Friendica\Database\DBM;
+use Friendica\Content\Pager;
+use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Item;
-use Friendica\Model\Profile;
+use Friendica\Module\BaseProfile;
function notes_init(App $a)
{
@@ -17,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.'));
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,
@@ -52,7 +59,7 @@ 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' => '',
];
@@ -60,30 +67,33 @@ 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']];
+
+ 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_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(), ['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, 'notes', $update);
}
- $o .= alt_pager($a, count($r));
+ $o .= $pager->renderMinimal($count);
+
return $o;
}