diff options
| author | friendica <info@friendica.com> | 2015-02-01 20:30:47 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-02-01 20:30:47 -0800 |
| commit | aafed50a0ea8a8d7091572473dcb8e4fb8cd4602 (patch) | |
| tree | 66b27325cd7bcce748965aebb29ab8a1da2f340d /mod/zfinger.php | |
| parent | e6a5f7800390e5091743d6a97c6fd8f54c5d1530 (diff) | |
| parent | e58bef049d7736d448f7bb5688affe491b9e24b1 (diff) | |
| download | volse-hubzilla-aafed50a0ea8a8d7091572473dcb8e4fb8cd4602.tar.gz volse-hubzilla-aafed50a0ea8a8d7091572473dcb8e4fb8cd4602.tar.bz2 volse-hubzilla-aafed50a0ea8a8d7091572473dcb8e4fb8cd4602.zip | |
Merge branch 'master' into tres
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 bd124b951..42085fb52 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 = (intval($e['xchan_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) |