diff options
| author | Habeas Codice <habeascodice@federated.social> | 2015-02-05 09:15:39 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2015-02-05 09:15:39 -0800 |
| commit | 9ed23f9081b56369349d4e06c51e3856f950804e (patch) | |
| tree | b3a1121ec41e04cce02cfa07fc958b95a3fd289b /mod/zfinger.php | |
| parent | 88488fdfbb58aa04b450af1691aba7cea1bce8ab (diff) | |
| parent | 646a874390be8f92736866118d7215e8cb80fb8a (diff) | |
| download | volse-hubzilla-9ed23f9081b56369349d4e06c51e3856f950804e.tar.gz volse-hubzilla-9ed23f9081b56369349d4e06c51e3856f950804e.tar.bz2 volse-hubzilla-9ed23f9081b56369349d4e06c51e3856f950804e.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'mod/zfinger.php')
| -rw-r--r-- | mod/zfinger.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mod/zfinger.php b/mod/zfinger.php index 6f4febc6f..f4b7efd96 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -99,13 +99,14 @@ function zfinger_init(&$a) { $id = $e['channel_id']; + $sys_channel = (($e['channel_pageflags'] & PAGE_SYSTEM) ? true : false); $special_channel = (($e['channel_pageflags'] & PAGE_PREMIUM) ? true : false); $adult_channel = (($e['channel_pageflags'] & PAGE_ADULT) ? true : false); $censored = (($e['channel_pageflags'] & PAGE_CENSORED) ? true : false); $searchable = (($e['channel_pageflags'] & PAGE_HIDDEN) ? false : true); $deleted = (($e['xchan_flags'] & XCHAN_FLAGS_DELETED) ? true : false); - if($deleted || $censored) + if($deleted || $censored || $sys_channel) $searchable = false; $public_forum = false; @@ -237,6 +238,12 @@ function zfinger_init(&$a) { $dirmode = get_config('system','directory_mode'); if(($dirmode === false) || ($dirmode == DIRECTORY_MODE_NORMAL)) $ret['site']['directory_mode'] = 'normal'; + + // downgrade mis-configured primaries + + if($dirmode == DIRECTORY_MODE_PRIMARY && z_root() != get_directory_primary()) + $dirmode = DIRECTORY_MODE_SECONDARY; + if($dirmode == DIRECTORY_MODE_PRIMARY) $ret['site']['directory_mode'] = 'primary'; elseif($dirmode == DIRECTORY_MODE_SECONDARY) |