clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7095 from annando/ap-connect

Browse Source 
Switching from legacy DFRN connect to ActivityPub
This commit is contained in:
Hypolite Petovan
2019-05-05 09:37:43 -04:00
committed by GitHub
parent 155d541860 bdf1e7ebfd
commit e17db489ee
8 changed files with 169 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mod/follow.php
View File

@@ -91,32 +91,34 @@ function follow_content(App $a)
$ret = Probe::uri($url);
if (($ret['network'] == Protocol::DIASPORA) && !Config::get('system', 'diaspora_enabled')) {
$protocol = Contact::getProtocol($ret['url'], $ret['network']);
if (($protocol == Protocol::DIASPORA) && !Config::get('system', 'diaspora_enabled')) {
notice(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')) {
if (($protocol == Protocol::OSTATUS) && Config::get('system', 'ostatus_disabled')) {
notice(L10n::t("OStatus support is disabled. Contact can't be added."));
$submit = '';
//$a->internalRedirect($_SESSION['return_path']);
// NOTREACHED
}
if ($ret['network'] == Protocol::PHANTOM) {
if ($protocol == Protocol::PHANTOM) {
notice(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 {
@@ -147,7 +149,7 @@ function follow_content(App $a)
$gcontact_id = $r[0]['id'];
}
if ($ret['network'] === Protocol::DIASPORA) {
if ($protocol === Protocol::DIASPORA) {
$r[0]['location'] = '';
$r[0]['about'] = '';
}