diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-03-04 06:45:07 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-03-04 06:45:07 -0500 |
| commit | 058f7277b52bdcdb80dc3e28bf0ec93a573195a7 (patch) | |
| tree | 32ca12ca4eb390396e429b1e86fd79de614f2551 /Zotlabs/Module/Follow.php | |
| parent | 39fe80a196ee626dda15b5b844dd1d05893f7646 (diff) | |
| parent | 471c3c4d068d1c6d4e149098d400d792fb3550a6 (diff) | |
| download | volse-hubzilla-058f7277b52bdcdb80dc3e28bf0ec93a573195a7.tar.gz volse-hubzilla-058f7277b52bdcdb80dc3e28bf0ec93a573195a7.tar.bz2 volse-hubzilla-058f7277b52bdcdb80dc3e28bf0ec93a573195a7.zip | |
Merge branch 'dev' into oauth2
Diffstat (limited to 'Zotlabs/Module/Follow.php')
| -rw-r--r-- | Zotlabs/Module/Follow.php | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/Zotlabs/Module/Follow.php b/Zotlabs/Module/Follow.php index d8a86d0ce..146c4e564 100644 --- a/Zotlabs/Module/Follow.php +++ b/Zotlabs/Module/Follow.php @@ -17,18 +17,23 @@ 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); + info( t('Connection added.') . EOL); $clone = array(); foreach($result['abook'] as $k => $v) { @@ -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 ]); + } } |