From: Zach Prezkuta <fermion@gmx.com>
Date: Sat, 29 Sep 2012 23:48:56 +0000 (-0600)
Subject: look for DFRN contacts as well
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=59ace4f4d7413f76c59e57e88047f6c8e3580c82;p=friendica.git

look for DFRN contacts as well
---

diff --git a/include/diaspora.php b/include/diaspora.php
index 497bc7f39f..c5b724509c 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -141,6 +141,17 @@ function diaspora_get_contact_by_handle($uid,$handle) {
 	);
 	if($r && count($r))
 		return $r[0];
+
+	$handle_parts = explode("@", $handle);
+	$nurl_sql = '%%://' . $handle_parts[1] . '%%/profile/' . $handle_parts[0];
+	$r = q("SELECT * FROM contact WHERE network = '%s' AND uid = %d AND nurl LIKE '%s' LIMIT 1",
+	       dbesc(NETWORK_DFRN),
+	       intval($uid),
+	       dbesc($nurl_sql)
+	);
+	if($r && count($r))
+		return $r[0];
+
 	return false;
 }
 
@@ -1949,7 +1960,7 @@ function diaspora_signed_retraction($importer,$xml,$msg) {
 
 	$contact = diaspora_get_contact_by_handle($importer['uid'],$diaspora_handle);
 	if(! $contact) {
-		logger('diaspora_signed_retraction: no contact');
+		logger('diaspora_signed_retraction: no contact ' . $diaspora_handle . ' for ' . $importer['uid']);
 		return;
 	}