X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Flike.php;h=2876302122d78db7dbcb9df87f3ddcf75f92c215;hb=71d44d78ec5b16a53b82f4e631b86cd8247a9b0f;hp=2ee887241a5763150f7e5667994fdba137104856;hpb=db89a1eb449d60c02d727f0118919872ceee9be9;p=friendica.git
diff --git a/mod/like.php b/mod/like.php
index 2ee887241a..2876302122 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;
}
@@ -62,11 +63,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 +97,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\" &",
- array(),$foo));
+ proc_run('php',"include/notifier.php","like","$post_id");
return;
}
@@ -106,7 +105,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('' . "\n") ;
$body = $item['body'];
$obj = <<< EOT
@@ -120,10 +119,10 @@ function like_content(&$a) {
$body
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 +143,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 +162,18 @@ 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');
+ call_hooks('post_local_end', $arr);
- proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"like\" \"$post_id\" &",
- array(),$foo));
+ proc_run('php',"include/notifier.php","like","$post_id");
return; // NOTREACHED
}
\ No newline at end of file