clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add diaspora support to dfrn_confirm (friendship confirmation)

This commit is contained in:
Friendika 2011-08-14 05:23:36 -07:00
parent 1b8adf0f12
commit fcf6651299
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mod/dfrn_confirm.php
View File

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