* 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;
-function dfrn_confirm_post(&$a,$handsfree = null) {
+require_once 'include/enotify.php';
+require_once 'include/group.php';
+
+function dfrn_confirm_post(App $a, $handsfree = null) {
if(is_array($handsfree)) {
* worried about key leakage than anybody cracking it.
*
*/
- require_once('include/crypto.php');
+ require_once 'include/crypto.php';
$res = new_keypair(4096);
*
*/
- $src_aes_key = random_string();
+ $src_aes_key = openssl_random_pseudo_bytes(64);
$result = '';
- openssl_private_encrypt($dfrn_id,$result,$user[0]['prvkey']);
+ openssl_private_encrypt($dfrn_id, $result, $user[0]['prvkey']);
$params['dfrn_id'] = bin2hex($result);
$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']);
*
*/
- $a->config['system']['curl_timeout'] = 120;
-
- $res = post_url($dfrn_confirm,$params);
+ $res = post_url($dfrn_confirm, $params, null, $redirects, 120);
logger(' Confirm: received data: ' . $res, LOGGER_DATA);
*
*/
- require_once('include/Photo.php');
+ require_once 'include/Photo.php';
update_contact_avatar($contact['photo'],$uid,$contact_id);
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),
);
}
- if($r === false)
- notice( t('Unable to set contact photo.') . EOL);
+ /// @TODO is dbm::is_result() working here?
+ if ($r === false) {
+ notice( t('Unable to set contact photo.') . EOL);
+ }
// reload contact info
$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
intval($contact_id)
);
- if (dbm::is_result($r))
+ if (dbm::is_result($r)) {
$contact = $r[0];
- else
+ } else {
$contact = null;
+ }
- if((isset($new_relation) && $new_relation == CONTACT_IS_FRIEND)) {
+ if ((isset($new_relation) && $new_relation == CONTACT_IS_FRIEND)) {
- if(($contact) && ($contact['network'] === NETWORK_DIASPORA)) {
- require_once('include/diaspora.php');
- $ret = diaspora::send_share($user[0],$r[0]);
+ if (($contact) && ($contact['network'] === NETWORK_DIASPORA)) {
+ require_once 'include/diaspora.php';
+ $ret = Diaspora::send_share($user[0],$r[0]);
logger('share returns: ' . $ret);
}
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)
// 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;
}
dbesc($decrypted_source_url),
intval($local_uid)
);
- if(! count($ret)) {
- if(strstr($decrypted_source_url,'http:'))
+ if (!dbm::is_result($ret)) {
+ if (strstr($decrypted_source_url,'http:')) {
$newurl = str_replace('http:','https:',$decrypted_source_url);
- else
+ } 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($ret)) {
+ if (!dbm::is_result($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);
$foreign_pubkey = $ret[0]['site-pubkey'];
$dfrn_record = $ret[0]['id'];
- if(! $foreign_pubkey) {
+ if (! $foreign_pubkey) {
$message = sprintf( t('Site public key not available in contact record for URL %s.'), $newurl);
xml_status(3,$message);
}
$decrypted_dfrn_id = "";
openssl_public_decrypt($dfrn_id,$decrypted_dfrn_id,$foreign_pubkey);
- if(strlen($aes_key)) {
+ if (strlen($aes_key)) {
$decrypted_aes_key = "";
openssl_private_decrypt($aes_key,$decrypted_aes_key,$my_prvkey);
$dfrn_pubkey = openssl_decrypt($public_key,'AES-256-CBC',$decrypted_aes_key);
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);
'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'],
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)
// somebody arrived here by mistake or they are fishing. Send them to the homepage.
- goaway(z_root());
+ goaway(System::baseUrl());
// NOTREACHED
}
projects / friendica.git / blobdiff