X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_notify.php;h=8a53ac09b6cac594a889a8d0c88833fe97d7c575;hb=738cb4ace6cb3dc4a78320577ffbdb3cdb773132;hp=f653faca9599ade707593cf0de2df6c287f193ff;hpb=31cbc809814a05425175d1c7ef8d43d5a6bc4a0b;p=friendica.git

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index f653faca95..8a53ac09b6 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -79,13 +79,13 @@ function dfrn_notify_post(App $a) {
 	$condition = [];
 	switch ($direction) {
 		case (-1):
-			$condition = ["`issued-id` = ? OR `dfrn-id` = ?", $dfrn_id, $dfrn_id];
+			$condition = ["(`issued-id` = ? OR `dfrn-id` = ?) AND `uid` = ?", $dfrn_id, $dfrn_id, $user['uid']];
 			break;
 		case 0:
-			$condition = ['issued-id' => $dfrn_id, 'duplex' => true];
+			$condition = ['issued-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']];
 			break;
 		case 1:
-			$condition = ['dfrn-id' => $dfrn_id, 'duplex' => true];
+			$condition = ['dfrn-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']];
 			break;
 		default:
 			System::xmlExit(3, 'Invalid direction');
@@ -182,7 +182,7 @@ function dfrn_notify_post(App $a) {
 
 function dfrn_dispatch_public($postdata)
 {
-	$msg = Diaspora::decodeRaw([], $postdata);
+	$msg = Diaspora::decodeRaw([], $postdata, true);
 	if (!$msg) {
 		// We have to fail silently to be able to hand it over to the salmon parser
 		return false;
@@ -287,15 +287,15 @@ function dfrn_notify_content(App $a) {
 		$condition = [];
 		switch ($direction) {
 			case (-1):
-				$condition = ["`issued-id` = ? OR `dfrn-id` = ?", $dfrn_id, $dfrn_id];
+				$condition = ["(`issued-id` = ? OR `dfrn-id` = ?) AND `uid` = ?", $dfrn_id, $dfrn_id, $user['uid']];
 				$my_id = $dfrn_id;
 				break;
 			case 0:
-				$condition = ['issued-id' => $dfrn_id, 'duplex' => true];
+				$condition = ['issued-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']];
 				$my_id = '1:' . $dfrn_id;
 				break;
 			case 1:
-				$condition = ['dfrn-id' => $dfrn_id, 'duplex' => true];
+				$condition = ['dfrn-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']];
 				$my_id = '0:' . $dfrn_id;
 				break;
 			default: