From fcf6651299418f834076649f1fad4833476aad76 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 14 Aug 2011 05:23:36 -0700
Subject: [PATCH] add diaspora support to dfrn_confirm (friendship
 confirmation)

---
 mod/dfrn_confirm.php | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index bcc4e3438..f0c86910b 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -124,6 +124,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 		$aes_allow    = $contact['aes_allow'];
 
 		$network = ((strlen($contact['issued-id'])) ? 'dfrn' : 'stat');
+		if($contact['network'])
+			$network = $contact['network'];
 
 		if($network === 'dfrn') {
 
@@ -339,16 +341,18 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 		else {  
 			// $network !== 'dfrn'
 
-			$notify = '';
-			$poll   = '';
+			$notify = (($contact['notify']) ? $contact['notify'] : '');
+			$poll   = (($contact['poll']) ? $contact['poll'] : '');
 
-			$arr = lrdd($contact['url']);
-			if(count($arr)) {
-				foreach($arr as $link) {
-					if($link['@attributes']['rel'] === 'salmon')
-						$notify = $link['@attributes']['href'];
-					if($link['@attributes']['rel'] === NAMESPACE_FEED)
-						$poll = $link['@attributes']['href'];
+			if((! $contact['notify']) || (! $contact['poll'])) {
+				$arr = lrdd($contact['url']);
+				if(count($arr)) {
+					foreach($arr as $link) {
+						if($link['@attributes']['rel'] === 'salmon')
+							$notify = $link['@attributes']['href'];
+						if($link['@attributes']['rel'] === NAMESPACE_FEED)
+							$poll = $link['@attributes']['href'];
+					}
 				}
 			}