X-Git-Url: https://reisub.nsupdate.info/git/?a=blobdiff_plain;f=mod%2Fnotes.php;h=01f283870ef8ec2ed119d84a458fd2db67d7e33d;hb=382a7f5acdd2ff0f995f760ce7a8173ad01761fa;hp=f1a82bd4579207df774950cf9a0b9eaf6342eae5;hpb=b26c5e7f732add163c1661a3f91c089b703965aa;p=friendica.git%2F.git

diff --git a/mod/notes.php b/mod/notes.php
index f1a82bd457..01f283870e 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -2,12 +2,13 @@
 /**
  * @file mod/notes.php
  */
+
 use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
-use Friendica\Model\Profile;
+use Friendica\Database\DBA;
 use Friendica\Model\Item;
+use Friendica\Model\Profile;
 
 function notes_init(App $a)
 {
@@ -27,36 +28,21 @@ function notes_init(App $a)
 
 function notes_content(App $a, $update = false)
 {
-	if (! local_user()) {
+	if (!local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
 	require_once 'include/security.php';
 	require_once 'include/conversation.php';
-	$groups = [];
-
-
-	$o = '';
-
-	$remote_contact = false;
 
-	$contact_id = $_SESSION['cid'];
-	$contact = $a->contact;
-
-	$is_owner = true;
-
-	$o ="";
-	$o .= Profile::getTabs($a, true);
+	$o = Profile::getTabs($a, true);
 
 	if (!$update) {
 		$o .= '<h3>' . L10n::t('Personal Notes') . '</h3>';
 
-		$commpage = false;
-		$commvisitor = false;
-
 		$x = [
-			'is_owner' => $is_owner,
+			'is_owner' => true,
 			'allow_location' => (($a->user['allow_location']) ? true : false),
 			'default_location' => $a->user['default-location'],
 			'nickname' => $a->user['nickname'],
@@ -72,56 +58,26 @@ function notes_content(App $a, $update = false)
 		$o .= status_editor($a, $x, $a->contact['id']);
 	}
 
-	// Construct permissions
+	$condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
+		'wall' => false, 'contact-id'=> $a->contact['id']];
 
-	// default permissions - anonymous user
+	$a->set_pager_itemspage(40);
 
-	$sql_extra = " AND `item`.`allow_cid` = '<" . $a->contact['id'] . ">' ";
+	$params = ['order' => ['created' => true],
+		'limit' => [$a->pager['start'], $a->pager['itemspage']]];
+	$r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params);
 
-	$r = q("SELECT COUNT(*) AS `total`
-		FROM `item` %s
-		WHERE %s AND `item`.`uid` = %d AND `item`.`type` = 'note'
-		AND `contact`.`self` AND `item`.`id` = `item`.`parent` AND NOT `item`.`wall`
-		$sql_extra ",
-		item_joins(local_user()),
-		item_condition(),
-		intval(local_user())
-	);
+	$count = 0;
 
-	if (DBM::is_result($r)) {
-		$a->set_pager_total($r[0]['total']);
-		$a->set_pager_itemspage(40);
-	}
+	if (DBA::isResult($r)) {
+		$notes = DBA::toArray($r);
+
+		$count = count($notes);
 
-	$r = q("SELECT `item`.`id` AS `item_id` FROM `item` %s
-		WHERE %s AND `item`.`uid` = %d AND `item`.`type` = 'note'
-		AND `item`.`id` = `item`.`parent` AND NOT `item`.`wall`
-		$sql_extra
-		ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
-		item_joins(local_user()),
-		item_condition(),
-		intval(local_user()),
-		intval($a->pager['start']),
-		intval($a->pager['itemspage'])
-
-	);
-
-	$parents_arr = [];
-	$parents_str = '';
-
-	if (DBM::is_result($r)) {
-		foreach ($r as $rr) {
-			$parents_arr[] = $rr['item_id'];
-		}
-
-		$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);
-		}
+		$o .= conversation($a, $notes, 'notes', $update);
 	}
 
-	$o .= paginate($a);
+	$o .= alt_pager($a, $count);
+
 	return $o;
 }