diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-03-02 20:25:17 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-03-02 20:25:17 +0100 |
| commit | 7c5f1e814bd60b326ede8d2511089d1da66b4854 (patch) | |
| tree | 07172b5871945e897a5693241c881245d63325ce /Zotlabs/Module/Follow.php | |
| parent | 5c46e66694ecab4e986cada35527ae4bf599b630 (diff) | |
| parent | dcfe9bc64f822af02021767bf8c70fbe9d847bda (diff) | |
| download | volse-hubzilla-7c5f1e814bd60b326ede8d2511089d1da66b4854.tar.gz volse-hubzilla-7c5f1e814bd60b326ede8d2511089d1da66b4854.tar.bz2 volse-hubzilla-7c5f1e814bd60b326ede8d2511089d1da66b4854.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Follow.php')
| -rw-r--r-- | Zotlabs/Module/Follow.php | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/Zotlabs/Module/Follow.php b/Zotlabs/Module/Follow.php index d8a86d0ce..04ac746cb 100644 --- a/Zotlabs/Module/Follow.php +++ b/Zotlabs/Module/Follow.php @@ -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 ]); + } } |