add diaspora support to dfrn_confirm (friendship confirmation)

[friendica.git] / mod / dfrn_confirm.php

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 91333284b724cc0ce370e442d1f048f6af75629c..f0c86910bd731a0e4ab218fec9c2d6bce41ab1f0 100644 (file)
--- 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') {
 
@@ -306,11 +308,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
                if($network === 'dfrn') {
 
-                       $new_relation = REL_VIP;
-                       if(($relation == REL_FAN) || ($duplex))
-                               $new_relation = REL_BUD;
+                       $new_relation = CONTACT_IS_FOLLOWER;
+                       if(($relation == CONTACT_IS_SHARING) || ($duplex))
+                               $new_relation = CONTACT_IS_FRIEND;
 
-                       if(($relation == REL_FAN) && ($duplex))
+                       if(($relation == CONTACT_IS_SHARING) && ($duplex))
                                $duplex = 0;
 
                        $r = q("UPDATE `contact` SET `photo` = '%s', 
@@ -339,16 +341,18 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                else {  
                        // $network !== 'dfrn'
 
-                       $notify = '';
-                       $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'];
+                       $notify = (($contact['notify']) ? $contact['notify'] : '');
+                       $poll   = (($contact['poll']) ? $contact['poll'] : '');
+
+                       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'];
+                                       }
                                }
                        }
 
@@ -401,7 +405,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                $r = q("SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
                        intval($uid)
                );
-               if((count($r)) && ($r[0]['hide-friends'] == 0) && (is_array($contact)) &&  isset($new_relation) && ($new_relation == REL_BUD)) {
+               if((count($r)) && ($r[0]['hide-friends'] == 0) && (is_array($contact)) &&  isset($new_relation) && ($new_relation == CONTACT_IS_FRIEND)) {
 
                        require_once('include/items.php');
 
@@ -528,12 +532,22 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                        dbesc($decrypted_source_url),
                        intval($local_uid)
                );
-
                if(! count($ret)) {
-                       // this is either a bogus confirmation (?) or we deleted the original introduction.
-                       $message = t('Contact record was not found for you on our site.');
-                       xml_status(3,$message);
-                       return; // NOTREACHED 
+                       if(strstr($decrypted_source_url,'http:'))
+                               $newurl = str_replace('http:','https:',$decrypted_source_url);
+                       else
+                               $newurl = str_replace('https:','http:',$decrypted_source_url);
+
+                       $ret = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
+                               dbesc($newurl),
+                               intval($local_uid)
+                       );
+                       if(! count($r)) {
+                               // this is either a bogus confirmation (?) or we deleted the original introduction.
+                               $message = t('Contact record was not found for you on our site.');
+                               xml_status(3,$message);
+                               return; // NOTREACHED 
+                       }
                }
 
                $relation = $ret[0]['rel'];
@@ -592,11 +606,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
                logger('dfrn_confirm: request - photos imported');
 
-               $new_relation = REL_FAN;
-               if(($relation == REL_VIP) || ($duplex))
-                       $new_relation = REL_BUD;
+               $new_relation = CONTACT_IS_SHARING;
+               if(($relation == CONTACT_IS_FOLLOWER) || ($duplex))
+                       $new_relation = CONTACT_IS_FRIEND;
 
-               if(($relation == REL_VIP) && ($duplex))
+               if(($relation == CONTACT_IS_FOLLOWER) && ($duplex))
                        $duplex = 0;
 
                $r = q("UPDATE `contact` SET 
@@ -639,7 +653,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                if((count($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) {
 
                        push_lang($r[0]['language']);
-                       $tpl = (($new_relation == REL_BUD) 
+                       $tpl = (($new_relation == CONTACT_IS_FRIEND) 
                                ? get_intltext_template('friend_complete_eml.tpl')
                                : get_intltext_template('intro_complete_eml.tpl'));