* 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\Config;
+use Friendica\Core\PConfig;
+use Friendica\Core\System;
+use Friendica\Core\Worker;
+use Friendica\Database\DBM;
+use Friendica\Network\Probe;
+use Friendica\Protocol\Diaspora;
+
+require_once 'include/enotify.php';
+require_once 'include/group.php';
function dfrn_confirm_post(App $a, $handsfree = null) {
intval($uid)
);
- if (! dbm::is_result($r)) {
+ if (! DBM::is_result($r)) {
logger('Contact not found in DB.');
notice( t('Contact not found.') . EOL );
notice( t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL );
* worried about key leakage than anybody cracking it.
*
*/
- require_once('include/crypto.php');
+ require_once 'include/crypto.php';
$res = new_keypair(4096);
$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']);
return;
}
- if(strlen($leading_junk) && get_config('system','debugging')) {
+ if(strlen($leading_junk) && Config::get('system','debugging')) {
// This might be more common. Mixed error text and some XML.
// If we're configured for debugging, show the text. Proceed in either case.
*
*/
- 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),
);
}
- /// @TODO is dbm::is_result() working here?
+ /// @TODO is DBM::is_result() working here?
if ($r === false) {
notice( t('Unable to set contact photo.') . EOL);
}
$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 {
$contact = null;
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]);
logger('share returns: ' . $ret);
}
intval($uid)
);
- if((dbm::is_result($r)) && ($r[0]['hide-friends'] == 0) && ($activity) && (! $hidden)) {
+ 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)
$i = item_store($arr);
if($i)
- proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i);
+ Worker::add(PRIORITY_HIGH, "notifier", "activity", $i);
}
}
}
// 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;
}
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
dbesc($node));
- if (! dbm::is_result($r)) {
+ if (! DBM::is_result($r)) {
$message = sprintf(t('No user record found for \'%s\' '), $node);
xml_status(3,$message); // failure
// NOTREACHED
dbesc($decrypted_source_url),
intval($local_uid)
);
- if (!dbm::is_result($ret)) {
+ if (!DBM::is_result($ret)) {
if (strstr($decrypted_source_url,'http:')) {
$newurl = str_replace('http:','https:',$decrypted_source_url);
} else {
dbesc($newurl),
intval($local_uid)
);
- if (!dbm::is_result($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);
$r = q("SELECT * FROM `contact` WHERE `dfrn-id` = '%s' LIMIT 1",
dbesc($decrypted_dfrn_id)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$message = t('The ID provided by your system is a duplicate on our system. It should work if you try again.');
xml_status(1,$message); // Birthday paradox - duplicate dfrn-id
// NOTREACHED
dbesc($dfrn_pubkey),
intval($dfrn_record)
);
- if (! dbm::is_result($r)) {
+ if (! DBM::is_result($r)) {
$message = t('Unable to set your contact credentials on our system.');
xml_status(3,$message);
}
$r = q("SELECT `photo` FROM `contact` WHERE `id` = %d LIMIT 1",
intval($dfrn_record));
- if (dbm::is_result($r)) {
+ 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);
intval($dfrn_record)
);
- if (dbm::is_result($r))
+ if (DBM::is_result($r))
$combined = $r[0];
- if((dbm::is_result($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) {
+ if((DBM::is_result($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) {
$mutual = ($new_relation == CONTACT_IS_FRIEND);
notification(array(
'type' => NOTIFY_CONFIRM,
'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'],
// Send a new friend post if we are allowed to...
- if($page && intval(get_pconfig($local_uid,'system','post_joingroup'))) {
+ if($page && intval(PConfig::get($local_uid,'system','post_joingroup'))) {
$r = q("SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
intval($local_uid)
);
- if((dbm::is_result($r)) && ($r[0]['hide-friends'] == 0)) {
+ 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)
$i = item_store($arr);
if($i)
- proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i);
+ Worker::add(PRIORITY_HIGH, "notifier", "activity", $i);
}
}
// 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