X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=4fa4b92ada48b11db0eb2769956ac81e6931bc9f;hb=21769d7390a0bcfb5c74e53c05867ab52a54448b;hp=12c3b2a20d38585c2367b36bdc4618c4288e510c;hpb=2c63b65e3c66bcb0a047ce51c04d23376aa6c525;p=friendica.git

diff --git a/include/conversation.php b/include/conversation.php
index 12c3b2a20d..4fa4b92ada 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -91,6 +91,11 @@ function conversation(&$a, $items, $mode, $update) {
 		$page_writeable = can_write_wall($a,$profile_owner);
 	}
 
+	if($mode === 'notes') {
+		$profile_owner = $a->profile['profile_uid'];
+		$page_writeable = true;
+	}
+
 	if($mode === 'display') {
 		$profile_owner = $a->profile['uid'];
 		$page_writeable = can_write_wall($a,$profile_owner);
@@ -104,11 +109,11 @@ function conversation(&$a, $items, $mode, $update) {
 	load_contact_links(local_user());
 
 
-	$cmnt_tpl    = load_view_file('view/comment_item.tpl');
-	$like_tpl    = load_view_file('view/like.tpl');
-	$noshare_tpl = load_view_file('view/like_noshare.tpl');
-	$tpl         = load_view_file('view/wall_item.tpl');
-	$wallwall    = load_view_file('view/wallwall_item.tpl');
+	$cmnt_tpl    = get_markup_template('comment_item.tpl');
+	$like_tpl    = get_markup_template('like.tpl');
+	$noshare_tpl = get_markup_template('like_noshare.tpl');
+	$tpl         = get_markup_template('wall_item.tpl');
+	$wallwall    = get_markup_template('wallwall_item.tpl');
 
 	$alike = array();
 	$dlike = array();
@@ -120,8 +125,8 @@ function conversation(&$a, $items, $mode, $update) {
 			// "New Item View" on network page or search page results 
 			// - just loop through the items and format them minimally for display
 
-			$tpl = load_view_file('view/search_item.tpl');
-			$droptpl = load_view_file('view/wall_fake_drop.tpl');
+			$tpl = get_markup_template('search_item.tpl');
+			$droptpl = get_markup_template('wall_fake_drop.tpl');
 
 			foreach($items as $item) {
 
@@ -141,7 +146,6 @@ function conversation(&$a, $items, $mode, $update) {
 					$nickname = $a->user['nickname'];
 			
 				$profile_name   = ((strlen($item['author-name']))   ? $item['author-name']   : $item['name']);
-				$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
 
 				$sp = false;
 				$profile_link = best_link_url($item,$sp);
@@ -151,6 +155,12 @@ function conversation(&$a, $items, $mode, $update) {
 					$profile_link = '';
 
 
+				$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
+				if(($normalised != 'mailbox') && (x($a->contacts[$normalised])))
+					$profile_avatar = $a->contacts[$normalised]['thumb'];
+				else
+					$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
+
 				$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
 				$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
 				if($coord) {
@@ -258,11 +268,11 @@ function conversation(&$a, $items, $mode, $update) {
 
 				$item_writeable = (($item['writable'] || $item['self']) ? true : false);
 
-				if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile')) {
+				if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
 					$blowhard_count ++;
 					if($blowhard_count == 3) {
 						$o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent'] 
-							. '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\');" >' 
+							. '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\'); $(\'#icollapse-wrapper-' . $item['parent'] . '\').hide();" >' 
 							. t('See more posts like this') . '</div>' . '<div class="icollapse" id="icollapse-' 
 							. $item['parent'] . '" style="display: none;" >';
 					}
@@ -287,7 +297,7 @@ function conversation(&$a, $items, $mode, $update) {
 			if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
 				if(! $comments_collapsed) {
 					$o .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] 
-						. '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\');" >' 
+						. '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\'); $(\'#ccollapse-wrapper-' . $item['parent'] . '\').hide();" >' 
 						. sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>'
 						. '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
 					$comments_collapsed = true;
@@ -347,7 +357,7 @@ function conversation(&$a, $items, $mode, $update) {
 
 			if($page_writeable) {
 				if($toplevelpost) {
-					$likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array(
+					$likebuttons = replace_macros((($item['private'] || ($profile_owner != local_user())) ? $noshare_tpl : $like_tpl),array(
 						'$id' => $item['id'],
 						'$likethis' => t("I like this \x28toggle\x29"),
 						'$nolike' => t("I don't like this \x28toggle\x29"),
@@ -374,11 +384,11 @@ function conversation(&$a, $items, $mode, $update) {
 				}
 			}
 
-			$edpost = ((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1))
+			$edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes'))
 					? '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] 
 						. '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>'
 					: '');
-			$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
+			$drop = replace_macros(get_markup_template('wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
 
 			$photo = $item['photo'];
 			$thumb = $item['thumb'];
@@ -388,7 +398,6 @@ function conversation(&$a, $items, $mode, $update) {
 			$diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
 
 			$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
-			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
 
 			$sp = false;
 			$profile_link = best_link_url($item,$sp);
@@ -398,6 +407,15 @@ function conversation(&$a, $items, $mode, $update) {
 			if($profile_link === 'mailbox')
 				$profile_link = '';
 
+			$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
+			if(($normalised != 'mailbox') && (x($a->contacts[$normalised])))
+				$profile_avatar = $a->contacts[$normalised]['thumb'];
+			else
+				$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
+
+
+
+
 
 			$like    = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
 			$dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
@@ -645,13 +663,13 @@ function format_like($cnt,$arr,$type,$id) {
 }}
 
 
-function status_editor($a,$x) {
+function status_editor($a,$x, $notes_cid = 0) {
 
 	$o = '';
 		
-	$geotag = (($x['allow_location']) ? load_view_file('view/jot_geotag.tpl') : '');
+	$geotag = (($x['allow_location']) ? get_markup_template('jot_geotag.tpl') : '');
 
-		$tpl = load_view_file('view/jot-header.tpl');
+		$tpl = get_markup_template('jot-header.tpl');
 	
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
 			'$baseurl' => $a->get_baseurl(),
@@ -667,7 +685,7 @@ function status_editor($a,$x) {
 		));
 
 
-		$tpl = load_view_file("view/jot.tpl");
+		$tpl = get_markup_template("jot.tpl");
 		
 		$jotplugins = '';
 		$jotnets = '';
@@ -697,12 +715,15 @@ function status_editor($a,$x) {
 		call_hooks('jot_tool', $jotplugins);
 		call_hooks('jot_networks', $jotnets);
 
+		if($notes_cid)
+			$jotnets .= '<input type="hidden" name="contact_allow[]" value="' . $notes_cid .'" />';
+
 		$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));	
 
 		$o .= replace_macros($tpl,array(
 			'$return_path' => $a->cmd,
 			'$action' => 'item',
-			'$share' => t('Share'),
+			'$share' => (($x['button']) ? $x['button'] : t('Share')),
 			'$upload' => t('Upload photo'),
 			'$weblink' => t('Insert web link'),
 			'$youtube' => t('Insert YouTube video'),
@@ -713,12 +734,15 @@ function status_editor($a,$x) {
 			'$title' => t('Set title'),
 			'$wait' => t('Please wait'),
 			'$permset' => t('Permission settings'),
+			'$ptyp' => (($notes_cid) ? 'note' : 'wall'),
 			'$content' => '',
 			'$post_id' => '',
 			'$baseurl' => $a->get_baseurl(),
 			'$defloc' => $x['default_location'],
 			'$visitor' => $x['visitor'],
+			'$pvisit' => (($notes_cid) ? 'none' : $x['visitor']),
 			'$emailcc' => t('CC: email addresses'),
+			'$public' => t('Public post'),
 			'$jotnets' => $jotnets,
 			'$emtitle' => t('Example: bob@example.com, mary@example.com'),
 			'$lockstate' => $x['lockstate'],