X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=ccd30926c8dd0dcd8f63f0e8c51293ba76055dad;hb=13a10b8f20ac7c5927c39d9e80e1a7d515385736;hp=fb42408c60387a8cbc11f994d61a7ba5884cd399;hpb=b02cdc8a7f84a4931e80027de42a80daa58581e1;p=friendica.git

diff --git a/mod/notes.php b/mod/notes.php
index fb42408c60..ccd30926c8 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,13 +1,31 @@
 <?php
 /**
- * @file mod/notes.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @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\Database\DBM;
-use Friendica\Model\Profile;
+use Friendica\Content\Pager;
+use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Item;
+use Friendica\Module\BaseProfile;
 
 function notes_init(App $a)
 {
@@ -15,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.') . 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,
@@ -50,42 +59,33 @@ 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' => '',
 		];
 
 		$o .= status_editor($a, $x, $a->contact['id']);
 	}
 
-	$condition = ["`uid` = ? AND `type` = 'note' AND `id` = `parent` AND NOT `wall`
-		AND `allow_cid` = ? AND `contact-id` = ?",
-		local_user(), '<' . $a->contact['id'] . '>', $a->contact['id']];
-
-	$notes = dba::count('item', $condition);
+	$condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
+		'contact-id'=> $a->contact['id']];
 
-	$a->set_pager_total($notes);
-	$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::select(local_user(), ['item_id'], $condition, $params);
-
-	if (DBM::is_result($r)) {
-		$parents_arr = [];
-
-		while ($rr = dba::fetch($r)) {
-			$parents_arr[] = $rr['item_id'];
-		}
-		dba::close($r);
-
-		$condition = ['uid' => local_user(), 'parent' => $parents_arr];
-		$result = Item::select(local_user(), [], $condition);
-		if (DBM::is_result($result)) {
-			$items = conv_sort(dba::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, $pager, 'notes', $update);
 	}
 
-	$o .= paginate($a);
+	$o .= $pager->renderMinimal($count);
+
 	return $o;
 }