use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\L10n;
+use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
+use Friendica\Util\Strings;
use Friendica\Util\XML;
require_once 'include/enotify.php';
* this being a page type which supports automatic friend acceptance. That is also Scenario 1
* since we are operating on behalf of our registered user to approve a friendship.
*/
- if (!x($_POST, 'source_url')) {
+ if (empty($_POST['source_url'])) {
$uid = defaults($handsfree, 'uid', local_user());
if (!$uid) {
notice(L10n::t('Permission denied.') . EOL);
// These data elements may come from either the friend request notification form or $handsfree array.
if (is_array($handsfree)) {
- logger('Confirm in handsfree mode');
+ Logger::log('Confirm in handsfree mode');
$dfrn_id = $handsfree['dfrn_id'];
$intro_id = $handsfree['intro_id'];
$duplex = $handsfree['duplex'];
$cid = 0;
$hidden = intval(defaults($handsfree, 'hidden' , 0));
} else {
- $dfrn_id = notags(trim(defaults($_POST, 'dfrn_id' , '')));
+ $dfrn_id = Strings::escapeTags(trim(defaults($_POST, 'dfrn_id' , '')));
$intro_id = intval(defaults($_POST, 'intro_id' , 0));
$duplex = intval(defaults($_POST, 'duplex' , 0));
$cid = intval(defaults($_POST, 'contact_id', 0));
$cid = 0;
}
- logger('Confirming request for dfrn_id (issued) ' . $dfrn_id);
+ Logger::log('Confirming request for dfrn_id (issued) ' . $dfrn_id);
if ($cid) {
- logger('Confirming follower with contact_id: ' . $cid);
+ Logger::log('Confirming follower with contact_id: ' . $cid);
}
/*
intval($uid)
);
if (!DBA::isResult($r)) {
- logger('Contact not found in DB.');
+ Logger::log('Contact not found in DB.');
notice(L10n::t('Contact not found.') . EOL);
notice(L10n::t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL);
return;
$params['page'] = 2;
}
- logger('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params, true), LOGGER_DATA);
+ Logger::log('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params, true), Logger::DATA);
/*
*
*
*/
- $res = Network::post($dfrn_confirm, $params, null, $redirects, 120);
+ $res = Network::post($dfrn_confirm, $params, null, $redirects, 120)->getBody();
- logger(' Confirm: received data: ' . $res, LOGGER_DATA);
+ Logger::log(' Confirm: received data: ' . $res, Logger::DATA);
// Now figure out what they responded. Try to be robust if the remote site is
// having difficulty and throwing up errors of some kind.
if (stristr($res, "<status") === false) {
// wrong xml! stop here!
- logger('Unexpected response posting to ' . $dfrn_confirm);
+ Logger::log('Unexpected response posting to ' . $dfrn_confirm);
notice(L10n::t('Unexpected response from remote site: ') . EOL . htmlspecialchars($res) . EOL);
return;
}
$xml = XML::parseString($res);
$status = (int) $xml->status;
- $message = unxmlify($xml->message); // human readable text of what may have gone wrong.
+ $message = XML::unescape($xml->message); // human readable text of what may have gone wrong.
switch ($status) {
case 0:
info(L10n::t("Confirmation completed successfully.") . EOL);
break;
case 1:
// birthday paradox - generate new dfrn-id and fall through.
- $new_dfrn_id = random_string();
+ $new_dfrn_id = Strings::getRandomHex();
q("UPDATE contact SET `issued-id` = '%s' WHERE `id` = %d AND `uid` = %d",
DBA::escape($new_dfrn_id),
intval($contact_id),
*/
Contact::updateAvatar($contact['photo'], $uid, $contact_id);
- logger('dfrn_confirm: confirm - imported photos');
+ Logger::log('dfrn_confirm: confirm - imported photos');
if ($network === Protocol::DFRN) {
$new_relation = Contact::FOLLOWER;
);
} else {
if ($network == Protocol::ACTIVITYPUB) {
- ActivityPub::transmitContactAccept($contact['url'], $contact['hub-verify'], $uid);
+ ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $uid);
$pending = true;
} else {
$pending = false;
if ((isset($new_relation) && $new_relation == Contact::FRIEND)) {
if (DBA::isResult($contact) && ($contact['network'] === Protocol::DIASPORA)) {
$ret = Diaspora::sendShare($user, $contact);
- logger('share returns: ' . $ret);
+ Logger::log('share returns: ' . $ret);
}
}
Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact['id']);
if ($network == Protocol::ACTIVITYPUB && $duplex) {
- ActivityPub::transmitActivity('Follow', $contact['url'], $uid);
+ ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid);
}
// Let's send our user to the contact editor in case they want to
// do anything special with this new friend.
if ($handsfree === null) {
- goaway(System::baseUrl() . '/contacts/' . intval($contact_id));
+ $a->internalRedirect('contact/' . intval($contact_id));
} else {
return;
}
* In the section above where the confirming party makes a POST and
* retrieves xml status information, they are communicating with the following code.
*/
- if (x($_POST, 'source_url')) {
+ if (!empty($_POST['source_url'])) {
// We are processing an external confirmation to an introduction created by our user.
$public_key = defaults($_POST, 'public_key', '');
$dfrn_id = hex2bin(defaults($_POST, 'dfrn_id' , ''));
$forum = (($page == 1) ? 1 : 0);
$prv = (($page == 2) ? 1 : 0);
- logger('dfrn_confirm: requestee contacted: ' . $node);
+ Logger::log('dfrn_confirm: requestee contacted: ' . $node);
- logger('dfrn_confirm: request: POST=' . print_r($_POST, true), LOGGER_DATA);
+ Logger::log('dfrn_confirm: request: POST=' . print_r($_POST, true), Logger::DATA);
// If $aes_key is set, both of these items require unpacking from the hex transport encoding.
- if (x($aes_key)) {
+ if (!empty($aes_key)) {
$aes_key = hex2bin($aes_key);
$public_key = hex2bin($public_key);
}
if (DBA::isResult($contact)) {
$photo = $contact['photo'];
} else {
- $photo = System::baseUrl() . '/images/person-175.jpg';
+ $photo = System::baseUrl() . '/images/person-300.jpg';
}
Contact::updateAvatar($photo, $local_uid, $dfrn_record);
- logger('dfrn_confirm: request - photos imported');
+ Logger::log('dfrn_confirm: request - photos imported');
$new_relation = Contact::SHARING;
// Otherwise everything seems to have worked and we are almost done. Yay!
// Send an email notification
- logger('dfrn_confirm: request: info updated');
+ Logger::log('dfrn_confirm: request: info updated');
$combined = null;
$r = q("SELECT `contact`.*, `user`.*
'to_name' => $combined['username'],
'to_email' => $combined['email'],
'uid' => $combined['uid'],
- 'link' => System::baseUrl() . '/contacts/' . $dfrn_record,
+ 'link' => System::baseUrl() . '/contact/' . $dfrn_record,
'source_name' => ((strlen(stripslashes($combined['name']))) ? stripslashes($combined['name']) : L10n::t('[Name Withheld]')),
'source_link' => $combined['url'],
'source_photo' => $combined['photo'],
}
// somebody arrived here by mistake or they are fishing. Send them to the homepage.
- goaway(System::baseUrl());
+ $a->internalRedirect();
// NOTREACHED
}
projects / friendica.git / blobdiff