<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
*/
use Friendica\App;
+use Friendica\Content\Widget;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Network\Probe;
use Friendica\Database\DBA;
+use Friendica\Model\Post;
use Friendica\Model\User;
use Friendica\Util\Strings;
}
$url = Probe::cleanURI($_REQUEST['url']);
- $return_path = 'follow?url=' . urlencode($url);
-
- // Makes the connection request for friendica contacts easier
- // This is just a precaution if maybe this page is called somewhere directly via POST
- $_SESSION['fastlane'] = $url;
-
- $result = Contact::createFromProbe($a->user, $url, true);
-
- if ($result['success'] == false) {
- // Possibly it is a remote item and not an account
- follow_remote_item($url);
-
- if ($result['message']) {
- notice($result['message']);
- }
- DI::baseUrl()->redirect($return_path);
- } elseif ($result['cid']) {
- DI::baseUrl()->redirect('contact/' . $result['cid']);
- }
-
- notice(DI::l10n()->t('The contact could not be added.'));
- DI::baseUrl()->redirect($return_path);
- // NOTREACHED
+ follow_process($a, $url);
}
function follow_content(App $a)
$return_path = 'contact';
if (!local_user()) {
- notice(DI::l10n()->t('Permission denied.'));
+ DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
DI::baseUrl()->redirect($return_path);
// NOTREACHED
}
$uid = local_user();
- // Issue 4815: Silently removing a prefixing @
- $url = ltrim(Strings::escapeTags(trim($_REQUEST['url'] ?? '')), '@!');
+ $url = Probe::cleanURI(trim($_REQUEST['url'] ?? ''));
// Issue 6874: Allow remote following from Peertube
if (strpos($url, 'acct:') === 0) {
// Don't try to add a pending contact
$user_contact = DBA::selectFirst('contact', ['pending'], ["`uid` = ? AND ((`rel` != ?) OR (`network` = ?)) AND
- (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
+ (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
$uid, Contact::FOLLOWER, Protocol::DFRN, Strings::normaliseLink($url),
Strings::normaliseLink($url), $url, Protocol::STATUSNET]);
if (DBA::isResult($user_contact)) {
if ($user_contact['pending']) {
- notice(DI::l10n()->t('You already added this contact.'));
+ DI::sysmsg()->addNotice(DI::l10n()->t('You already added this contact.'));
$submit = '';
}
}
$contact = Contact::getByURL($url, true);
+
+ // Possibly it is a mail contact
if (empty($contact)) {
+ $contact = Probe::uri($url, Protocol::MAIL, $uid);
+ }
+
+ if (empty($contact) || ($contact['network'] == Protocol::PHANTOM)) {
// Possibly it is a remote item and not an account
follow_remote_item($url);
- notice(DI::l10n()->t("The network type couldn't be detected. Contact can't be added."));
+ DI::sysmsg()->addNotice(DI::l10n()->t("The network type couldn't be detected. Contact can't be added."));
$submit = '';
$contact = ['url' => $url, 'network' => Protocol::PHANTOM, 'name' => $url, 'keywords' => ''];
}
$protocol = Contact::getProtocol($contact['url'], $contact['network']);
if (($protocol == Protocol::DIASPORA) && !DI::config()->get('system', 'diaspora_enabled')) {
- notice(DI::l10n()->t("Diaspora support isn't enabled. Contact can't be added."));
+ DI::sysmsg()->addNotice(DI::l10n()->t("Diaspora support isn't enabled. Contact can't be added."));
$submit = '';
}
if (($protocol == Protocol::OSTATUS) && DI::config()->get('system', 'ostatus_disabled')) {
- notice(DI::l10n()->t("OStatus support is disabled. Contact can't be added."));
+ DI::sysmsg()->addNotice(DI::l10n()->t("OStatus support is disabled. Contact can't be added."));
$submit = '';
}
$contact['url'] = $contact['addr'];
}
- if (($protocol === Protocol::DFRN) && !DBA::isResult($contact)) {
- $request = $contact['request'];
- $tpl = Renderer::getMarkupTemplate('dfrn_request.tpl');
- } else {
- $request = DI::baseUrl() . '/follow';
- $tpl = Renderer::getMarkupTemplate('auto_request.tpl');
+ if (!empty($_REQUEST['auto'])) {
+ follow_process($a, $contact['url']);
}
+ $request = DI::baseUrl() . '/follow';
+ $tpl = Renderer::getMarkupTemplate('auto_request.tpl');
+
$owner = User::getOwnerDataById($uid);
if (empty($owner)) {
- notice(DI::l10n()->t('Permission denied.'));
+ DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
DI::baseUrl()->redirect($return_path);
// NOTREACHED
}
$myaddr = $owner['url'];
- // Makes the connection request for friendica contacts easier
- $_SESSION['fastlane'] = $contact['url'];
-
$o = Renderer::replaceMacros($tpl, [
'$header' => DI::l10n()->t('Connect/Follow'),
'$pls_answer' => DI::l10n()->t('Please answer the following:'),
DI::page()['aside'] = '';
- if ($protocol != Protocol::PHANTOM) {
- Profile::load($a, '', $contact, false);
+ if (!in_array($protocol, [Protocol::PHANTOM, Protocol::MAIL])) {
+ DI::page()['aside'] = Widget\VCard::getHTML($contact);
$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'),
['$title' => DI::l10n()->t('Status Messages and Posts')]
return $o;
}
+function follow_process(App $a, string $url)
+{
+ $return_path = 'follow?url=' . urlencode($url);
+
+ $result = Contact::createFromProbeForUser($a->getLoggedInUserId(), $url);
+
+ if ($result['success'] == false) {
+ // Possibly it is a remote item and not an account
+ follow_remote_item($url);
+
+ if ($result['message']) {
+ DI::sysmsg()->addNotice($result['message']);
+ }
+ DI::baseUrl()->redirect($return_path);
+ } elseif ($result['cid']) {
+ DI::baseUrl()->redirect('contact/' . $result['cid']);
+ }
+
+ DI::sysmsg()->addNotice(DI::l10n()->t('The contact could not be added.'));
+
+ DI::baseUrl()->redirect($return_path);
+}
+
function follow_remote_item($url)
{
$item_id = Item::fetchByLink($url, local_user());
}
if (!empty($item_id)) {
- $item = Item::selectFirst(['guid'], ['id' => $item_id]);
+ $item = Post::selectFirst(['guid'], ['id' => $item_id]);
if (DBA::isResult($item)) {
DI::baseUrl()->redirect('display/' . $item['guid']);
}