X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=73c1507e3e044d8ea62538192104eafdc9d1cd0f;hb=d6c1889a2039033b14a88cdb031461cadabf2114;hp=9f1a4662da968d5f4a844af6dc5560142be53ef8;hpb=5de7d0f12f279aed4551d261d8f71325ca01028a;p=friendica.git

diff --git a/mod/notes.php b/mod/notes.php
index 9f1a4662da..73c1507e3e 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -9,12 +9,14 @@ function notes_init(&$a) {
 
 	$which = $a->user['nickname'];
 
+	nav_set_selected('home');
+
 //	profile_load($a,$which,$profile);
 
 }
 
 
-function notes_content(&$a) {
+function notes_content(&$a,$update = false) {
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
@@ -38,45 +40,31 @@ function notes_content(&$a) {
 	$is_owner = true;
 
 	$o ="";
-	// tabs
-	$tpl = get_markup_template('profile_tabs.tpl');
-	$o .= replace_macros($tpl,array(
-		'$url' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
-		'$phototab' => $a->get_baseurl() . '/photos/' . $a->user['nickname'],
-		'$status' => t('Status'),
-		'$profile' => t('Profile'),
-		'$photos' => t('Photos'),
-		'$events' => t('Events') ,
-		'$notes' => t('Personal Notes'),
-		'$activetab' => "notes",
-	));	
-	
-
-	$o .= '<h3>' . t('Personal Notes') . '</h3>';
-
-	$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 .= profile_tabs($a,True);
+
+	if(! $update) {
+		$o .= '<h3>' . t('Personal Notes') . '</h3>';
+
+		$commpage = false;
+		$commvisitor = 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'),
+			'acl_data' => '',
+		);
 
-    $o .= status_editor($a,$x,$a->contact['id']);
+		$o .= status_editor($a,$x,$a->contact['id']);
 
+	}
 
 	// Construct permissions
 
@@ -86,8 +74,9 @@ function notes_content(&$a) {
 
 	$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())
@@ -101,8 +90,9 @@ function notes_content(&$a) {
 
 	$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 ",
@@ -121,11 +111,11 @@ function notes_content(&$a) {
 		$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
@@ -133,9 +123,13 @@ function notes_content(&$a) {
 			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);