aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-04-07 16:10:43 -0700
committerfriendica <info@friendica.com>2014-04-07 16:10:43 -0700
commit74029a9ee9b0dfdb98d88a3697beabfcd8ab29d0 (patch)
tree0706b4253763cd368258f8b5f93265f195e4bed9 /mod
parent7e160a7b048c50a8b7c7a7e6e99687bbedcb3487 (diff)
downloadvolse-hubzilla-74029a9ee9b0dfdb98d88a3697beabfcd8ab29d0.tar.gz
volse-hubzilla-74029a9ee9b0dfdb98d88a3697beabfcd8ab29d0.tar.bz2
volse-hubzilla-74029a9ee9b0dfdb98d88a3697beabfcd8ab29d0.zip
this should be better - "xchan deleted" state on remote sites only follows the xchan_flags and not the channel_pageflags; XCHAN_FLAGS_DELETED should only be set if the channel is to be removed from the entire network. As mentioned in a previous commit, channel_pageflags could be set to PAGE_REMOVED but still leave living clones on other sites.
Diffstat (limited to 'mod')
-rw-r--r--mod/zfinger.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/mod/zfinger.php b/mod/zfinger.php
index f2d46bff8..dcc755992 100644
--- a/mod/zfinger.php
+++ b/mod/zfinger.php
@@ -94,10 +94,10 @@ function zfinger_init(&$a) {
$id = $e['channel_id'];
- $special_channel = (($e['channel_pageflags'] & PAGE_PREMIUM) ? true : false);
- $adult_channel = (($e['channel_pageflags'] & PAGE_ADULT) ? true : false);
- $searchable = (($e['channel_pageflags'] & PAGE_HIDDEN) ? false : true);
- $deleted = (($e['channel_pageflags'] & PAGE_REMOVED) ? true : false);
+ $special_channel = (($e['channel_pageflags'] & PAGE_PREMIUM) ? true : false);
+ $adult_channel = (($e['channel_pageflags'] & PAGE_ADULT) ? true : false);
+ $searchable = (($e['channel_pageflags'] & PAGE_HIDDEN) ? false : true);
+ $deleted = (($e['xchan_flags'] & XCHAN_FLAGS_DELETED) ? true : false);
if(($e['xchan_flags'] & XCHAN_FLAGS_HIDDEN) || $deleted)
$searchable = false;
@@ -166,7 +166,8 @@ function zfinger_init(&$a) {
$ret['target_sig'] = $zsig;
$ret['searchable'] = $searchable;
$ret['adult_content'] = $adult_channel;
- $ret['deleted'] = $deleted;
+ if($deleted)
+ $ret['deleted'] = $deleted;
// 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.