X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_notify.php;h=bfbf4c657a449aec03ab3087ebe0e9a33bea767f;hb=39767fb366a7b4d8bdf79028009790040f80f3a0;hp=27e8ed63f8f0b2ff2449edd564d95701b821b3ea;hpb=c66c09d5fd86e74ac6f1b877143e8cf55e3a0340;p=friendica.git

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 27e8ed63f8..bfbf4c657a 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -198,9 +198,6 @@ function dfrn_notify_post(App $a) {
 
 function dfrn_dispatch_public($postdata)
 {
-	/// @todo Currently disabled, until there is a working item distribution for public posts
-	return false;
-
 	$msg = Diaspora::decodeRaw([], $postdata);
 	if (!$msg) {
 		// We have to fail silently to be able to hand it over to the salmon parser
@@ -211,7 +208,7 @@ function dfrn_dispatch_public($postdata)
 	$contact = Contact::getDetailsByAddr($msg['author'], 0);
 	if (!$contact) {
 		logger('Contact not found for address ' . $msg['author']);
-		System::xmlExit(3, 'Contact not found');
+		System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
 	}
 
 	// We now have some contact, so we fetch it
@@ -225,7 +222,7 @@ function dfrn_dispatch_public($postdata)
 	// This should never fail
 	if (!DBM::is_result($importer)) {
 		logger('Contact not found for address ' . $msg['author']);
-		System::xmlExit(3, 'Contact not found');
+		System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
 	}
 
 	logger('Importing post from ' . $msg['author'] . ' with the public envelope.', LOGGER_DEBUG);
@@ -249,7 +246,7 @@ function dfrn_dispatch_private($user, $postdata)
 		$cid = Contact::getIdForURL($msg['author']);
 		if (!$cid) {
 			logger('Contact not found for address ' . $msg['author']);
-			System::xmlExit(3, 'Contact not found');
+			System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
 		}
 	}
 
@@ -262,12 +259,14 @@ function dfrn_dispatch_private($user, $postdata)
 	// This should never fail
 	if (!DBM::is_result($importer)) {
 		logger('Contact not found for address ' . $msg['author']);
-		System::xmlExit(3, 'Contact not found');
+		System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
 	}
 
 	// Set the user id. This is important if this is a public contact
 	$importer['importer_uid']  = $user['uid'];
 
+	$importer = array_merge($importer, $user);
+
 	logger('Importing post from ' . $msg['author'] . ' to ' . $user['nickname'] . ' with the private envelope.', LOGGER_DEBUG);
 
 	// Now we should be able to import it
@@ -336,7 +335,8 @@ function dfrn_notify_content(App $a) {
 		);
 
 		if (!DBM::is_result($r)) {
-			$status = 1;
+			logger('No user data found for ' . $a->argv[1] . ' - SQL: ' . $sql_extra);
+			killme();
 		}
 
 		logger("Remote rino version: ".$rino_remote." for ".$r[0]["url"], LOGGER_DATA);