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

open_pubstream logic was messy and wrong

Browse Source
This commit is contained in:
zotlabs 2018-02-23 22:12:29 -08:00
parent 7ddf51722c
commit e6f9f284bf
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Zotlabs/Module/Pubstream.php
View File

@ -12,10 +12,16 @@ class Pubstream extends \Zotlabs\Web\Controller {
if($load) if($load)
$_SESSION['loadtime'] = datetime_convert(); $_SESSION['loadtime'] = datetime_convert();
if((observer_prohibited(true)) || (! (intval(get_config('system','open_pubstream',1))) && get_observer_hash())) { if((observer_prohibited(true))) {
return login(); return login();
} }
if(! intval(get_config('system','open_pubstream',1))) {
if(! get_observer_hash()) {
return login();
}
}
$site_firehose = ((intval(get_config('system','site_firehose',0))) ? true : false); $site_firehose = ((intval(get_config('system','site_firehose',0))) ? true : false);
$net_firehose = ((get_config('system','disable_discover_tab',1)) ? false : true); $net_firehose = ((get_config('system','disable_discover_tab',1)) ? false : true);