*/
use Friendica\App;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
-use Friendica\Core\System;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Profile;
use Friendica\Network\Probe;
function follow_post(App $a)
{
if (!local_user()) {
- System::httpExit(403, ['title' => L10n::t('Access denied.')]);
+ throw new \Friendica\Network\HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
}
if (isset($_REQUEST['cancel'])) {
- $a->internalRedirect('contact');
+ DI::baseUrl()->redirect('contact');
}
$uid = local_user();
if ($result['message']) {
notice($result['message']);
}
- $a->internalRedirect($return_path);
+ DI::baseUrl()->redirect($return_path);
} elseif ($result['cid']) {
- $a->internalRedirect('contact/' . $result['cid']);
+ DI::baseUrl()->redirect('contact/' . $result['cid']);
}
- info(L10n::t('The contact could not be added.'));
+ info(DI::l10n()->t('The contact could not be added.'));
- $a->internalRedirect($return_path);
+ DI::baseUrl()->redirect($return_path);
// NOTREACHED
}
$return_path = 'contact';
if (!local_user()) {
- notice(L10n::t('Permission denied.'));
- $a->internalRedirect($return_path);
+ notice(DI::l10n()->t('Permission denied.'));
+ DI::baseUrl()->redirect($return_path);
// NOTREACHED
}
$uid = local_user();
- $url = Strings::escapeTags(trim(defaults($_REQUEST, 'url', '')));
+
+ // Issue 4815: Silently removing a prefixing @
+ $url = ltrim(Strings::escapeTags(trim($_REQUEST['url'] ?? '')), '@!');
// Issue 6874: Allow remote following from Peertube
- $url = str_replace('acct:', '', $url);
+ if (strpos($url, 'acct:') === 0) {
+ $url = str_replace('acct:', '', $url);
+ }
if (!$url) {
- $a->internalRedirect($return_path);
+ DI::baseUrl()->redirect($return_path);
}
- $submit = L10n::t('Submit Request');
+ $submit = DI::l10n()->t('Submit Request');
// Don't try to add a pending contact
$r = q("SELECT `pending` FROM `contact` WHERE `uid` = %d AND ((`rel` != %d) OR (`network` = '%s')) AND
if ($r) {
if ($r[0]['pending']) {
- notice(L10n::t('You already added this contact.'));
+ notice(DI::l10n()->t('You already added this contact.'));
$submit = '';
//$a->internalRedirect($_SESSION['return_path']);
// NOTREACHED
$ret = Probe::uri($url);
- if (($ret['network'] == Protocol::DIASPORA) && !Config::get('system', 'diaspora_enabled')) {
- notice(L10n::t("Diaspora support isn't enabled. Contact can't be added."));
+ $protocol = Contact::getProtocol($ret['url'], $ret['network']);
+
+ if (($protocol == Protocol::DIASPORA) && !Config::get('system', 'diaspora_enabled')) {
+ notice(DI::l10n()->t("Diaspora support isn't enabled. Contact can't be added."));
$submit = '';
//$a->internalRedirect($_SESSION['return_path']);
// NOTREACHED
}
- if (($ret['network'] == Protocol::OSTATUS) && Config::get('system', 'ostatus_disabled')) {
- notice(L10n::t("OStatus support is disabled. Contact can't be added."));
+ if (($protocol == Protocol::OSTATUS) && Config::get('system', 'ostatus_disabled')) {
+ notice(DI::l10n()->t("OStatus support is disabled. Contact can't be added."));
$submit = '';
//$a->internalRedirect($_SESSION['return_path']);
// NOTREACHED
}
- if ($ret['network'] == Protocol::PHANTOM) {
- notice(L10n::t("The network type couldn't be detected. Contact can't be added."));
+ if ($protocol == Protocol::PHANTOM) {
+ notice(DI::l10n()->t("The network type couldn't be detected. Contact can't be added."));
$submit = '';
//$a->internalRedirect($_SESSION['return_path']);
// NOTREACHED
}
- if ($ret['network'] == Protocol::MAIL) {
+ if ($protocol == Protocol::MAIL) {
$ret['url'] = $ret['addr'];
}
- if (($ret['network'] === Protocol::DFRN) && !DBA::isResult($r)) {
+ if (($protocol === Protocol::DFRN) && !DBA::isResult($r)) {
$request = $ret['request'];
$tpl = Renderer::getMarkupTemplate('dfrn_request.tpl');
} else {
- $request = System::baseUrl() . '/follow';
+ $request = DI::baseUrl() . '/follow';
$tpl = Renderer::getMarkupTemplate('auto_request.tpl');
}
$r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval($uid));
if (!$r) {
- notice(L10n::t('Permission denied.'));
- $a->internalRedirect($return_path);
+ notice(DI::l10n()->t('Permission denied.'));
+ DI::baseUrl()->redirect($return_path);
// NOTREACHED
}
$gcontact_id = $r[0]['id'];
}
- if ($ret['network'] === Protocol::DIASPORA) {
+ if ($protocol === Protocol::DIASPORA) {
$r[0]['location'] = '';
$r[0]['about'] = '';
}
$o = Renderer::replaceMacros($tpl, [
- '$header' => L10n::t('Connect/Follow'),
+ '$header' => DI::l10n()->t('Connect/Follow'),
'$desc' => '',
- '$pls_answer' => L10n::t('Please answer the following:'),
- '$does_know_you' => ['knowyou', L10n::t('Does %s know you?', $ret['name']), false, '', [L10n::t('No'), L10n::t('Yes')]],
- '$add_note' => L10n::t('Add a personal note:'),
+ '$pls_answer' => DI::l10n()->t('Please answer the following:'),
+ '$does_know_you' => ['knowyou', DI::l10n()->t('Does %s know you?', $ret['name']), false, '', [DI::l10n()->t('No'), DI::l10n()->t('Yes')]],
+ '$add_note' => DI::l10n()->t('Add a personal note:'),
'$page_desc' => '',
'$friendica' => '',
'$statusnet' => '',
'$diaspora' => '',
'$diasnote' => '',
- '$your_address' => L10n::t('Your Identity Address:'),
+ '$your_address' => DI::l10n()->t('Your Identity Address:'),
'$invite_desc' => '',
'$emailnet' => '',
'$submit' => $submit,
- '$cancel' => L10n::t('Cancel'),
+ '$cancel' => DI::l10n()->t('Cancel'),
'$nickname' => '',
'$name' => $ret['name'],
'$url' => $ret['url'],
'$zrl' => Profile::zrl($ret['url']),
- '$url_label' => L10n::t('Profile URL'),
+ '$url_label' => DI::l10n()->t('Profile URL'),
'$myaddr' => $myaddr,
'$request' => $request,
'$keywords' => $r[0]['keywords'],
- '$keywords_label'=> L10n::t('Tags:')
+ '$keywords_label'=> DI::l10n()->t('Tags:')
]);
- $a->page['aside'] = '';
+ DI::page()['aside'] = '';
$profiledata = Contact::getDetailsByURL($ret['url']);
if ($profiledata) {
if ($gcontact_id <> 0) {
$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'),
- ['$title' => L10n::t('Status Messages and Posts')]
+ ['$title' => DI::l10n()->t('Status Messages and Posts')]
);
// Show last public posts