X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Flike.php;h=bbb07289659257b4efdbda20fc294139509427d6;hb=5f89cb09234bc79aab2be93778609b344239c3da;hp=1176c31101000390043e8da0e441bfede9d1c3cf;hpb=0f0fb2e2f3b9819e4f1b65c3ea1b96e78c008381;p=friendica.git

diff --git a/mod/like.php b/mod/like.php
index 1176c31101..bbb0728965 100755
--- a/mod/like.php
+++ b/mod/like.php
@@ -105,18 +105,22 @@ function like_content(&$a) {
 	}
 
 
-	$r = q("SELECT * FROM `item` WHERE `verb` = '%s' AND `deleted` = 0 
-		AND `contact-id` = %d AND ( `parent` = '%s' OR `parent-uri` = '%s') LIMIT 1",
-		dbesc($activity),
-		intval($contact['id']),
-		dbesc($item_id),
-		dbesc($item_id)
+	// See if we've been passed a return path to redirect to
+	$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
+
+
+	$r = q("SELECT `id`, `guid` FROM `item` WHERE `verb` = '%s' AND `deleted` = 0
+		AND `contact-id` = %d AND `uid` = %d
+		AND (`parent` = '%s' OR `parent-uri` = '%s' OR `thr-parent` = '%s') LIMIT 1",
+		dbesc($activity), intval($contact['id']), intval($owner_uid),
+		dbesc($item_id), dbesc($item_id), dbesc($item['uri'])
 	);
+
 	if(count($r)) {
 		$like_item = $r[0];
 
 		// Already voted, undo it
-		$r = q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1",
+		$r = q("UPDATE `item` SET `deleted` = 1, `unseen` = 1, `changed` = '%s' WHERE `id` = %d",
 			dbesc(datetime_convert()),
 			intval($like_item['id'])
 		);
@@ -132,17 +136,18 @@ function like_content(&$a) {
 		// Save the author information for the unlike in case we need to relay to Diaspora
 		store_diaspora_like_retract_sig($activity, $item, $like_item, $contact);
 
-
 //		proc_run('php',"include/notifier.php","like","$post_id"); // $post_id isn't defined here!
 		$like_item_id = $like_item['id'];
 		proc_run('php',"include/notifier.php","like","$like_item_id");
-		return;
+
+		like_content_return($a->get_baseurl(), $return_path);
+		return; // NOTREACHED
 	}
 
 	$uri = item_new_uri($a->get_hostname(),$owner_uid);
 
 	$post_type = (($item['resource-id']) ? t('photo') : t('status'));
-	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); 
+	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
 	$link = xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
 	$body = $item['body'];
 
@@ -200,31 +205,48 @@ EOT;
 	$arr['unseen'] = 1;
 	$arr['last-child'] = 0;
 
-	$post_id = item_store($arr);	
+	$post_id = item_store($arr);
 
 	if(! $item['visible']) {
-		$r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d LIMIT 1",
+		$r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d",
 			intval($item['id']),
 			intval($owner_uid)
 		);
-	}			
+	}
 
 
 	// Save the author information for the like in case we need to relay to Diaspora
 	store_diaspora_like_sig($activity, $post_type, $contact, $post_id);
 
-
 	$arr['id'] = $post_id;
 
 	call_hooks('post_local_end', $arr);
 
 	proc_run('php',"include/notifier.php","like","$post_id");
 
-	killme();
+	like_content_return($a->get_baseurl(), $return_path);
+	killme(); // NOTREACHED
 //	return; // NOTREACHED
 }
 
 
+// Decide how to return. If we were called with a 'return' argument,
+// then redirect back to the calling page. If not, just quietly end
+
+function like_content_return($baseurl, $return_path) {
+
+	if($return_path) {
+		$rand = '_=' . time();
+		if(strpos($return_path, '?')) $rand = "&$rand";
+		else $rand = "?$rand";
+
+		goaway($baseurl . "/" . $return_path . $rand);
+	}
+
+	killme();
+}
+
+
 function store_diaspora_like_retract_sig($activity, $item, $like_item, $contact) {
 	// Note that we can only create a signature for a user of the local server. We don't have
 	// a key for remote users. That is ok, because if a remote user is "unlike"ing a post, it 
@@ -245,9 +267,6 @@ function store_diaspora_like_retract_sig($activity, $item, $like_item, $contact)
 	if(($activity === ACTIVITY_LIKE) && (! $item['resource-id'])) {
 		$signed_text = $like_item['guid'] . ';' . 'Like';
 
-//		if( $contact['network'] === NETWORK_DIASPORA)
-//			$diaspora_handle = $contact['addr'];
-//		else {
 		// Only works for NETWORK_DFRN
 		$contact_baseurl_start = strpos($contact['url'],'://') + 3;
 		$contact_baseurl_length = strpos($contact['url'],'/profile') - $contact_baseurl_start;
@@ -268,7 +287,6 @@ function store_diaspora_like_retract_sig($activity, $item, $like_item, $contact)
 			if( $r)
 				$authorsig = base64_encode(rsa_sign($signed_text,$r['prvkey'],'sha256'));
 		}
-//		}
 
 		if(! isset($authorsig))
 			$authorsig = '';
@@ -299,9 +317,6 @@ function store_diaspora_like_sig($activity, $post_type, $contact, $post_id) {
 	logger('mod_like: storing diaspora like signature');
 
 	if(($activity === ACTIVITY_LIKE) && ($post_type === t('status'))) {
-//		if( $contact['network'] === NETWORK_DIASPORA)
-//			$diaspora_handle = $contact['addr'];
-//		else {
 		// Only works for NETWORK_DFRN
 		$contact_baseurl_start = strpos($contact['url'],'://') + 3;
 		$contact_baseurl_length = strpos($contact['url'],'/profile') - $contact_baseurl_start;
@@ -322,7 +337,6 @@ function store_diaspora_like_sig($activity, $post_type, $contact, $post_id) {
 			if( $r)
 				$contact_uprvkey = $r['prvkey'];
 		}
-//		}
 
 		$r = q("SELECT guid, parent FROM `item` WHERE id = %d LIMIT 1",
 			intval($post_id)