X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=f1a82bd4579207df774950cf9a0b9eaf6342eae5;hb=b26c5e7f732add163c1661a3f91c089b703965aa;hp=b4cbadecf7aec32739ef228911cfc7adbe740660;hpb=d49f986d1eb6894dd948577288357b6c1755e3d3;p=friendica.git

diff --git a/mod/notes.php b/mod/notes.php
index b4cbadecf7..f1a82bd457 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -7,9 +7,10 @@ use Friendica\Content\Nav;
 use Friendica\Core\L10n;
 use Friendica\Database\DBM;
 use Friendica\Model\Profile;
+use Friendica\Model\Item;
 
-function notes_init(App $a) {
-
+function notes_init(App $a)
+{
 	if (! local_user()) {
 		return;
 	}
@@ -21,21 +22,18 @@ function notes_init(App $a) {
 	Nav::setSelected('home');
 
 	//Profile::load($a, $which, $profile);
-
 }
 
 
-function notes_content(App $a, $update = false) {
-
+function notes_content(App $a, $update = false)
+{
 	if (! local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
-	require_once("include/bbcode.php");
-	require_once('include/security.php');
-	require_once('include/conversation.php');
-	require_once('include/acl_selectors.php');
+	require_once 'include/security.php';
+	require_once 'include/conversation.php';
 	$groups = [];
 
 
@@ -51,8 +49,8 @@ function notes_content(App $a, $update = false) {
 	$o ="";
 	$o .= Profile::getTabs($a, true);
 
-	if(! $update) {
-		$o .= '<h3>' . t('Personal Notes') . '</h3>';
+	if (!$update) {
+		$o .= '<h3>' . L10n::t('Personal Notes') . '</h3>';
 
 		$commpage = false;
 		$commvisitor = false;
@@ -67,12 +65,11 @@ function notes_content(App $a, $update = false) {
 			'bang' => '',
 			'visitor' => 'block',
 			'profile_uid' => local_user(),
-			'button' => t('Save'),
+			'button' => L10n::t('Save'),
 			'acl_data' => '',
 		];
 
-		$o .= status_editor($a,$x,$a->contact['id']);
-
+		$o .= status_editor($a, $x, $a->contact['id']);
 	}
 
 	// Construct permissions
@@ -86,9 +83,9 @@ function notes_content(App $a, $update = false) {
 		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(), item_condition(),
+		item_joins(local_user()),
+		item_condition(),
 		intval(local_user())
-
 	);
 
 	if (DBM::is_result($r)) {
@@ -101,7 +98,8 @@ function notes_content(App $a, $update = false) {
 		AND `item`.`id` = `item`.`parent` AND NOT `item`.`wall`
 		$sql_extra
 		ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
-		item_joins(), item_condition(),
+		item_joins(local_user()),
+		item_condition(),
 		intval(local_user()),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
@@ -112,27 +110,18 @@ function notes_content(App $a, $update = false) {
 	$parents_str = '';
 
 	if (DBM::is_result($r)) {
-		foreach($r as $rr)
+		foreach ($r as $rr) {
 			$parents_arr[] = $rr['item_id'];
-		$parents_str = implode(', ', $parents_arr);
-
-		$r = q("SELECT %s FROM `item` %s
-			WHERE %s AND `item`.`uid` = %d AND `item`.`parent` IN (%s)
-			$sql_extra
-			ORDER BY `parent` DESC, `gravity` ASC, `item`.`id` ASC ",
-			item_fieldlists(), item_joins(), item_condition(),
-			intval(local_user()),
-			dbesc($parents_str)
-		);
-
-		if (DBM::is_result($r)) {
-			$items = conv_sort($r,"`commented`");
+		}
 
-			$o .= conversation($a,$items,'notes',$update);
+		$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 .= paginate($a);
 	return $o;
 }