X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=39649d81f64a80bd025ade8f8d05d044f15861a6;hb=1f08b2c1c092ad084595fc9a7e09f4670c9d2ac6;hp=38a72a741fd7e4ba2c3a0bfe62ab22034687fa79;hpb=92692218255145124fb553d6b61d1d9fed27da19;p=friendica.git

diff --git a/mod/notes.php b/mod/notes.php
index 38a72a741f..39649d81f6 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,6 +1,22 @@
 <?php
 /**
- * @file mod/notes.php
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 use Friendica\App;
@@ -9,11 +25,12 @@ 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)
 {
-	if (! local_user()) {
+	if (! DI::userSession()->getLocalUserId()) {
 		return;
 	}
 
@@ -21,52 +38,53 @@ function notes_init(App $a)
 }
 
 
-function notes_content(App $a, $update = false)
+function notes_content(App $a, bool $update = false)
 {
-	if (!local_user()) {
-		notice(DI::l10n()->t('Permission denied.') . EOL);
+	if (!DI::userSession()->getLocalUserId()) {
+		DI::sysmsg()->addNotice(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(DI::userSession()->getLocalUserId(), 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']];
+	$condition = ['uid' => DI::userSession()->getLocalUserId(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => Item::GRAVITY_PARENT,
+		'contact-id'=> $a->getContactId()];
 
-	$pager = new Pager(DI::args()->getQueryString(), 40);
+	if (DI::mode()->isMobile()) {
+		$itemsPerPage = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'itemspage_mobile_network',
+			DI::config()->get('system', 'itemspage_network_mobile'));
+	} else {
+		$itemsPerPage = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'itemspage_network',
+			DI::config()->get('system', 'itemspage_network'));
+	}
+
+	$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(DI::userSession()->getLocalUserId(), ['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);