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

18
Zotlabs/Module/Follow.php
View File

@@ -17,15 +17,20 @@ class Follow extends \Zotlabs\Web\Controller {
$url = notags(trim($_REQUEST['url']));
$return_url = $_SESSION['return_url'];
$confirm = intval($_REQUEST['confirm']);
$interactive = (($_REQUEST['interactive']) ? intval($_REQUEST['interactive']) : 1);
$channel = \App::get_channel();
$result = new_contact($uid,$url,$channel,true,$confirm);
$result = new_contact($uid,$url,$channel,$interactive,$confirm);
if($result['success'] == false) {
if($result['message'])
notice($result['message']);
goaway($return_url);
if($interactive) {
goaway($return_url);
}
else {
json_return_and_die($result);
}
}
info( t('Channel added.') . EOL);
@@ -53,7 +58,12 @@ class Follow extends \Zotlabs\Web\Controller {
if(($can_view_stream) || ($result['abook']['xchan_network'] === 'rss'))
\Zotlabs\Daemon\Master::Summon(array('Onepoll',$result['abook']['abook_id']));
goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?f=&follow=1');
if($interactive) {
goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?f=&follow=1');
}
else {
json_return_and_die([ 'success' => true ]);
}
}