X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_request.php;h=e29109160ac84363e4a4f8e51f286191051c6275;hb=ed9392469e7327639cc2d21870ad0ccacb3cda4d;hp=3f900cc6313269a171d1ec2e12fd36c71c35e4d0;hpb=48baa0be4b662b7c3d2afebad3b78324677fec14;p=friendica.git diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 3f900cc631..e29109160a 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -2,7 +2,7 @@ /** * @file mod/dfrn_request.php - * @brief Module: dfrn_request + * Module: dfrn_request * * Purpose: Handles communication associated with the issuance of * friend requests. @@ -13,8 +13,6 @@ */ use Friendica\App; -use Friendica\Core\Config; -use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\Renderer; @@ -99,7 +97,7 @@ function dfrn_request_post(App $a) if (DBA::isResult($r)) { if (strlen($r[0]['dfrn-id'])) { // We don't need to be here. It has already happened. - notice(L10n::t("This introduction has already been accepted.") . EOL); + notice(DI::l10n()->t("This introduction has already been accepted.") . EOL); return; } else { $contact_record = $r[0]; @@ -117,18 +115,18 @@ function dfrn_request_post(App $a) $parms = Probe::profile($dfrn_url); if (!count($parms)) { - notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL); + notice(DI::l10n()->t('Profile location is not valid or does not contain profile information.') . EOL); return; } else { if (empty($parms['fn'])) { - notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL); + notice(DI::l10n()->t('Warning: profile location has no identifiable owner name.') . EOL); } if (empty($parms['photo'])) { - notice(L10n::t('Warning: profile location has no profile photo.') . EOL); + notice(DI::l10n()->t('Warning: profile location has no profile photo.') . EOL); } $invalid = Probe::validDfrn($parms); if ($invalid) { - 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); + notice(DI::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; } } @@ -166,7 +164,7 @@ function dfrn_request_post(App $a) } if ($r) { - info(L10n::t("Introduction complete.") . EOL); + info(DI::l10n()->t("Introduction complete.") . EOL); } $r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `site-pubkey` = '%s' LIMIT 1", @@ -202,7 +200,7 @@ function dfrn_request_post(App $a) } // invalid/bogus request - notice(L10n::t('Unrecoverable protocol error.') . EOL); + notice(DI::l10n()->t('Unrecoverable protocol error.') . EOL); DI::baseUrl()->redirect(); return; // NOTREACHED } @@ -229,7 +227,7 @@ function dfrn_request_post(App $a) * */ if (!(is_array($a->profile) && count($a->profile))) { - notice(L10n::t('Profile unavailable.') . EOL); + notice(DI::l10n()->t('Profile unavailable.') . EOL); return; } @@ -250,9 +248,9 @@ function dfrn_request_post(App $a) intval($uid) ); if (DBA::isResult($r) && count($r) > $maxreq) { - 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); + notice(DI::l10n()->t('%s has received too many connection requests today.', $a->profile['name']) . EOL); + notice(DI::l10n()->t('Spam protection measures have been invoked.') . EOL); + notice(DI::l10n()->t('Friends are advised to please try again in 24 hours.') . EOL); return; } } @@ -276,7 +274,7 @@ function dfrn_request_post(App $a) $url = trim($_POST['dfrn_url']); if (!strlen($url)) { - notice(L10n::t("Invalid locator") . EOL); + notice(DI::l10n()->t("Invalid locator") . EOL); return; } @@ -312,10 +310,10 @@ function dfrn_request_post(App $a) if (DBA::isResult($ret)) { if (strlen($ret[0]['issued-id'])) { - notice(L10n::t('You have already introduced yourself here.') . EOL); + notice(DI::l10n()->t('You have already introduced yourself here.') . EOL); return; } elseif ($ret[0]['rel'] == Contact::FRIEND) { - notice(L10n::t('Apparently you are already friends with %s.', $a->profile['name']) . EOL); + notice(DI::l10n()->t('Apparently you are already friends with %s.', $a->profile['name']) . EOL); return; } else { $contact_record = $ret[0]; @@ -335,19 +333,19 @@ function dfrn_request_post(App $a) } else { $url = Network::isUrlValid($url); if (!$url) { - notice(L10n::t('Invalid profile URL.') . EOL); + notice(DI::l10n()->t('Invalid profile URL.') . EOL); DI::baseUrl()->redirect(DI::args()->getCommand()); return; // NOTREACHED } if (!Network::isUrlAllowed($url)) { - notice(L10n::t('Disallowed profile URL.') . EOL); + notice(DI::l10n()->t('Disallowed profile URL.') . EOL); DI::baseUrl()->redirect(DI::args()->getCommand()); return; // NOTREACHED } if (Network::isUrlBlocked($url)) { - notice(L10n::t('Blocked domain') . EOL); + notice(DI::l10n()->t('Blocked domain') . EOL); DI::baseUrl()->redirect(DI::args()->getCommand()); return; // NOTREACHED } @@ -355,18 +353,18 @@ function dfrn_request_post(App $a) $parms = Probe::profile(($hcard) ? $hcard : $url); if (!count($parms)) { - notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL); + notice(DI::l10n()->t('Profile location is not valid or does not contain profile information.') . EOL); DI::baseUrl()->redirect(DI::args()->getCommand()); } else { if (empty($parms['fn'])) { - notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL); + notice(DI::l10n()->t('Warning: profile location has no identifiable owner name.') . EOL); } if (empty($parms['photo'])) { - notice(L10n::t('Warning: profile location has no profile photo.') . EOL); + notice(DI::l10n()->t('Warning: profile location has no profile photo.') . EOL); } $invalid = Probe::validDfrn($parms); if ($invalid) { - 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); + notice(DI::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; } @@ -414,7 +412,7 @@ function dfrn_request_post(App $a) } } if ($r === false) { - notice(L10n::t('Failed to update contact record.') . EOL); + notice(DI::l10n()->t('Failed to update contact record.') . EOL); return; } @@ -434,7 +432,7 @@ function dfrn_request_post(App $a) // This notice will only be seen by the requestor if the requestor and requestee are on the same server. if (!$failed) { - info(L10n::t('Your introduction has been sent.') . EOL); + info(DI::l10n()->t('Your introduction has been sent.') . EOL); } // "Homecoming" - send the requestor back to their site to record the introduction. @@ -472,7 +470,7 @@ function dfrn_request_post(App $a) // NOTREACHED // END $network != Protocol::PHANTOM } else { - notice(L10n::t("Remote subscription can't be done for your network. Please subscribe directly on your system.") . EOL); + notice(DI::l10n()->t("Remote subscription can't be done for your network. Please subscribe directly on your system.") . EOL); return; } } return; @@ -488,7 +486,7 @@ function dfrn_request_content(App $a) // to send us to the post section to record the introduction. if (!empty($_GET['dfrn_url'])) { if (!local_user()) { - info(L10n::t("Please login to confirm introduction.") . EOL); + info(DI::l10n()->t("Please login to confirm introduction.") . EOL); /* setup the return URL to come back to this page if they use openid */ return Login::form(); } @@ -496,7 +494,7 @@ function dfrn_request_content(App $a) // Edge case, but can easily happen in the wild. This person is authenticated, // but not as the person who needs to deal with this request. if ($a->user['nickname'] != $a->argv[1]) { - notice(L10n::t("Incorrect identity currently logged in. Please login to this profile.") . EOL); + notice(DI::l10n()->t("Incorrect identity currently logged in. Please login to this profile.") . EOL); return Login::form(); } @@ -510,7 +508,7 @@ function dfrn_request_content(App $a) $_POST["confirm_key"] = $confirm_key; $_POST["localconfirm"] = 1; $_POST["hidden-contact"] = 0; - $_POST["submit"] = L10n::t('Confirm'); + $_POST["submit"] = DI::l10n()->t('Confirm'); dfrn_request_post($a); @@ -521,11 +519,11 @@ function dfrn_request_content(App $a) $o = Renderer::replaceMacros($tpl, [ '$dfrn_url' => $dfrn_url, '$aes_allow' => (($aes_allow) ? '' : "" ), - '$hidethem' => L10n::t('Hide this contact'), + '$hidethem' => DI::l10n()->t('Hide this contact'), '$confirm_key' => $confirm_key, - '$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'), + '$welcome' => DI::l10n()->t('Welcome home %s.', $a->user['username']), + '$please' => DI::l10n()->t('Please confirm your introduction/connection request to %s.', $dfrn_url), + '$submit' => DI::l10n()->t('Confirm'), '$uid' => $_SESSION['uid'], '$nickname' => $a->user['nickname'], 'dfrn_rawurl' => $_GET['dfrn_url'] @@ -561,7 +559,7 @@ function dfrn_request_content(App $a) 'to_email' => $r[0]['email'], 'uid' => $r[0]['uid'], 'link' => DI::baseUrl() . '/notifications/intros', - 'source_name' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : L10n::t('[Name Withheld]')), + 'source_name' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : DI::l10n()->t('[Name Withheld]')), 'source_link' => $r[0]['url'], 'source_photo' => $r[0]['photo'], 'verb' => Activity::REQ_FRIEND, @@ -596,9 +594,9 @@ function dfrn_request_content(App $a) exit(); } else { // Normal web request. Display our user's introduction form. - if (Config::get('system', 'block_public') && !Session::isAuthenticated()) { - if (!Config::get('system', 'local_block')) { - notice(L10n::t('Public access denied.') . EOL); + if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) { + if (!DI::config()->get('system', 'local_block')) { + notice(DI::l10n()->t('Public access denied.') . EOL); return; } } @@ -633,25 +631,25 @@ function dfrn_request_content(App $a) $tpl = Renderer::getMarkupTemplate('auto_request.tpl'); } - $page_desc = L10n::t("Please enter your 'Identity Address' from one of the following supported communications networks:"); + $page_desc = DI::l10n()->t("Please enter your 'Identity Address' from one of the following supported communications networks:"); - $invite_desc = 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.', Search::getGlobalDirectory() . '/servers'); + $invite_desc = DI::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.', Search::getGlobalDirectory() . '/servers'); $o = Renderer::replaceMacros($tpl, [ - '$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', L10n::t('Does %s know you?', $a->profile['name']), false, '', [L10n::t('No'), L10n::t('Yes')]], - '$add_note' => L10n::t('Add a personal note:'), + '$header' => DI::l10n()->t('Friend/Connection Request'), + '$desc' => DI::l10n()->t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de'), + '$pls_answer' => DI::l10n()->t('Please answer the following:'), + '$does_know_you' => ['knowyou', DI::l10n()->t('Does %s know you?', $a->profile['name']), false, '', [DI::l10n()->t('No'), DI::l10n()->t('Yes')]], + '$add_note' => DI::l10n()->t('Add a personal note:'), '$page_desc' => $page_desc, - '$friendica' => L10n::t('Friendica'), - '$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:'), + '$friendica' => DI::l10n()->t('Friendica'), + '$statusnet' => DI::l10n()->t("GNU Social \x28Pleroma, Mastodon\x29"), + '$diaspora' => DI::l10n()->t("Diaspora \x28Socialhome, Hubzilla\x29"), + '$diasnote' => DI::l10n()->t(' - please do not use this form. Instead, enter %s into your Diaspora search bar.', $target_addr), + '$your_address' => DI::l10n()->t('Your Identity Address:'), '$invite_desc' => $invite_desc, - '$submit' => L10n::t('Submit Request'), - '$cancel' => L10n::t('Cancel'), + '$submit' => DI::l10n()->t('Submit Request'), + '$cancel' => DI::l10n()->t('Cancel'), '$nickname' => $a->argv[1], '$name' => $a->profile['name'], '$myaddr' => $myaddr