X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=c5c45be7243c8a7081b9d5de0056df7d55d15267;hb=008c97c570ea62749a3f486b42c424365863d627;hp=73c1507e3e044d8ea62538192104eafdc9d1cd0f;hpb=3c97a6703cd5a743fc9339f52996bcb1eb436ef0;p=friendica.git

diff --git a/mod/notes.php b/mod/notes.php
index 73c1507e3e..c5c45be724 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,9 +1,13 @@
 <?php
 
-function notes_init(&$a) {
+use Friendica\App;
+use Friendica\Database\DBM;
 
-	if(! local_user())
+function notes_init(App $a) {
+
+	if (! local_user()) {
 		return;
+	}
 
 	$profile = 0;
 
@@ -16,9 +20,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;
 	}
@@ -69,33 +73,30 @@ function notes_content(&$a,$update = false) {
 	// Construct permissions
 
 	// default permissions - anonymous user
-	
-	$sql_extra = " AND `allow_cid` = '<" . $a->contact['id'] . ">' ";
+
+	$sql_extra = " AND `item`.`allow_cid` = '<" . $a->contact['id'] . ">' ";
 
 	$r = q("SELECT COUNT(*) AS `total`
-		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 
-		AND `item`.`deleted` = 0 AND `item`.`type` = 'note'
-		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
-		AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
+		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(), 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`, `contact`.`uid` AS `contact-uid`
-		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 
-		and `item`.`moderated` = 0 AND `item`.`type` = 'note'
-		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
-		AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
+	$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(), item_condition(),
 		intval(local_user()),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
@@ -105,26 +106,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 `item`.*, `item`.`id` AS `item_id`, 
-			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`network`, `contact`.`rel`, 
-			`contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
-			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
-			FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
-			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-			AND `item`.`parent` IN ( %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_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);