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 58473146d19c37b197f0f69e6cde0617d8ffdc92..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');
 
@@ -423,9 +427,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                                $arr['author-avatar'] = $arr['owner-avatar'] = $self[0]['thumb'];
                                $arr['verb'] = ACTIVITY_FRIEND;
                                $arr['object-type'] = ACTIVITY_OBJ_PERSON;
-                               $arr['body'] = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url] ' . t('is now friends with')
-                                       . ' [url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' . "\n\n\n" 
-                                       . ' [url=' . $contact['url'] . ']' . '[img]' . $contact['thumb'] . '[/img][/url]';
+                               
+                               $A = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url]';
+                               $B = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
+                               $BPhoto = '[url=' . $contact['url'] . ']' . '[img]' . $contact['thumb'] . '[/img][/url]';
+                               $arr['body'] =  sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
 
                                $arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $contact['name'] . '</title>'
                                        . '<id>' . $contact['url'] . '/' . $contact['name'] . '</id>';
@@ -505,7 +511,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                $local_uid = $r[0]['uid'];
 
 
-               if(! strstr($my_prvkey,'BEGIN RSA PRIVATE KEY')) {
+               if(! strstr($my_prvkey,'PRIVATE KEY')) {
                        $message = t('Our site encryption key is apparently messed up.');
                        xml_status(3,$message);
                }
@@ -526,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'];
@@ -590,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 
@@ -630,15 +646,16 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
                logger('dfrn_confirm: request: info updated');
 
-               $r = q("SELECT * FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
+               $r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
                        WHERE `contact`.`id` = %d LIMIT 1",
                        intval($dfrn_record)
                );
                if((count($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) {
 
-                       $tpl = (($new_relation == REL_BUD) 
-                               ? load_view_file('view/friend_complete_eml.tpl')
-                               : load_view_file('view/intro_complete_eml.tpl'));
+                       push_lang($r[0]['language']);
+                       $tpl = (($new_relation == CONTACT_IS_FRIEND) 
+                               ? get_intltext_template('friend_complete_eml.tpl')
+                               : get_intltext_template('intro_complete_eml.tpl'));
                
                        $email_tpl = replace_macros($tpl, array(
                                '$sitename' => $a->config['sitename'],
@@ -659,6 +676,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                        if(!$res) {
                                // pointless throwing an error here and confusing the person at the other end of the wire.
                        }
+                       pop_lang();
                }
                xml_status(0); // Success
                return; // NOTREACHED
@@ -668,7 +686,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
        // somebody arrived here by mistake or they are fishing. Send them to the homepage.
 
-       goaway($a->get_baseurl());
+       goaway(z_root());
        // NOTREACHED
 
 }