diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-05-04 09:46:27 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-05-04 09:46:27 +0200 |
| commit | be4c9a9598350fb4333480f0c7b302acebcddfd4 (patch) | |
| tree | fb0c2606ad4ca0bc1a710d6fdf82f55c326b3427 /include/follow.php | |
| parent | f15c12376adad6534c8c0ea547a7548697eb8379 (diff) | |
| parent | be852ba857f4cb8e75574a762945b50c8bddcff9 (diff) | |
| download | volse-hubzilla-3.4.tar.gz volse-hubzilla-3.4.tar.bz2 volse-hubzilla-3.4.zip | |
Merge branch '3.4RC'3.4
Diffstat (limited to 'include/follow.php')
| -rw-r--r-- | include/follow.php | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/include/follow.php b/include/follow.php index 0843802c5..d803afa3f 100644 --- a/include/follow.php +++ b/include/follow.php @@ -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. @@ -141,9 +150,9 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) // attempt network auto-discovery - $d = discover_by_webbie($url,$protocol); + $wf = discover_by_webbie($url,$protocol); - if((! $d) && ($is_http)) { + if((! $wf) && ($is_http)) { // try RSS discovery @@ -158,9 +167,9 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) } } - if($d) { + if($wf || $d) { $r = q("select * from xchan where xchan_hash = '%s' or xchan_url = '%s' limit 1", - dbesc($url), + dbesc(($wf) ? $wf : $url), dbesc($url) ); } |