*/
use Friendica\App;
+use Friendica\Core\System;
use Friendica\Network\Probe;
require_once 'include/enotify.php';
$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']);
dbesc(NETWORK_DFRN),
intval($contact_id)
);
- }
- else {
+ } else {
// $network !== NETWORK_DFRN
$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'];
$r = q("UPDATE `contact` SET `name-date` = '%s',
`uri-date` = '%s',
+ `addr` = '%s',
`notify` = '%s',
`poll` = '%s',
`blocked` = 0,
",
dbesc(datetime_convert()),
dbesc(datetime_convert()),
+ dbesc($addr),
dbesc($notify),
dbesc($poll),
dbesc($network),
// 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;
}
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';
'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'],
// somebody arrived here by mistake or they are fishing. Send them to the homepage.
- goaway(z_root());
+ goaway(System::baseUrl());
// NOTREACHED
}