X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Flike.php;h=3e3d695292b874c4d7e2a3e0472fc7ce035cceba;hb=a41b4c6e6726b1158a8d05f37c1630d67e462fe5;hp=d52b3a324300e5056770abb55b329bd9e5d9a357;hpb=a50947a4bc3f779df8fa4e6777bc025fcefc8d21;p=friendica.git

diff --git a/mod/like.php b/mod/like.php
index d52b3a3243..3e3d695292 100644
--- a/mod/like.php
+++ b/mod/like.php
@@ -16,6 +16,7 @@ function like_content(&$a) {
 	if(! $verb)
 		$verb = 'like';
 
+
 	switch($verb) {
 		case 'like':
 			$activity = ACTIVITY_LIKE;
@@ -37,12 +38,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;
 	}
 
@@ -62,11 +67,12 @@ function like_content(&$a) {
 		$owner = $r[0];
 
 	if(! $owner) {
+		logger('like: no owner');
 		return;
 	}
 
 
-	if((local_user()) && (get_uid() == $owner_uid)) {
+	if((local_user()) && (local_user() == $owner_uid)) {
 		$contact = $owner;
 	}
 	else {
@@ -95,10 +101,7 @@ function like_content(&$a) {
 			intval($r[0]['id'])
 		);
 
-		$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-
-		proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"like\" \"$post_id\" > notify.out &",
-			array(),$foo));
+		proc_run('php',"include/notifier.php","like","$post_id");
 		return;
 	}
 
@@ -106,7 +109,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
@@ -120,10 +123,10 @@ function like_content(&$a) {
 		<content>$body</content>
 	</object>
 EOT;
-	if($verb == 'like')
-		$bodyverb = t('likes');
-	if($verb == 'dislike')
-		$bodyverb = t('doesn\'t like');
+	if($verb === 'like')
+		$bodyverb = t('%1$s likes %2$s\'s %3$s');
+	if($verb === 'dislike')
+		$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
 
 	if(! isset($bodyverb))
 			return; 
@@ -144,9 +147,11 @@ EOT;
 	$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;
@@ -161,11 +166,14 @@ 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)
+		);
+	}			
 
-	$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-
-	proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"like\" \"$post_id\" > notify.out &",
-		array(),$foo));
+	proc_run('php',"include/notifier.php","like","$post_id");
 
 	return; // NOTREACHED
 }
\ No newline at end of file