harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into tres

Browse Source
This commit is contained in:
friendica
2015-02-01 20:30:47 -08:00
parent e6a5f78003 e58bef049d
commit aafed50a0e
12 changed files with 108 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mod/zfinger.php
View File

@@ -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)