extend checkbox template for customized attributes

[friendica.git] / mod / dfrn_confirm.php

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 001fa446891b28eaf205b763d8168dff26005a1f..0e99b26c32cd9d81a7650f1d8a4c14445eb9a85c 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -18,9 +18,12 @@
  *    https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_confirmation.png
  */
 
-require_once('include/enotify.php');
-require_once('include/group.php');
-require_once('include/Probe.php');
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Network\Probe;
+
+require_once 'include/enotify.php';
+require_once 'include/group.php';
 
 function dfrn_confirm_post(App $a, $handsfree = null) {
 
@@ -152,7 +155,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
                         * worried about key leakage than anybody cracking it.
                         *
                         */
-                       require_once('include/crypto.php');
+                       require_once 'include/crypto.php';
 
                        $res = new_keypair(4096);
 
@@ -194,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']);
@@ -317,7 +320,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
                 *
                 */
 
-               require_once('include/Photo.php');
+               require_once 'include/Photo.php';
 
                update_contact_avatar($contact['photo'],$uid,$contact_id);
 
@@ -349,8 +352,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
                                dbesc(NETWORK_DFRN),
                                intval($contact_id)
                        );
-               }
-               else {
+               } else {
 
                        // $network !== NETWORK_DFRN
 
@@ -358,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'];
 
@@ -391,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,
@@ -403,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),
@@ -433,7 +435,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
                if ((isset($new_relation) && $new_relation == CONTACT_IS_FRIEND)) {
 
                        if (($contact) && ($contact['network'] === NETWORK_DIASPORA)) {
-                               require_once('include/diaspora.php');
+                               require_once 'include/diaspora.php';
                                $ret = Diaspora::send_share($user[0],$r[0]);
                                logger('share returns: ' . $ret);
                        }
@@ -446,7 +448,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 
                        if((dbm::is_result($r)) && ($r[0]['hide-friends'] == 0) && ($activity) && (! $hidden)) {
 
-                               require_once('include/items.php');
+                               require_once 'include/items.php';
 
                                $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
                                        intval($uid)
@@ -505,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;
                }
@@ -667,10 +669,10 @@ 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");
+               require_once 'include/Photo.php';
 
                update_contact_avatar($photo,$local_uid,$dfrn_record);
 
@@ -732,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'],
@@ -750,7 +752,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 
                        if((dbm::is_result($r)) && ($r[0]['hide-friends'] == 0)) {
 
-                               require_once('include/items.php');
+                               require_once 'include/items.php';
 
                                $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
                                        intval($local_uid)
@@ -807,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
 
 }