X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=b5bdbf870f8c2031031620c57a792c9eedb354ec;hb=989ac2fda800b826addbf70eff4feccde1c352ba;hp=ccd30926c8dd0dcd8f63f0e8c51293ba76055dad;hpb=e80d68ba53776bed047d897f52db7e25b35a479d;p=friendica.git

diff --git a/mod/notes.php b/mod/notes.php
index ccd30926c8..b5bdbf870f 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -25,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)
@@ -40,49 +41,50 @@ 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;
 	}
 
-	$o = BaseProfile::getTabsHTML($a, 'notes', true);
+	$o = BaseProfile::getTabsHTML($a, 'notes', true, $a->getLoggedInUserNickname(), false);
 
 	if (!$update) {
 		$o .= '<h3>' . DI::l10n()->t('Personal Notes') . '</h3>';
 
 		$x = [
-			'is_owner' => true,
-			'allow_location' => (($a->user['allow_location']) ? true : false),
-			'default_location' => $a->user['default-location'],
-			'nickname' => $a->user['nickname'],
 			'lockstate' => 'lock',
-			'acl' => '',
-			'bang' => '',
-			'visitor' => 'block',
-			'profile_uid' => local_user(),
+			'acl' => \Friendica\Core\ACL::getSelfOnlyHTML(local_user(), DI::l10n()->t('Personal notes are visible only by yourself.')),
 			'button' => DI::l10n()->t('Save'),
 			'acl_data' => '',
 		];
 
-		$o .= status_editor($a, $x, $a->contact['id']);
+		$o .= DI::conversation()->statusEditor($x, $a->getContactId());
 	}
 
 	$condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
-		'contact-id'=> $a->contact['id']];
+		'contact-id'=> $a->getContactId()];
+
+	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::args()->getQueryString(), 40);
+	$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 .= DI::conversation()->create($notes, 'notes', $update);
 	}
 
 	$o .= $pager->renderMinimal($count);