X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Flike.php;h=6b97fafb561e291ef9dd95406f663d77880ab926;hb=e2e6b56c448da3a67fa25df118bbb7cbc3239664;hp=c7782d4d756a4128632f965aadf1bf912866883a;hpb=34eedb503acad59d649f96d3250b40cc1c84047c;p=friendica.git

diff --git a/mod/like.php b/mod/like.php
index c7782d4d75..6b97fafb56 100644
--- a/mod/like.php
+++ b/mod/like.php
@@ -16,16 +16,13 @@ function like_content(&$a) {
 	if(! $verb)
 		$verb = 'like';
 
+
 	switch($verb) {
 		case 'like':
-			$activity = ACTIVITY_LIKE;
-			break;
-		case 'dislike':
-			$activity = ACTIVITY_DISLIKE;
-			break;
 		case 'unlike':
 			$activity = ACTIVITY_LIKE;
 			break;
+		case 'dislike':
 		case 'undislike':
 			$activity = ACTIVITY_DISLIKE;
 			break;
@@ -37,12 +34,16 @@ function like_content(&$a) {
 
 	$item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0);
 
+	logger('like: verb ' . $verb . ' item ' . $item_id);
+
+
 	$r = q("SELECT * FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s') AND `id` = `parent` LIMIT 1",
 		dbesc($item_id),
 		dbesc($item_id)
 	);
 
 	if(! $item_id || (! count($r))) {
+		logger('like: no item ' . $item_id);
 		return;
 	}
 
@@ -54,6 +55,22 @@ function like_content(&$a) {
 		return;
 	}
 
+	$remote_owner = null;
+
+	if(! $item['wall']) {
+		// The top level post may have been written by somebody on another system
+		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			intval($item['contact-id']),
+			intval($item['uid'])
+		);
+		if(! count($r))
+			return;
+		if(! $r[0]['self'])
+			$remote_owner = $r[0];
+	}
+
+	// this represents the post owner on this system. 
+
 	$r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
 		WHERE `contact`.`self` = 1 AND `contact`.`uid` = %d LIMIT 1",
 		intval($owner_uid)
@@ -62,11 +79,17 @@ function like_content(&$a) {
 		$owner = $r[0];
 
 	if(! $owner) {
+		logger('like: no owner');
 		return;
 	}
 
+	if(! $remote_owner)
+		$remote_owner = $owner;
+
 
-	if((local_user()) && (get_uid() == $owner_uid)) {
+	// This represents the person posting
+
+	if((local_user()) && (local_user() == $owner_uid)) {
 		$contact = $owner;
 	}
 	else {
@@ -95,11 +118,7 @@ function like_content(&$a) {
 			intval($r[0]['id'])
 		);
 
-		$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-		$proc_debug = get_config('system','proc_debug');
-
-		proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"like\" \"$post_id\" $proc_debug &",
-			array(),$foo));
+		proc_run('php',"include/notifier.php","like","$post_id");
 		return;
 	}
 
@@ -107,7 +126,7 @@ function like_content(&$a) {
 
 	$post_type = (($item['resource-id']) ? t('photo') : t('status'));
 	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); 
-	$link = $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'];
+	$link = xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
 	$body = $item['body'];
 
 	$obj = <<< EOT
@@ -122,9 +141,9 @@ function like_content(&$a) {
 	</object>
 EOT;
 	if($verb === 'like')
-		$bodyverb = t('likes');
+		$bodyverb = t('%1$s likes %2$s\'s %3$s');
 	if($verb === 'dislike')
-		$bodyverb = t('doesn\'t like');
+		$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
 
 	if(! isset($bodyverb))
 			return; 
@@ -135,19 +154,22 @@ EOT;
 	$arr['uid'] = $owner_uid;
 	$arr['contact-id'] = $contact['id'];
 	$arr['type'] = 'activity';
-	$arr['wall'] = 1;
+	$arr['wall'] = $item['wall'];
+	$arr['origin'] = 1;
 	$arr['gravity'] = GRAVITY_LIKE;
 	$arr['parent'] = $item['id'];
 	$arr['parent-uri'] = $item['uri'];
-	$arr['owner-name'] = $owner['name'];
-	$arr['owner-link'] = $owner['url'];
-	$arr['owner-avatar'] = $owner['thumb'];
+	$arr['owner-name'] = $remote_owner['name'];
+	$arr['owner-link'] = $remote_owner['url'];
+	$arr['owner-avatar'] = $remote_owner['thumb'];
 	$arr['author-name'] = $contact['name'];
 	$arr['author-link'] = $contact['url'];
 	$arr['author-avatar'] = $contact['thumb'];
-	$arr['body'] = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' . ' ' .  t('likes') . ' ' 
-		. '[url=' . $owner['url'] . ']' . $owner['name'] . t('\'s') . '[/url]' . ' '
-		. '[url=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]' ;
+	
+	$ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
+	$alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
+	$plink = '[url=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
+	$arr['body'] =  sprintf( $bodyverb, $ulink, $alink, $plink );
 
 	$arr['verb'] = $activity;
 	$arr['object-type'] = $objtype;
@@ -162,12 +184,19 @@ EOT;
 
 	$post_id = item_store($arr);	
 
+	if(! $item['visible']) {
+		$r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			intval($item['id']),
+			intval($owner_uid)
+		);
+	}			
+
+	$arr['id'] = $post_id;
 
-	$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-	$proc_debug = get_config('system','proc_debug');
+	call_hooks('post_local_end', $arr);
 
-	proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"like\" \"$post_id\" $proc_debug &",
-		array(),$foo));
+	proc_run('php',"include/notifier.php","like","$post_id");
 
-	return; // NOTREACHED
+	killme();
+//	return; // NOTREACHED
 }
\ No newline at end of file