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

background work for caldav integration continued, modify mod_follow to allow it to be called from ajax without redirecting.

Browse Source
This commit is contained in:
zotlabs
2018-03-02 01:01:30 -08:00
parent 8fd619da71
commit dcfe9bc64f
3 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/follow.php
View File

@@ -88,9 +88,18 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
// Premium channel, set confirm before callback to avoid recursion
if(array_key_exists('connect_url',$j) && ($interactive) && (! $confirm))
goaway(zid($j['connect_url']));
if(array_key_exists('connect_url',$j) && (! $confirm)) {
if($interactive) {
goaway(zid($j['connect_url']));
}
else {
$result['message'] = t('Premium channel - please visit:') . ' ' . zid($j['connect_url']);
logger('mod_follow: ' . $result['message']);
return $result;
}
}
// do we have an xchan and hubloc?
// If not, create them.