harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ensure we can work around the $is_http var in include/follow - this is left over from when the only non-webfinger connections we could make were RSS/Atom feeds.

Browse Source
This commit is contained in:
zotlabs 2017-07-30 19:04:17 -07:00 committed by Mario Vavti
parent 2095937c60
commit a4a99d2d46
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
include/follow.php
View File

@ -182,6 +182,11 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
$hash = get_observer_hash(); $hash = get_observer_hash();
$default_group = $channel['channel_default_group']; $default_group = $channel['channel_default_group'];
if($hash == $xchan_hash) {
$result['message'] = t('Cannot connect to yourself.');
return $result;
}
if($xchan['xchan_network'] === 'rss') { if($xchan['xchan_network'] === 'rss') {
// check service class feed limits // check service class feed limits
@ -196,28 +201,22 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
$result['message'] = upgrade_message(); $result['message'] = upgrade_message();
return $result; return $result;
} }
}
if($hash == $xchan_hash) {
$result['message'] = t('Cannot connect to yourself.');
return $result;
}
$r = q("select abook_id, abook_xchan, abook_pending, abook_instance from abook
where abook_xchan = '%s' and abook_channel = %d limit 1",
dbesc($xchan_hash),
intval($uid)
);
if($is_http) {
// Always set these "remote" permissions for feeds since we cannot interact with them // Always set these "remote" permissions for feeds since we cannot interact with them
// to negotiate a suitable permission response // to negotiate a suitable permission response
set_abconfig($uid,$xchan_hash,'their_perms','view_stream',1); set_abconfig($uid,$xchan_hash,'their_perms','view_stream',1);
set_abconfig($uid,$xchan_hash,'their_perms','republish',1); set_abconfig($uid,$xchan_hash,'their_perms','republish',1);
} }
$r = q("select abook_id, abook_xchan, abook_pending, abook_instance from abook
where abook_xchan = '%s' and abook_channel = %d limit 1",
dbesc($xchan_hash),
intval($uid)
);
if($r) { if($r) {
$abook_instance = $r[0]['abook_instance']; $abook_instance = $r[0]['abook_instance'];
@ -250,7 +249,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
'abook_channel' => intval($uid), 'abook_channel' => intval($uid),
'abook_closeness' => intval($closeness), 'abook_closeness' => intval($closeness),
'abook_xchan' => $xchan_hash, 'abook_xchan' => $xchan_hash,
'abook_feed' => intval(($is_http) ? 1 : 0), 'abook_feed' => intval(($xchan['xchan_network'] === 'rss') ? 1 : 0),
'abook_created' => datetime_convert(), 'abook_created' => datetime_convert(),
'abook_updated' => datetime_convert(), 'abook_updated' => datetime_convert(),
'abook_instance' => (($singleton) ? z_root() : '') 'abook_instance' => (($singleton) ? z_root() : '')