X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fnotes.php;h=c7cfe8d70f1a2d3e13f98249785b6fcf9073a7b1;hb=221cfa8c22b724228ed24618569cabcae582d331;hp=8d93fc13d89ffce2547b439139ccae84debf53fa;hpb=e2f8673076165c402782332b42ee744b1ffc7969;p=friendica.git

diff --git a/mod/notes.php b/mod/notes.php
index 8d93fc13d8..c7cfe8d70f 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,9 +1,10 @@
 <?php
 
-function notes_init(&$a) {
+function notes_init(App $a) {
 
-	if(! local_user())
+	if (! local_user()) {
 		return;
+	}
 
 	$profile = 0;
 
@@ -16,9 +17,9 @@ function notes_init(&$a) {
 }
 
 
-function notes_content(&$a,$update = false) {
+function notes_content(App $a, $update = false) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
@@ -73,27 +74,26 @@ function notes_content(&$a,$update = false) {
 	$sql_extra = " AND `allow_cid` = '<" . $a->contact['id'] . ">' ";
 
 	$r = q("SELECT COUNT(*) AS `total`
-		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND %s
+		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 ",
-		contact_condition(), item_condition(),
+		item_joins(), item_condition(),
 		intval(local_user())
 
 	);
 
-	if(count($r)) {
+	if (dbm::is_result($r)) {
 		$a->set_pager_total($r[0]['total']);
 		$a->set_pager_itemspage(40);
 	}
 
-	$r = q("SELECT `item`.`id` AS `item_id` FROM `item`
-		LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND %s AND `contact`.`self`
+	$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 ",
-		contact_condition(), item_condition(),
+		item_joins(), item_condition(),
 		intval(local_user()),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
@@ -103,23 +103,21 @@ function notes_content(&$a,$update = false) {
 	$parents_arr = array();
 	$parents_str = '';
 
-	if(count($r)) {
+	if (dbm::is_result($r)) {
 		foreach($r as $rr)
 			$parents_arr[] = $rr['item_id'];
 		$parents_str = implode(', ', $parents_arr);
 
-		$r = q("SELECT %s, %s FROM `item`
-			LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND %s
+		$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_fieldlist(), contact_fieldlist(),
-			contact_condition(), item_condition(),
+			item_fieldlists(), item_joins(), item_condition(),
 			intval(local_user()),
 			dbesc($parents_str)
 		);
 
-		if(count($r)) {
+		if (dbm::is_result($r)) {
 			$items = conv_sort($r,"`commented`");
 
 			$o .= conversation($a,$items,'notes',$update);