but #118 proxy settings in admin panel

[friendica.git] / mod / dfrn_confirm.php

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 4e2a70e048f8978e94df92aa6d367ed370d2a539..bcc4e3438c6d1099ee44786fc844d6676794d5ab 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -306,11 +306,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', 
@@ -401,7 +401,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');
 
@@ -507,7 +507,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);
                }
@@ -528,12 +528,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 +602,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 
@@ -632,13 +642,14 @@ 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) 
+                       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'));
                
@@ -661,6 +672,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
@@ -670,7 +682,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
 
 }