missing salmon key? report it.

[friendica.git] / mod / dfrn_confirm.php

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 869bde3bf11928bbae7aecf2ed461da22c082f12..4dacb5d81707c9528ae6d9729be42a80dbb2b956 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -123,9 +123,12 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                $dfrn_confirm = $contact['confirm'];
                $aes_allow    = $contact['aes_allow'];
 
-               $network = ((strlen($contact['issued-id'])) ? 'dfrn' : 'stat');
+               $network = ((strlen($contact['issued-id'])) ? NETWORK_DFRN : NETWORK_OSTATUS);
 
-               if($network === 'dfrn') {
+               if($contact['network'])
+                       $network = $contact['network'];
+
+               if($network === NETWORK_DFRN) {
 
                        /**
                         *
@@ -298,13 +301,13 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                 *
                 */
 
-               require_once("Photo.php");
+               require_once('include/Photo.php');
 
                $photos = import_profile_photo($contact['photo'],$uid,$contact_id);
                
                logger('dfrn_confirm: confirm - imported photos');
 
-               if($network === 'dfrn') {
+               if($network === NETWORK_DFRN) {
 
                        $new_relation = CONTACT_IS_FOLLOWER;
                        if(($relation == CONTACT_IS_SHARING) || ($duplex))
@@ -337,21 +340,35 @@ 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'];
+
+                       // $network !== NETWORK_DFRN
+
+                       $network = (($contact['network']) ? $contact['network'] : NETWORK_OSTATUS);
+                       $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'];
+                                       }
                                }
                        }
 
+                       $new_relation = $contact['rel'];
+                       $writable = $contact['writable'];
+
+                       if($network === NETWORK_DIASPORA) {
+                               if($duplex)
+                                       $new_relation = CONTACT_IS_FRIEND;
+                               if($new_relation != CONTACT_IS_FOLLOWER)
+                                       $writable = 1;
+                       }
+
                        $r = q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                                intval($intro_id),
                                intval($uid)
@@ -368,7 +385,9 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                                `poll` = '%s',
                                `blocked` = 0, 
                                `pending` = 0,
-                               `network` = 'stat'
+                               `network` = '%s',
+                               `writable` = %d,
+                               `rel` = %d
                                WHERE `id` = %d LIMIT 1
                        ",
                                dbesc($photos[0]),
@@ -379,6 +398,9 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                                dbesc(datetime_convert()),
                                dbesc($notify),
                                dbesc($poll),
+                               dbesc($network),
+                               intval($writable),
+                               intval($new_relation),
                                intval($contact_id)
                        );                      
                }
@@ -403,6 +425,12 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                );
                if((count($r)) && ($r[0]['hide-friends'] == 0) && (is_array($contact)) &&  isset($new_relation) && ($new_relation == CONTACT_IS_FRIEND)) {
 
+                       if($r[0]['network'] === NETWORK_DIASPORA) {
+                               require_once('include/diaspora.php');
+                               $ret = diaspora_share($user[0],$r[0]);
+                               logger('mod_follow: diaspora_share returns: ' . $ret);
+                       }
+
                        require_once('include/items.php');
 
                        $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
@@ -528,12 +556,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'];
@@ -610,7 +648,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                        `blocked` = 0, 
                        `pending` = 0,
                        `duplex` = %d, 
-                       `network` = 'dfrn' WHERE `id` = %d LIMIT 1
+                       `network` = '%s' WHERE `id` = %d LIMIT 1
                ",
                        dbesc($photos[0]),
                        dbesc($photos[1]),
@@ -620,6 +658,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                        dbesc(datetime_convert()),
                        dbesc(datetime_convert()),
                        intval($duplex),
+                       dbesc(NETWORK_DFRN),
                        intval($dfrn_record)
                );
                if($r === false) {    // indicates schema is messed up or total db failure