X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=09dac72b0c9437dec1a7ee1063dd79ef4370eddf;hb=f0b928176aa81f1e29672ad3da8b542e757f3d30;hp=e6e2b44fb0c3714365fb46c72433c693018bbb79;hpb=355c42cb309eb1313097411067ca999b699aa620;p=friendica.git

diff --git a/mod/notes.php b/mod/notes.php
index e6e2b44fb0..09dac72b0c 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -60,16 +60,12 @@ function notes_content(&$a,$update = false) {
     	    'bang' => '',
         	'visitor' => 'block',
 	   	    'profile_uid' => local_user(),
-			'button' => t('Save')
-
+			'button' => t('Save'),
+			'acl_data' => '',
     	);
 
     	$o .= status_editor($a,$x,$a->contact['id']);
 
-		$o .= '<div id="live-notes"></div>' . "\r\n";
-		$o .= "<script> var profile_uid = " . local_user() 
-			. "; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
-
 	}
 
 	// Construct permissions
@@ -80,8 +76,9 @@ function notes_content(&$a,$update = false) {
 
 	$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 `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
+		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
 		$sql_extra ",
 		intval(local_user())
@@ -95,8 +92,9 @@ function notes_content(&$a,$update = false) {
 
 	$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 `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+		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
 		$sql_extra
 		ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
@@ -115,7 +113,7 @@ function notes_content(&$a,$update = false) {
 		$parents_str = implode(', ', $parents_arr);
  
 		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
-			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, `contact`.`rel`, 
+			`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`
@@ -127,9 +125,13 @@ function notes_content(&$a,$update = false) {
 			intval(local_user()),
 			dbesc($parents_str)
 		);
-	}
 
-	$o .= conversation($a,$r,'notes',$update);
+		if(count($r)) {
+			$items = conv_sort($r,"`commented`");
+
+			$o .= conversation($a,$items,'notes',$update);
+		}
+	}
 
 
 	$o .= paginate($a);