X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=5996c140f19e52bdacb92940b8f2323c4097c360;hb=3972fe62fe8afb3791e9d6526e7665501a577b81;hp=f83195ff1ccdb1e1a16f75375d8df20bd1b27ad9;hpb=af6dbc654f82225cfc647fe2072662acae388e47;p=friendica.git

diff --git a/mod/notes.php b/mod/notes.php
index f83195ff1c..5996c140f1 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,15 +1,32 @@
 <?php
 /**
- * @file mod/notes.php
+ * @copyright Copyright (C) 2010-2021, 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;
 use Friendica\Content\Nav;
-use Friendica\Core\L10n;
+use Friendica\Content\Pager;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
+use Friendica\DI;
 use Friendica\Model\Item;
-use Friendica\Model\Profile;
+use Friendica\Model\Post;
+use Friendica\Module\BaseProfile;
 
 function notes_init(App $a)
 {
@@ -17,73 +34,60 @@ 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, $a->getLoggedInUserNickname(), false);
 
 	if (!$update) {
-		$o .= '<h3>' . L10n::t('Personal Notes') . '</h3>';
+		$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(),
-			'button' => L10n::t('Save'),
+			'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,
-		'wall' => false, 'allow_cid' => '<' . $a->contact['id'] . '>', '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'));
+	}
 
-	$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 = Post::selectThreadForUser(local_user(), ['uri-id'], $condition, $params);
+
+	$count = 0;
+
+	if (DBA::isResult($r)) {
+		$notes = Post::toArray($r);
+
+		$count = count($notes);
+
+		$o .= DI::conversation()->create($notes, 'notes', $update);
 	}
 
-	$o .= alt_pager($a, count($r));
+	$o .= $pager->renderMinimal($count);
+
 	return $o;
 }