diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-10-01 22:58:44 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-10-01 22:58:44 +0100 |
| commit | 70fd797994e4b861d20d99cec2a7d801e478d894 (patch) | |
| tree | 5b00b61522f2c7136912396df54bd3251e3f17c8 /mod/zfinger.php | |
| parent | 2c9c206808fec2212141f8630ce534ed29a47037 (diff) | |
| parent | 27e97571d44f9e69a66eead9da2de4209996457d (diff) | |
| download | volse-hubzilla-70fd797994e4b861d20d99cec2a7d801e478d894.tar.gz volse-hubzilla-70fd797994e4b861d20d99cec2a7d801e478d894.tar.bz2 volse-hubzilla-70fd797994e4b861d20d99cec2a7d801e478d894.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/zfinger.php')
| -rw-r--r-- | mod/zfinger.php | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/mod/zfinger.php b/mod/zfinger.php index e1e19054e..3671da56e 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -72,8 +72,8 @@ function zfinger_init(&$a) { $id = $e['channel_id']; $special_channel = (($e['channel_pageflags'] & PAGE_PREMIUM) ? true : false); - - $searchable = (($e['channel_pageflags'] & PAGE_HIDDEN) ? false : true); + $adult_channel = (($e['channel_pageflags'] & PAGE_ADULT) ? true : false); + $searchable = (($e['channel_pageflags'] & PAGE_HIDDEN) ? false : true); if($e['xchan_flags'] & XCHAN_FLAGS_HIDDEN) $searchable = false; @@ -136,7 +136,8 @@ function zfinger_init(&$a) { $ret['target'] = $ztarget; $ret['target_sig'] = $zsig; $ret['searchable'] = $searchable; - + $ret['adult_content'] = $adult_channel; + // premium or other channel desiring some contact with potential followers before connecting. // This is a template - %s will be replaced with the follow_url we discover for the return channel. @@ -163,11 +164,6 @@ function zfinger_init(&$a) { $ret['locations'] = array(); - - - - - $x = zot_get_hubloc(array($e['channel_hash'])); if($x && count($x)) { foreach($x as $hub) { |