update for ES thx Albert

[friendica.git] / mod / dfrn_confirm.php

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 897e85ecb60af2198db78cb6e66c271bbcc95536..0e99b26c32cd9d81a7650f1d8a4c14445eb9a85c 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -19,6 +19,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Network\Probe;
 
 require_once 'include/enotify.php';
@@ -196,7 +197,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
                        $params['public_key'] = $public_key;
 
 
-                       $my_url = App::get_baseurl() . '/profile/' . $user[0]['nickname'];
+                       $my_url = System::baseUrl() . '/profile/' . $user[0]['nickname'];
 
                        openssl_public_encrypt($my_url, $params['source_url'], $site_pubkey);
                        $params['source_url'] = bin2hex($params['source_url']);
@@ -351,8 +352,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
                                dbesc(NETWORK_DFRN),
                                intval($contact_id)
                        );
-               }
-               else {
+               } else {
 
                        // $network !== NETWORK_DFRN
 
@@ -360,18 +360,16 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
                        $notify = (($contact['notify']) ? $contact['notify'] : '');
                        $poll   = (($contact['poll']) ? $contact['poll'] : '');
 
-                       if((! $contact['notify']) || (! $contact['poll'])) {
-                               $arr = Probe::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'];
-                                       }
-                               }
+                       $arr = Probe::uri($contact['url']);
+                       if (empty($contact['notify'])) {
+                               $notify = $arr['notify'];
+                       }
+                       if (empty($contact['poll'])) {
+                               $poll = $arr['poll'];
                        }
 
+                       $addr = $arr['addr'];
+
                        $new_relation = $contact['rel'];
                        $writable = $contact['writable'];
 
@@ -393,6 +391,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 
                        $r = q("UPDATE `contact` SET `name-date` = '%s',
                                `uri-date` = '%s',
+                               `addr` = '%s',
                                `notify` = '%s',
                                `poll` = '%s',
                                `blocked` = 0,
@@ -405,6 +404,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
                        ",
                                dbesc(datetime_convert()),
                                dbesc(datetime_convert()),
+                               dbesc($addr),
                                dbesc($notify),
                                dbesc($poll),
                                dbesc($network),
@@ -507,7 +507,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
                // do anything special with this new friend.
 
                if ($handsfree === null) {
-                       goaway(App::get_baseurl() . '/contacts/' . intval($contact_id));
+                       goaway(System::baseUrl() . '/contacts/' . intval($contact_id));
                } else {
                        return;
                }
@@ -669,7 +669,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
                if (dbm::is_result($r)) {
                        $photo = $r[0]['photo'];
                } else {
-                       $photo = App::get_baseurl() . '/images/person-175.jpg';
+                       $photo = System::baseUrl() . '/images/person-175.jpg';
                }
 
                require_once 'include/Photo.php';
@@ -734,7 +734,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
                                'to_name'      => $r[0]['username'],
                                'to_email'     => $r[0]['email'],
                                'uid'          => $r[0]['uid'],
-                               'link'             => App::get_baseurl() . '/contacts/' . $dfrn_record,
+                               'link'             => System::baseUrl() . '/contacts/' . $dfrn_record,
                                'source_name'  => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
                                'source_link'  => $r[0]['url'],
                                'source_photo' => $r[0]['photo'],
@@ -809,7 +809,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 
        // somebody arrived here by mistake or they are fishing. Send them to the homepage.
 
-       goaway(z_root());
+       goaway(System::baseUrl());
        // NOTREACHED
 
 }