X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=b96092495607996af5a2172b25b5dc4b0d68df36;hb=50dce314b2c43604b2d2ee5f74631154adaf29fd;hp=94ea10e81133f7da20151b3bdaa91cbcf0520f54;hpb=caf18164f0f7bd336e61d4393dabf6d93c739879;p=friendica.git

diff --git a/mod/notes.php b/mod/notes.php
index 94ea10e811..b960924956 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -46,29 +46,21 @@ function notes_content(&$a,$update = false) {
 		$commpage = false;
 		$commvisitor = false;
 
-		$celeb = false;
-
-
-
 		$x = array(
 			'is_owner' => $is_owner,
-       		'allow_location' => (($a->user['allow_location']) ? true : false),
-	        'default_location' => $a->user['default-location'],
-    	    'nickname' => $a->user['nickname'],
-   	    	'lockstate' => 'lock',
-	       	'acl' => '',
-    	    'bang' => '',
-        	'visitor' => 'block',
-	   	    'profile_uid' => local_user(),
-			'button' => t('Save')
-
-    	);
-
-    	$o .= status_editor($a,$x,$a->contact['id']);
+			'allow_location' => (($a->user['allow_location']) ? true : false),
+			'default_location' => $a->user['default-location'],
+			'nickname' => $a->user['nickname'],
+			'lockstate' => 'lock',
+			'acl' => '',
+			'bang' => '',
+			'visitor' => 'block',
+			'profile_uid' => local_user(),
+			'button' => t('Save'),
+			'acl_data' => '',
+		);
 
-		$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";
+		$o .= status_editor($a,$x,$a->contact['id']);
 
 	}
 
@@ -80,8 +72,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`.`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 +88,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 `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,11 +109,11 @@ 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`
-			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+			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 )
 			$sql_extra
@@ -127,9 +121,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);