X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_confirm.php;h=acdf92281520281bd66be0009e89656f4e3aa26e;hb=6b0df74ed759dd793454557afe5981b66ee6918c;hp=c92e5493a1b23a7aa50e3d6ae80bae1e3222b76b;hpb=07cea24430420cb0ac2b1d8f870d7292002c7faf;p=friendica.git diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index c92e5493a1..acdf922815 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -1,8 +1,23 @@ . + * + * Friendship acceptance for DFRN contacts * * There are two possible entry points and three scenarios. * @@ -12,26 +27,25 @@ * 2. We may be the target or other side of the conversation to scenario 1, and will * interact with that process on our own user's behalf. * - * @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf + * @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/stable/spec/dfrn2.pdf * You also find a graphic which describes the confirmation process at - * https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_confirmation.png + * https://github.com/friendica/friendica/blob/stable/spec/dfrn2_contact_confirmation.png */ 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\DI; use Friendica\Model\Contact; use Friendica\Model\Group; +use Friendica\Model\Notify; +use Friendica\Model\Notify\Type; use Friendica\Model\User; -use Friendica\Network\Probe; use Friendica\Protocol\Activity; use Friendica\Util\Crypto; use Friendica\Util\DateTimeFormat; -use Friendica\Util\Network; use Friendica\Util\Strings; use Friendica\Util\XML; @@ -62,13 +76,13 @@ function dfrn_confirm_post(App $a, $handsfree = null) if (empty($_POST['source_url'])) { $uid = ($handsfree['uid'] ?? 0) ?: local_user(); if (!$uid) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.')); return; } $user = DBA::selectFirst('user', [], ['uid' => $uid]); if (!DBA::isResult($user)) { - notice(L10n::t('Profile not found.') . EOL); + notice(DI::l10n()->t('Profile not found.')); return; } @@ -123,8 +137,8 @@ function dfrn_confirm_post(App $a, $handsfree = null) ); if (!DBA::isResult($r)) { 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); + notice(DI::l10n()->t('Contact not found.')); + notice(DI::l10n()->t('This may occasionally happen if contact was requested by both persons and it has already been approved.')); return; } @@ -176,7 +190,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) $params['dfrn_id'] = bin2hex($result); $params['public_key'] = $public_key; - $my_url = System::baseUrl() . '/profile/' . $user['nickname']; + $my_url = DI::baseUrl() . '/profile/' . $user['nickname']; openssl_public_encrypt($my_url, $params['source_url'], $site_pubkey); $params['source_url'] = bin2hex($params['source_url']); @@ -200,7 +214,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) $params['page'] = 2; } - Logger::log('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params, true), Logger::DATA); + Logger::debug('Confirm: posting data', ['confirm' => $dfrn_confirm, 'parameter' => $params]); /* * @@ -210,7 +224,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) * */ - $res = Network::post($dfrn_confirm, $params, [], 120)->getBody(); + $res = DI::httpRequest()->post($dfrn_confirm, $params, [], 120)->getBody(); Logger::log(' Confirm: received data: ' . $res, Logger::DATA); @@ -225,20 +239,20 @@ function dfrn_confirm_post(App $a, $handsfree = null) // We shouldn't proceed, because the xml parser might choke, // and $status is going to be zero, which indicates success. // We can hardly call this a success. - notice(L10n::t('Response from remote site was not understood.') . EOL); + notice(DI::l10n()->t('Response from remote site was not understood.')); return; } - if (strlen($leading_junk) && Config::get('system', 'debugging')) { + if (strlen($leading_junk) && DI::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. - notice(L10n::t('Unexpected response from remote site: ') . EOL . $leading_junk . EOL); + notice(DI::l10n()->t('Unexpected response from remote site: ') . $leading_junk); } if (stristr($res, "t('Unexpected response from remote site: ') . EOL . htmlspecialchars($res)); return; } @@ -247,7 +261,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) $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); + info(DI::l10n()->t("Confirmation completed successfully.")); break; case 1: // birthday paradox - generate new dfrn-id and fall through. @@ -259,15 +273,15 @@ function dfrn_confirm_post(App $a, $handsfree = null) ); case 2: - notice(L10n::t("Temporary failure. Please wait and try again.") . EOL); + notice(DI::l10n()->t("Temporary failure. Please wait and try again.")); break; case 3: - notice(L10n::t("Introduction failed or was revoked.") . EOL); + notice(DI::l10n()->t("Introduction failed or was revoked.")); break; } if (strlen($message)) { - notice(L10n::t('Remote site reported: ') . $message . EOL); + notice(DI::l10n()->t('Remote site reported: ') . $message); } if (($status == 0) && $intro_id) { @@ -291,7 +305,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) * * We will also update the contact record with the nature and scope of the relationship. */ - Contact::updateAvatar($contact['photo'], $uid, $contact_id); + Contact::updateAvatar($contact_id, $contact['photo']); Logger::log('dfrn_confirm: confirm - imported photos'); @@ -331,7 +345,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) // Let's send our user to the contact editor in case they want to // do anything special with this new friend. if ($handsfree === null) { - $a->internalRedirect('contact/' . intval($contact_id)); + DI::baseUrl()->redirect('contact/' . intval($contact_id)); } else { return; } @@ -358,9 +372,9 @@ function dfrn_confirm_post(App $a, $handsfree = null) $forum = (($page == 1) ? 1 : 0); $prv = (($page == 2) ? 1 : 0); - Logger::log('dfrn_confirm: requestee contacted: ' . $node); + Logger::notice('requestee contacted', ['node' => $node]); - Logger::log('dfrn_confirm: request: POST=' . print_r($_POST, true), Logger::DATA); + Logger::debug('request', ['POST' => $_POST]); // If $aes_key is set, both of these items require unpacking from the hex transport encoding. @@ -372,7 +386,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) // Find our user's account $user = DBA::selectFirst('user', [], ['nickname' => $node]); if (!DBA::isResult($user)) { - $message = L10n::t('No user record found for \'%s\' ', $node); + $message = DI::l10n()->t('No user record found for \'%s\' ', $node); System::xmlExit(3, $message); // failure // NOTREACHED } @@ -382,7 +396,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) if (!strstr($my_prvkey, 'PRIVATE KEY')) { - $message = L10n::t('Our site encryption key is apparently messed up.'); + $message = DI::l10n()->t('Our site encryption key is apparently messed up.'); System::xmlExit(3, $message); } @@ -393,7 +407,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) if (!strlen($decrypted_source_url)) { - $message = L10n::t('Empty site URL was provided or URL could not be decrypted by us.'); + $message = DI::l10n()->t('Empty site URL was provided or URL could not be decrypted by us.'); System::xmlExit(3, $message); // NOTREACHED } @@ -409,7 +423,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) $contact = DBA::selectFirst('contact', [], ['url' => $newurl, 'uid' => $local_uid]); if (!DBA::isResult($contact)) { // this is either a bogus confirmation (?) or we deleted the original introduction. - $message = L10n::t('Contact record was not found for you on our site.'); + $message = DI::l10n()->t('Contact record was not found for you on our site.'); System::xmlExit(3, $message); return; // NOTREACHED } @@ -423,7 +437,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) $dfrn_record = $contact['id']; if (!$foreign_pubkey) { - $message = L10n::t('Site public key not available in contact record for URL %s.', $decrypted_source_url); + $message = DI::l10n()->t('Site public key not available in contact record for URL %s.', $decrypted_source_url); System::xmlExit(3, $message); } @@ -439,7 +453,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) } if (DBA::exists('contact', ['dfrn-id' => $decrypted_dfrn_id])) { - $message = L10n::t('The ID provided by your system is a duplicate on our system. It should work if you try again.'); + $message = DI::l10n()->t('The ID provided by your system is a duplicate on our system. It should work if you try again.'); System::xmlExit(1, $message); // Birthday paradox - duplicate dfrn-id // NOTREACHED } @@ -450,7 +464,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) intval($dfrn_record) ); if (!DBA::isResult($r)) { - $message = L10n::t('Unable to set your contact credentials on our system.'); + $message = DI::l10n()->t('Unable to set your contact credentials on our system.'); System::xmlExit(3, $message); } @@ -468,10 +482,10 @@ function dfrn_confirm_post(App $a, $handsfree = null) if (DBA::isResult($contact)) { $photo = $contact['photo']; } else { - $photo = System::baseUrl() . '/images/person-300.jpg'; + $photo = DI::baseUrl() . Contact::DEFAULT_AVATAR_PHOTO; } - Contact::updateAvatar($photo, $local_uid, $dfrn_record); + Contact::updateAvatar($dfrn_record, $photo); Logger::log('dfrn_confirm: request - photos imported'); @@ -506,7 +520,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) intval($dfrn_record) ); if (!DBA::isResult($r)) { // indicates schema is messed up or total db failure - $message = L10n::t('Unable to update your contact profile details on our system'); + $message = DI::l10n()->t('Unable to update your contact profile details on our system'); System::xmlExit(3, $message); } @@ -526,21 +540,15 @@ function dfrn_confirm_post(App $a, $handsfree = null) if (DBA::isResult($r)) { $combined = $r[0]; - if ($combined['notify-flags'] & NOTIFY_CONFIRM) { + if ($combined['notify-flags'] & Type::CONFIRM) { $mutual = ($new_relation == Contact::FRIEND); notification([ - 'type' => NOTIFY_CONFIRM, - 'notify_flags' => $combined['notify-flags'], - 'language' => $combined['language'], - 'to_name' => $combined['username'], - 'to_email' => $combined['email'], - 'uid' => $combined['uid'], - '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'], - 'verb' => ($mutual ? Activity::FRIEND : Activity::FOLLOW), - 'otype' => 'intro' + 'type' => Type::CONFIRM, + 'otype' => Notify\ObjectType::INTRO, + 'verb' => ($mutual ? Activity::FRIEND : Activity::FOLLOW), + 'uid' => $combined['uid'], + 'cid' => $combined['id'], + 'link' => DI::baseUrl() . '/contact/' . $dfrn_record, ]); } } @@ -551,6 +559,6 @@ function dfrn_confirm_post(App $a, $handsfree = null) } // somebody arrived here by mistake or they are fishing. Send them to the homepage. - $a->internalRedirect(); + DI::baseUrl()->redirect(); // NOTREACHED }