X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_request.php;h=bdb5a8d2fe65aea2b51d8a777aef3a8cd33231bd;hb=a0772c91d09b67701436da854235610da7f7e37d;hp=76ddb09a5f8ac1919ed5c01d951deadd95a893c1;hpb=ab8997f9db910ba70c592bf106a7f5fc41a55b2d;p=friendica.git
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 76ddb09a5f..bdb5a8d2fe 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -1,29 +1,41 @@
.
*
- * @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
+ *Handles communication associated with the issuance of friend requests.
+ *
+ * @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_request.png
+ * https://github.com/friendica/friendica/blob/stable/spec/dfrn2_contact_request.png
*/
use Friendica\App;
-use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\Search;
-use Friendica\Core\System;
use Friendica\Core\Session;
+use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Group;
+use Friendica\Model\Notification;
use Friendica\Model\Profile;
use Friendica\Model\User;
use Friendica\Module\Security\Login;
@@ -63,8 +75,8 @@ function dfrn_request_init(App $a)
*/
function dfrn_request_post(App $a)
{
- if (($a->argc != 2) || (!count($a->profile))) {
- Logger::log('Wrong count of argc or profiles: argc=' . $a->argc . ',profile()=' . count($a->profile));
+ if ($a->argc != 2 || empty($a->profile)) {
+ Logger::log('Wrong count of argc or profiles: argc=' . $a->argc . ', profile()=' . count($a->profile ?? []));
return;
}
@@ -98,7 +110,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(DI::l10n()->t("This introduction has already been accepted.") . EOL);
+ notice(DI::l10n()->t("This introduction has already been accepted."));
return;
} else {
$contact_record = $r[0];
@@ -116,18 +128,18 @@ function dfrn_request_post(App $a)
$parms = Probe::profile($dfrn_url);
if (!count($parms)) {
- notice(DI::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.'));
return;
} else {
if (empty($parms['fn'])) {
- notice(DI::l10n()->t('Warning: profile location has no identifiable owner name.') . EOL);
+ notice(DI::l10n()->t('Warning: profile location has no identifiable owner name.'));
}
if (empty($parms['photo'])) {
- notice(DI::l10n()->t('Warning: profile location has no profile photo.') . EOL);
+ notice(DI::l10n()->t('Warning: profile location has no profile photo.'));
}
$invalid = Probe::validDfrn($parms);
if ($invalid) {
- 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);
+ 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));
return;
}
}
@@ -165,7 +177,7 @@ function dfrn_request_post(App $a)
}
if ($r) {
- info(DI::l10n()->t("Introduction complete.") . EOL);
+ info(DI::l10n()->t("Introduction complete."));
}
$r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `site-pubkey` = '%s' LIMIT 1",
@@ -177,7 +189,7 @@ function dfrn_request_post(App $a)
Group::addMember(User::getDefaultGroup(local_user(), $r[0]["network"]), $r[0]['id']);
if (isset($photo)) {
- Contact::updateAvatar($photo, local_user(), $r[0]["id"], true);
+ Contact::updateAvatar($r[0]["id"], $photo, true);
}
$forward_path = "contact/" . $r[0]['id'];
@@ -191,7 +203,7 @@ function dfrn_request_post(App $a)
}
if (!empty($dfrn_request) && strlen($confirm_key)) {
- Network::fetchUrl($dfrn_request . '?confirm_key=' . $confirm_key);
+ DI::httpRequest()->fetch($dfrn_request . '?confirm_key=' . $confirm_key);
}
// (ignore reply, nothing we can do it failed)
@@ -201,7 +213,7 @@ function dfrn_request_post(App $a)
}
// invalid/bogus request
- notice(DI::l10n()->t('Unrecoverable protocol error.') . EOL);
+ notice(DI::l10n()->t('Unrecoverable protocol error.'));
DI::baseUrl()->redirect();
return; // NOTREACHED
}
@@ -227,8 +239,8 @@ function dfrn_request_post(App $a)
* in $a->argv[1] and we should have their complete info in $a->profile.
*
*/
- if (!(is_array($a->profile) && count($a->profile))) {
- notice(DI::l10n()->t('Profile unavailable.') . EOL);
+ if (empty($a->profile['uid'])) {
+ notice(DI::l10n()->t('Profile unavailable.'));
return;
}
@@ -249,9 +261,9 @@ function dfrn_request_post(App $a)
intval($uid)
);
if (DBA::isResult($r) && count($r) > $maxreq) {
- 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);
+ notice(DI::l10n()->t('%s has received too many connection requests today.', $a->profile['name']));
+ notice(DI::l10n()->t('Spam protection measures have been invoked.'));
+ notice(DI::l10n()->t('Friends are advised to please try again in 24 hours.'));
return;
}
}
@@ -275,18 +287,18 @@ function dfrn_request_post(App $a)
$url = trim($_POST['dfrn_url']);
if (!strlen($url)) {
- notice(DI::l10n()->t("Invalid locator") . EOL);
+ notice(DI::l10n()->t("Invalid locator"));
return;
}
$hcard = '';
// Detect the network
- $data = Probe::uri($url);
+ $data = Contact::getByURL($url);
$network = $data["network"];
- // Canonicalise email-style profile locator
- $url = Probe::webfingerDfrn($url, $hcard);
+ // Canonicalize email-style profile locator
+ $url = Probe::webfingerDfrn($data['url'] ?? $url, $hcard);
if (substr($url, 0, 5) === 'stat:') {
// Every time we detect the remote subscription we define this as OStatus.
@@ -311,10 +323,10 @@ function dfrn_request_post(App $a)
if (DBA::isResult($ret)) {
if (strlen($ret[0]['issued-id'])) {
- notice(DI::l10n()->t('You have already introduced yourself here.') . EOL);
+ notice(DI::l10n()->t('You have already introduced yourself here.'));
return;
} elseif ($ret[0]['rel'] == Contact::FRIEND) {
- notice(DI::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']));
return;
} else {
$contact_record = $ret[0];
@@ -334,19 +346,19 @@ function dfrn_request_post(App $a)
} else {
$url = Network::isUrlValid($url);
if (!$url) {
- notice(DI::l10n()->t('Invalid profile URL.') . EOL);
+ notice(DI::l10n()->t('Invalid profile URL.'));
DI::baseUrl()->redirect(DI::args()->getCommand());
return; // NOTREACHED
}
if (!Network::isUrlAllowed($url)) {
- notice(DI::l10n()->t('Disallowed profile URL.') . EOL);
+ notice(DI::l10n()->t('Disallowed profile URL.'));
DI::baseUrl()->redirect(DI::args()->getCommand());
return; // NOTREACHED
}
if (Network::isUrlBlocked($url)) {
- notice(DI::l10n()->t('Blocked domain') . EOL);
+ notice(DI::l10n()->t('Blocked domain'));
DI::baseUrl()->redirect(DI::args()->getCommand());
return; // NOTREACHED
}
@@ -354,18 +366,18 @@ function dfrn_request_post(App $a)
$parms = Probe::profile(($hcard) ? $hcard : $url);
if (!count($parms)) {
- notice(DI::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.'));
DI::baseUrl()->redirect(DI::args()->getCommand());
} else {
if (empty($parms['fn'])) {
- notice(DI::l10n()->t('Warning: profile location has no identifiable owner name.') . EOL);
+ notice(DI::l10n()->t('Warning: profile location has no identifiable owner name.'));
}
if (empty($parms['photo'])) {
- notice(DI::l10n()->t('Warning: profile location has no profile photo.') . EOL);
+ notice(DI::l10n()->t('Warning: profile location has no profile photo.'));
}
$invalid = Probe::validDfrn($parms);
if ($invalid) {
- 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);
+ 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));
return;
}
@@ -408,12 +420,12 @@ function dfrn_request_post(App $a)
);
if (DBA::isResult($r)) {
$contact_record = $r[0];
- Contact::updateAvatar($photo, $uid, $contact_record["id"], true);
+ Contact::updateAvatar($contact_record["id"], $photo, true);
}
}
}
if ($r === false) {
- notice(DI::l10n()->t('Failed to update contact record.') . EOL);
+ notice(DI::l10n()->t('Failed to update contact record.'));
return;
}
@@ -433,7 +445,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(DI::l10n()->t('Your introduction has been sent.') . EOL);
+ info(DI::l10n()->t('Your introduction has been sent.'));
}
// "Homecoming" - send the requestor back to their site to record the introduction.
@@ -455,15 +467,9 @@ function dfrn_request_post(App $a)
// Diaspora needs the uri in the format user@domain.tld
// Diaspora will support the remote subscription in a future version
if ($network == Protocol::DIASPORA) {
- $uri = $nickname . '@' . DI::baseUrl()->getHostname();
-
- if (DI::baseUrl()->getUrlPath()) {
- $uri .= '/' . DI::baseUrl()->getUrlPath();
- }
-
- $uri = urlencode($uri);
+ $uri = urlencode($a->profile['addr']);
} else {
- $uri = 'profile/' . $nickname;
+ $uri = urlencode($a->profile['url']);
}
$url = str_replace('{uri}', $uri, $url);
@@ -471,7 +477,7 @@ function dfrn_request_post(App $a)
// NOTREACHED
// END $network != Protocol::PHANTOM
} else {
- notice(DI::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."));
return;
}
} return;
@@ -487,7 +493,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(DI::l10n()->t("Please login to confirm introduction.") . EOL);
+ info(DI::l10n()->t("Please login to confirm introduction."));
/* setup the return URL to come back to this page if they use openid */
return Login::form();
}
@@ -495,7 +501,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(DI::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."));
return Login::form();
}
@@ -553,18 +559,12 @@ function dfrn_request_content(App $a)
if (!$auto_confirm) {
notification([
- 'type' => NOTIFY_INTRO,
- 'notify_flags' => $r[0]['notify-flags'],
- 'language' => $r[0]['language'],
- 'to_name' => $r[0]['username'],
- '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']) : DI::l10n()->t('[Name Withheld]')),
- 'source_link' => $r[0]['url'],
- 'source_photo' => $r[0]['photo'],
- 'verb' => Activity::REQ_FRIEND,
- 'otype' => 'intro'
+ 'type' => Notification\Type::INTRO,
+ 'otype' => Notification\ObjectType::INTRO,
+ 'verb' => Activity::REQ_FRIEND,
+ 'uid' => $r[0]['uid'],
+ 'cid' => $r[0]['id'],
+ 'link' => DI::baseUrl() . '/notifications/intros',
]);
}
@@ -595,9 +595,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(DI::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.'));
return;
}
}
@@ -632,28 +632,21 @@ function dfrn_request_content(App $a)
$tpl = Renderer::getMarkupTemplate('auto_request.tpl');
}
- $page_desc = DI::l10n()->t("Please enter your 'Identity Address' from one of the following supported communications networks:");
-
- $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' => 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' => 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' => DI::l10n()->t('Submit Request'),
- '$cancel' => DI::l10n()->t('Cancel'),
- '$nickname' => $a->argv[1],
- '$name' => $a->profile['name'],
- '$myaddr' => $myaddr
+ '$header' => DI::l10n()->t('Friend/Connection Request'),
+ '$page_desc' => DI::l10n()->t('Enter your Webfinger address (user@domain.tld) or profile URL here. If this isn\'t supported by your system (for example it doesn\'t work with Diaspora), you have to subscribe to %s directly on your system', $target_addr),
+ '$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 node and join us today.', Search::getGlobalDirectory() . '/servers'),
+ '$your_address' => DI::l10n()->t('Your Webfinger address or profile URL:'),
+ '$pls_answer' => DI::l10n()->t('Please answer the following:'),
+ '$submit' => DI::l10n()->t('Submit Request'),
+ '$cancel' => DI::l10n()->t('Cancel'),
+
+ '$request' => 'dfrn_request/' . $a->argv[1],
+ '$name' => $a->profile['name'],
+ '$myaddr' => $myaddr,
+
+ '$does_know_you' => ['knowyou', DI::l10n()->t('%s knows you', $a->profile['name'])],
+ '$addnote_field' => ['dfrn-request-message', DI::l10n()->t('Add a personal note:')],
]);
return $o;
}