X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fdfrn_confirm.php;h=48c8e32e5a431ff1a767c317f7cf1cc0f91b87f4;hb=5a929c587f69ba98a0f5d6f28cf3d209edc9bca0;hp=969e2286c864076a8b5770300612c6f7f3dd6857;hpb=a066befba547c5b5a56b945883eda6bf32030697;p=friendica.git diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 969e2286c8..48c8e32e5a 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -20,6 +20,7 @@ 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; @@ -32,6 +33,7 @@ use Friendica\Protocol\ActivityPub; 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'; @@ -76,14 +78,14 @@ function dfrn_confirm_post(App $a, $handsfree = null) // 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)); @@ -99,9 +101,9 @@ function dfrn_confirm_post(App $a, $handsfree = null) $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); } /* @@ -124,7 +126,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) 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; @@ -211,7 +213,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) $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); /* * @@ -223,7 +225,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) $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. @@ -248,21 +250,21 @@ function dfrn_confirm_post(App $a, $handsfree = null) if (stristr($res, "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), @@ -305,7 +307,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) */ 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; @@ -387,7 +389,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) 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); } } @@ -400,7 +402,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) { - goaway(System::baseUrl() . '/contacts/' . intval($contact_id)); + $a->internalRedirect('contact/' . intval($contact_id)); } else { return; } @@ -427,9 +429,9 @@ function dfrn_confirm_post(App $a, $handsfree = null) $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. @@ -537,12 +539,12 @@ function dfrn_confirm_post(App $a, $handsfree = null) 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; @@ -582,7 +584,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) // 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`.* @@ -604,7 +606,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) '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'], @@ -620,6 +622,6 @@ function dfrn_confirm_post(App $a, $handsfree = null) } // somebody arrived here by mistake or they are fishing. Send them to the homepage. - goaway(System::baseUrl()); + $a->internalRedirect(); // NOTREACHED }