<?php
-
/**
- * @file mod/dfrn_request.php
- * Module: dfrn_request
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*
- * Purpose: Handles communication associated with the issuance of
- * friend requests.
+ *Handles communication associated with the issuance of friend requests.
*
- * @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_request.png
+ * https://github.com/friendica/friendica/blob/stable/spec/dfrn2_contact_request.png
*/
use Friendica\App;
$data = Probe::uri($url);
$network = $data["network"];
- // Canonicalise email-style profile locator
- $url = Probe::webfingerDfrn($url, $hcard);
+ // Canonicalize email-style profile locator
+ $url = Probe::webfingerDfrn($data['url'], $hcard);
if (substr($url, 0, 5) === 'stat:') {
// Every time we detect the remote subscription we define this as OStatus.
// 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);
$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, <a href="%s">follow this link to find a public Friendica site and join us today</a>.', 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 <strong>%s</strong> directly on your system', $target_addr),
+ '$invite_desc' => DI::l10n()->t('If you are not yet a member of the free social web, <a href="%s">follow this link to find a public Friendica node and join us today</a>.', 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;
}
projects / friendica.git / blobdiff