X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fdfrn_request.php;h=e8bc5092625a9033c62afd2afd965bc96c961ac8;hb=abd7b2666c1ba79d44db0e71b369433cf8c8e678;hp=158794791825718a2b2b4f8db0ed7a139d0cc8b5;hpb=f0725ae3845ea133a145a3fcc2599fa21c888bae;p=friendica.git diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 1587947918..e8bc509262 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -11,6 +11,7 @@ * You also find a graphic which describes the confirmation process at * https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_request.png */ + use Friendica\App; use Friendica\Core\Config; use Friendica\Core\L10n; @@ -19,10 +20,12 @@ use Friendica\Core\System; use Friendica\Database\DBM; use Friendica\Model\Contact; use Friendica\Model\Group; -use Friendica\Model\User; use Friendica\Model\Profile; +use Friendica\Model\User; use Friendica\Module\Login; use Friendica\Network\Probe; +use Friendica\Util\DateTimeFormat; +use Friendica\Util\Network; require_once 'include/enotify.php'; @@ -117,7 +120,7 @@ function dfrn_request_post(App $a) } $invalid = Probe::validDfrn($parms); if ($invalid) { - notice(sprintf(L10n::tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid), $invalid) . EOL); + notice(L10n::tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid) . EOL); return; } } @@ -134,7 +137,7 @@ function dfrn_request_post(App $a) `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`, `blocked`, `pending`) VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d)", intval(local_user()), - datetime_convert(), + DateTimeFormat::utcNow(), dbesc($dfrn_url), dbesc(normalise_link($dfrn_url)), $parms['addr'], @@ -165,7 +168,7 @@ function dfrn_request_post(App $a) $parms['key'] // this was already escaped ); if (DBM::is_result($r)) { - Group::addMember(User::getDefaultGroup($uid, $r[0]["network"]), $r[0]['id']); + Group::addMember(User::getDefaultGroup(local_user(), $r[0]["network"]), $r[0]['id']); if (isset($photo)) { Contact::updateAvatar($photo, local_user(), $r[0]["id"], true); @@ -182,7 +185,7 @@ function dfrn_request_post(App $a) } if (strlen($dfrn_request) && strlen($confirm_key)) { - $s = fetch_url($dfrn_request . '?confirm_key=' . $confirm_key); + $s = Network::fetchUrl($dfrn_request . '?confirm_key=' . $confirm_key); } // (ignore reply, nothing we can do it failed) @@ -238,11 +241,11 @@ function dfrn_request_post(App $a) // Block friend request spam if ($maxreq) { $r = q("SELECT * FROM `intro` WHERE `datetime` > '%s' AND `uid` = %d", - dbesc(datetime_convert('UTC', 'UTC', 'now - 24 hours')), + dbesc(DateTimeFormat::utc('now - 24 hours')), intval($uid) ); if (DBM::is_result($r) && count($r) > $maxreq) { - notice(sprintf(L10n::t('%s has received too many connection requests today.'), $a->profile['name']) . EOL); + notice(L10n::t('%s has received too many connection requests today.', $a->profile['name']) . EOL); notice(L10n::t('Spam protection measures have been invoked.') . EOL); notice(L10n::t('Friends are advised to please try again in 24 hours.') . EOL); return; @@ -313,7 +316,7 @@ function dfrn_request_post(App $a) notice(L10n::t('You have already introduced yourself here.') . EOL); return; } elseif ($ret[0]['rel'] == CONTACT_IS_FRIEND) { - notice(sprintf(L10n::t('Apparently you are already friends with %s.'), $a->profile['name']) . EOL); + notice(L10n::t('Apparently you are already friends with %s.', $a->profile['name']) . EOL); return; } else { $contact_record = $ret[0]; @@ -331,20 +334,20 @@ function dfrn_request_post(App $a) intval($contact_record['id']) ); } else { - $url = validate_url($url); + $url = Network::isUrlValid($url); if (!$url) { notice(L10n::t('Invalid profile URL.') . EOL); goaway(System::baseUrl() . '/' . $a->cmd); return; // NOTREACHED } - if (!allowed_url($url)) { + if (!Network::isUrlAllowed($url)) { notice(L10n::t('Disallowed profile URL.') . EOL); goaway(System::baseUrl() . '/' . $a->cmd); return; // NOTREACHED } - if (blocked_url($url)) { + if (Network::isUrlBlocked($url)) { notice(L10n::t('Blocked domain') . EOL); goaway(System::baseUrl() . '/' . $a->cmd); return; // NOTREACHED @@ -364,7 +367,7 @@ function dfrn_request_post(App $a) } $invalid = Probe::validDfrn($parms); if ($invalid) { - notice(sprintf(L10n::tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid), $invalid) . EOL); + notice(L10n::tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid) . EOL); return; } @@ -379,7 +382,7 @@ function dfrn_request_post(App $a) `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `blocked`, `pending` ) VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )", intval($uid), - dbesc(datetime_convert()), + dbesc(DateTimeFormat::utcNow()), $parms['url'], dbesc(normalise_link($url)), $parms['addr'], @@ -427,7 +430,7 @@ function dfrn_request_post(App $a) ((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0), dbesc(notags(trim($_POST['dfrn-request-message']))), dbesc($hash), - dbesc(datetime_convert()) + dbesc(DateTimeFormat::utcNow()) ); } @@ -524,8 +527,8 @@ function dfrn_request_content(App $a) '$hidethem' => L10n::t('Hide this contact'), '$hidechecked' => '', '$confirm_key' => $confirm_key, - '$welcome' => sprintf(L10n::t('Welcome home %s.'), $a->user['username']), - '$please' => sprintf(L10n::t('Please confirm your introduction/connection request to %s.'), $dfrn_url), + '$welcome' => L10n::t('Welcome home %s.', $a->user['username']), + '$please' => L10n::t('Please confirm your introduction/connection request to %s.', $dfrn_url), '$submit' => L10n::t('Confirm'), '$uid' => $_SESSION['uid'], '$nickname' => $a->user['nickname'], @@ -639,7 +642,7 @@ function dfrn_request_content(App $a) $page_desc = L10n::t("Please enter your 'Identity Address' from one of the following supported communications networks:"); $invite_desc = sprintf( - t('If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today.'), + L10n::t('If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today.'), get_server() . '/servers' ); @@ -647,13 +650,13 @@ function dfrn_request_content(App $a) '$header' => L10n::t('Friend/Connection Request'), '$desc' => L10n::t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de'), '$pls_answer' => L10n::t('Please answer the following:'), - '$does_know_you' => ['knowyou', sprintf(L10n::t('Does %s know you?'), $a->profile['name']), false, '', [L10n::t('No'), L10n::t('Yes')]], + '$does_know_you' => ['knowyou', L10n::t('Does %s know you?', $a->profile['name']), false, '', [L10n::t('No'), L10n::t('Yes')]], '$add_note' => L10n::t('Add a personal note:'), '$page_desc' => $page_desc, '$friendica' => L10n::t('Friendica'), - '$statusnet' => L10n::t('GNU Social (Pleroma, Mastodon)'), - '$diaspora' => L10n::t('Diaspora (Socialhome, Hubzilla)'), - '$diasnote' => sprintf(L10n::t(' - please do not use this form. Instead, enter %s into your Diaspora search bar.'), $target_addr), + '$statusnet' => L10n::t("GNU Social \x28Pleroma, Mastodon\x29"), + '$diaspora' => L10n::t("Diaspora \x28Socialhome, Hubzilla\x29"), + '$diasnote' => L10n::t(' - please do not use this form. Instead, enter %s into your Diaspora search bar.', $target_addr), '$your_address' => L10n::t('Your Identity Address:'), '$invite_desc' => $invite_desc, '$submit' => L10n::t('Submit Request'),