X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=e66b45f097b4fabe08a143930f42bce6707785e6;hb=a27b7fb28d151c00eef8319cdf876896d36df8b0;hp=a1ce19a7ab32edd8ddb1a3cab24bdc8bf8a84e5c;hpb=60fbe0b39b02e9d1ce4521883c86b4783f4b9d4e;p=friendica.git

diff --git a/include/conversation.php b/include/conversation.php
index a1ce19a7ab..e66b45f097 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -8,12 +8,18 @@ function localize_item(&$item){
 	if ($item['verb']=="http://activitystrea.ms/schema/1.0/like" ||
 		$item['verb']=="http://activitystrea.ms/schema/1.0/dislike"){
 
+		$r = q("SELECT * from `item`,`contact` WHERE 
+				`item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
+				 dbesc($item['parent-uri']));
+		if(count($r)==0) return;
+		$obj=$r[0];
 		
 		$author	 = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
-		#$objauthor =  '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]';
-		#$objlink = preg_grep("|<link.*href=&quot;, $input)$item['object']
-		// $item['verb']=="http://activitystrea.ms/schema/1.0/like"
+		$objauthor =  '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]';
 		
+		$post_type = (($obj['resource-id']) ? t('photo') : t('status'));		
+		$plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
+                
 		switch($item['verb']){
 			case "http://activitystrea.ms/schema/1.0/like":
 				$bodyverb = t('%1$s likes %2$s\'s %3$s');
@@ -22,11 +28,40 @@ function localize_item(&$item){
 				$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
 				break;
 		}
-		$item['body'] = sprintf($bodyverb, $author, "tizio", "coso");
+		$item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
 			
 	}
+	if ($item['verb']=='http://activitystrea.ms/schema/1.0/make-friend'){
 
+		if ($item['object-type']=="" || $item['object-type']!='http://activitystrea.ms/schema/1.0/person') return;
 
+		$Aname = $item['author-name'];
+		$Alink = $item['author-link'];
+		
+		$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
+		
+		$obj = parse_xml_string($xmlhead.$item['object']);
+		$links = parse_xml_string($xmlhead."<links>".unxmlify($obj->link)."</links>");
+		
+		$Bname = $obj->title;
+		$Blink = ""; $Bphoto = "";
+		foreach ($links->link as $l){
+			$atts = $l->attributes();
+			switch($atts['rel']){
+				case "alternate": $Blink = $atts['href'];
+				case "photo": $Bphoto = $atts['href'];
+			}
+			
+		}
+		
+		$A = '[url=' . $Alink . ']' . $Aname . '[/url]';
+		$B = '[url=' . $Blink . ']' . $Bname . '[/url]';
+		if ($Bphoto!="") $Bphoto = '[url=' . $Blink . '][img]' . $Bphoto . '[/img][/url]';
+
+		$item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
+
+	}
+        
 }
 
 /**
@@ -66,19 +101,14 @@ function conversation(&$a, $items, $mode, $update) {
 	else
 		$return_url = $_SESSION['return_url'] = $a->cmd;
 
+	load_contact_links(local_user());
 
-	// find all the authors involved in remote conversations
-	// We will use a local profile photo if they are one of our contacts
-	// otherwise we have to get the photo from the item owner's site
 
-	$author_contacts = extract_item_authors($items,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();
@@ -90,8 +120,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) {
 
@@ -111,23 +141,20 @@ 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']);
-				$profile_link   = ((strlen($item['author-link']))   ? $item['author-link']   : $item['url']);
+
+				$sp = false;
+				$profile_link = best_link_url($item,$sp);
+				if($sp)
+					$sparkle = ' sparkle';
 				if($profile_link === 'mailbox')
 					$profile_link = '';
 
-				$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 
-				if(strlen($item['author-link'])) {
-					if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
-						$profile_link = $redirect_url;
-						$sparkle = ' sparkle';
-					}
-					elseif(isset($author_contacts[$item['author-link']])) {
-						$profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
-						$sparkle = ' sparkle';
-					}
-				}
+				$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>' : '');
@@ -190,7 +217,7 @@ function conversation(&$a, $items, $mode, $update) {
 
 		$comments = array();
 		foreach($items as $item) {
-			if(intval($item['gravity']) == 6) {
+			if((intval($item['gravity']) == 6) && ($item['id'] != $item['parent'])) {
 				if(! x($comments,$item['parent']))
 					$comments[$item['parent']] = 1;
 				else
@@ -240,7 +267,7 @@ function conversation(&$a, $items, $mode, $update) {
 					$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;" >';
 					}
@@ -259,12 +286,13 @@ function conversation(&$a, $items, $mode, $update) {
 				$comments_seen ++;
 
 
+			$override_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
 			$show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false);
 
 			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;
@@ -333,7 +361,7 @@ function conversation(&$a, $items, $mode, $update) {
 					));
 				}
 
-				if(($show_comment_box) || (($show_comment_box == false) && ($item['last-child']))) {
+				if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
 					$comment = replace_macros($cmnt_tpl,array(
 						'$return_path' => '', 
 						'$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
@@ -355,7 +383,7 @@ function conversation(&$a, $items, $mode, $update) {
 					? '<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'];
@@ -365,35 +393,25 @@ 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);
 
-			if($mode === 'profile') {
-				if(local_user() && ($item['contact-uid'] == local_user()) && ($item['network'] === 'dfrn') && (! $item['self'] )) {
-	                $profile_link = $redirect_url;
-    	            $sparkle = ' sparkle';
-        	    }
-				else {
-					$profile_link = $item['url'];
-					$sparkle = '';
-				}
-			}
-			elseif(strlen($item['author-link'])) {
-				$profile_link = $item['author-link'];
-				if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
-					$profile_link = $redirect_url;
-					$sparkle = ' sparkle';
-				}
-				elseif(isset($author_contacts[$item['author-link']])) {
-					$profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
-					$sparkle = ' sparkle';
-				}
-			}
-			else 
-				$profile_link = $item['url'];
+			$sp = false;
+			$profile_link = best_link_url($item,$sp);
+			if($sp)
+				$sparkle = ' sparkle';
 
 			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']) : '');
 
@@ -467,101 +485,105 @@ function conversation(&$a, $items, $mode, $update) {
 } 
 
 
+if(! function_exists('load_contact_links')) {
+function load_contact_links($uid) {
 
+	$a = get_app();
 
-if(! function_exists('extract_item_authors')) {
-function extract_item_authors($arr,$uid) {
+	$ret = array();
 
-	if((! $uid) || (! is_array($arr)) || (! count($arr)))
-		return array();
-	$urls = array();
-	foreach($arr as $rr) {
-		if(! in_array("'" . dbesc($rr['author-link']) . "'",$urls))
-			$urls[] = "'" . dbesc($rr['author-link']) . "'";
+	if(! $uid || x($a->contacts,'empty'))
+		return;
+
+	$r = q("SELECT `id`,`network`,`url`,`thumb` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 ",
+			intval($uid)
+	);
+	if(count($r)) {
+		foreach($r as $rr){
+			$url = normalise_link($rr['url']);
+			$ret[$url] = $rr;
+		}
 	}
+	else 
+		$ret['empty'] = true;	
+	$a->contacts = $ret;
+	return;		
+}}
+
 
-	// pre-quoted, don't put quotes on %s
-	if(count($urls)) {
-		$r = q("SELECT `id`,`network`,`url` FROM `contact` WHERE `uid` = %d AND `url` IN ( %s )  AND `self` = 0 AND `blocked` = 0 ",
-			intval($uid),
-			implode(',',$urls)
-		);
-		if(count($r)) {
-			$ret = array();
-			$authors = array();
-			foreach($r as $rr){
-				if ($rr['network']=='dfrn')
-					$ret[$rr['url']] = $rr['id'];
-				$authors[$r['url']]= $rr;
+function best_link_url($item,&$sparkle) {
+
+	$a = get_app();
+
+	$best_url = '';
+	$sparkle  = false;
+
+	$clean_url = normalise_link($item['author-link']);
+
+	if((local_user()) && (local_user() == $item['uid'])) {
+		if(isset($a->contacts) && x($a->contacts,$clean_url)) {
+			if($a->contacts[$clean_url]['network'] === NETWORK_DFRN) {
+				$best_url = $a->get_baseurl() . '/redir/' . $a->contacts[$clean_url]['id'];
+				$sparkle = true;
 			}
-			$a->authors = $authors;
-			return $ret;
+			else
+				$best_url = $a->contacts[$clean_url]['url'];
 		}
 	}
-	return array();		
-}}
+	if(! $best_url) {
+		if(strlen($item['author-link']))
+			$best_url = $item['author-link'];
+		else
+			$best_url = $item['url'];
+	}
+
+	return $best_url;
+}
+
 
 if(! function_exists('item_photo_menu')){
 function item_photo_menu($item){
 	$a = get_app();
 	
-	if (!isset($a->authors)){
-		$rr = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `uid`=%d AND `self`=0 AND `blocked`=0 ", intval(local_user()));
-		$authors = array();
-		foreach($rr as $r) $authors[$r['url']]= $r;
-		$a->authors = $authors;
-	}
-	
+	if (local_user() && (! count($a->contacts)))
+		load_contact_links(local_user());
+
 	$contact_url="";
 	$pm_url="";
-
 	$status_link="";
-	$photo_link="";
-	$profile_link   = ((strlen($item['author-link']))   ? $item['author-link'] : $item['url']);
-	$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+	$photos_link="";
+	$posts_link="";
 
+	$sparkle = false;
+    $profile_link = best_link_url($item,$sparkle);
 	if($profile_link === 'mailbox')
 		$profile_link = '';
 
-	// $item['contact-uid'] is only set on profile page and indicates the uid of the user who owns the profile.
-
-	$profile_owner = ((x($item,'contact-uid')) && intval($item['contact-uid']) ? intval($item['contact-uid']) : 0);	
-
-	// So we are checking that this is a logged in user on some page that *isn't* a profile page
-	// OR a profile page where the viewer owns the profile. 
-	// Then check if we can use a sparkle (redirect) link to the profile by virtue of it being our contact
-	// or a friend's contact that we both have a connection to. 
-
-	if((local_user() && ($profile_owner == 0)) 
-		|| ($profile_owner && $profile_owner == local_user())) {
-
-		if(strlen($item['author-link']) && link_compare($item['author-link'],$item['url'])) {
-			$redir = $redirect_url;
-			$cid = $item['cid'];
-		}
-		elseif(isset($a->authors[$item['author-link']])) {
-			$redir = $a->get_baseurl() . '/redir/' . $a->authors[$item['author-link']]['id'];
-			$cid = $a->authors[$item['author-link']]['id'];
-		}
-		if($item['author-link'] === 'mailbox')
-			$cid = $item['cid'];
-
-		if((isset($cid)) && (! $item['self'])) {
-			$contact_url = $a->get_baseurl() . '/contacts/' . $cid;
-			if($item['network'] === 'dfrn') {
-				$status_link = $redir . "?url=status";
-				$profile_link = $redir . "?url=profile";
-				$photos_link = $redir . "?url=photos";
-				$pm_url = $a->get_baseurl() . '/message/new/' . $cid;
-			}
+	if($sparkle) {
+		$cid = intval(basename($profile_link));
+		$status_link = $profile_link . "?url=status";
+		$photos_link = $profile_link . "?url=photos";
+		$profile_link = $profile_link . "?url=profile";
+		$pm_url = $a->get_baseurl() . '/message/new/' . $cid;
+	}
+	else {
+		if(local_user() && local_user() == $item['uid'] && link_compare($item['url'],$item['author-link'])) {
+			$cid = $item['contact-id'];
+		}		
+		else {
+			$cid = 0;
 		}
 	}
-
+	if(($cid) && (! $item['self'])) {
+		$contact_url = $a->get_baseurl() . '/contacts/' . $cid;
+		$posts_link = $a->get_baseurl() . '/network/?cid=' . $cid;
+	}
 
 	$menu = Array(
 		t("View status") => $status_link,
 		t("View profile") => $profile_link,
 		t("View photos") => $photos_link,		
+		t("View recent") => $posts_link, 
 		t("Edit contact") => $contact_url,
 		t("Send PM") => $pm_url,
 	);
@@ -634,3 +656,90 @@ function format_like($cnt,$arr,$type,$id) {
 	}
 	return $o;
 }}
+
+
+function status_editor($a,$x) {
+
+	$o = '';
+		
+	$geotag = (($x['allow_location']) ? get_markup_template('jot_geotag.tpl') : '');
+
+		$tpl = get_markup_template('jot-header.tpl');
+	
+		$a->page['htmlhead'] .= replace_macros($tpl, array(
+			'$baseurl' => $a->get_baseurl(),
+			'$geotag' => $geotag,
+			'$nickname' => $x['nickname'],
+			'$ispublic' => t('Visible to <strong>everybody</strong>'),
+			'$linkurl' => t('Please enter a link URL:'),
+			'$utubeurl' => t('Please enter a YouTube link:'),
+			'$vidurl' => t("Please enter a video\x28.ogg\x29 link/URL:"),
+			'$audurl' => t("Please enter an audio\x28.ogg\x29 link/URL:"),
+			'$whereareu' => t('Where are you right now?'),
+			'$title' => t('Enter a title for this item') 
+		));
+
+
+		$tpl = get_markup_template("jot.tpl");
+		
+		$jotplugins = '';
+		$jotnets = '';
+
+		$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+
+		$mail_enabled = false;
+		$pubmail_enabled = false;
+
+		if(($x['is_owner']) && (! $mail_disabled)) {
+			$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
+				intval(local_user())
+			);
+			if(count($r)) {
+				$mail_enabled = true;
+				if(intval($r[0]['pubmail']))
+					$pubmail_enabled = true;
+			}
+		}
+
+		if($mail_enabled) {
+	       $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
+			$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . 'value="1" /> '
+           	. t("Post to Email") . '</div>';
+		}
+
+		call_hooks('jot_tool', $jotplugins);
+		call_hooks('jot_networks', $jotnets);
+
+		$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));	
+
+		$o .= replace_macros($tpl,array(
+			'$return_path' => $a->cmd,
+			'$action' => 'item',
+			'$share' => t('Share'),
+			'$upload' => t('Upload photo'),
+			'$weblink' => t('Insert web link'),
+			'$youtube' => t('Insert YouTube video'),
+			'$video' => t('Insert Vorbis [.ogg] video'),
+			'$audio' => t('Insert Vorbis [.ogg] audio'),
+			'$setloc' => t('Set your location'),
+			'$noloc' => t('Clear browser location'),
+			'$title' => t('Set title'),
+			'$wait' => t('Please wait'),
+			'$permset' => t('Permission settings'),
+			'$content' => '',
+			'$post_id' => '',
+			'$baseurl' => $a->get_baseurl(),
+			'$defloc' => $x['default_location'],
+			'$visitor' => $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'],
+			'$acl' => $x['acl'],
+			'$bang' => $x['bang'],
+			'$profile_uid' => $x['profile_uid'],
+		));
+
+	return $o;
+}
\ No newline at end of file