<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, 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;
DI::baseUrl()->redirect('contact');
}
- follow_process($a);
+ $url = Probe::cleanURI($_REQUEST['url']);
+
+ follow_process($a, $url);
}
function follow_content(App $a)
$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) {
DI::baseUrl()->redirect($return_path);
}
- if (!empty($_REQUEST['auto'])) {
- follow_process($a);
- }
-
$submit = DI::l10n()->t('Submit Request');
// 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]);
$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.'));
$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);
+ DI::page()['aside'] = Widget\VCard::getHTML(Contact::getByURL($contact['url'], false));
$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'),
['$title' => DI::l10n()->t('Status Messages and Posts')]
return $o;
}
-function follow_process(App $a)
+function follow_process(App $a, string $url)
{
- $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);
+ $result = Contact::createFromProbeForUser($a->getLoggedInUserId(), $url);
if ($result['success'] == false) {
// Possibly it is a remote item and not an account
}
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']);
}