X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=38a72a741fd7e4ba2c3a0bfe62ab22034687fa79;hb=589b7e718da0a1eb5f9f6e86e091307c399e0df6;hp=608d01cf8c63fbf1ed718788ab0eba5f5ffd3db6;hpb=c39e0dcf2a97a850c8a2cb39a05651075c295e18;p=friendica.git

diff --git a/mod/notes.php b/mod/notes.php
index 608d01cf8c..38a72a741f 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -5,10 +5,11 @@
 
 use Friendica\App;
 use Friendica\Content\Nav;
-use Friendica\Core\L10n;
+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)
 {
@@ -16,30 +17,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 .= '<h3>' . L10n::t('Personal Notes') . '</h3>';
+		$o .= '<h3>' . DI::l10n()->t('Personal Notes') . '</h3>';
 
 		$x = [
 			'is_owner' => true,
@@ -51,7 +43,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' => '',
 		];
 
@@ -59,35 +51,25 @@ function notes_content(App $a, $update = false)
 	}
 
 	$condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
-		'wall' => false, 'contact-id'=> $a->contact['id']];
+		'contact-id'=> $a->contact['id']];
 
-	$a->set_pager_itemspage(40);
+	$pager = new Pager(DI::args()->getQueryString(), 40);
 
 	$params = ['order' => ['created' => true],
-		'limit' => [$a->pager['start'], $a->pager['itemspage']]];
-	$r = Item::selectForUser(local_user(), ['id'], $condition, $params);
+		'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
+	$r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params);
 
 	$count = 0;
 
 	if (DBA::isResult($r)) {
-		$count = count($r);
-		$parents_arr = [];
-
-		while ($rr = Item::fetch($r)) {
-			$parents_arr[] = $rr['id'];
-		}
-		DBA::close($r);
+		$notes = Item::inArray($r);
 
-		$condition = ['uid' => local_user(), 'parent' => $parents_arr];
-		$result = Item::selectForUser(local_user(), [], $condition);
+		$count = count($notes);
 
-		if (DBA::isResult($result)) {
-			$items = conv_sort(Item::inArray($result), 'commented');
-			$o .= conversation($a, $items, 'notes', $update);
-		}
+		$o .= conversation($a, $notes, $pager, 'notes', $update);
 	}
 
-	$o .= alt_pager($a, $count);
+	$o .= $pager->renderMinimal($count);
 
 	return $o;
 }