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

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev

Browse Source
This commit is contained in:
Mario Vavti 2017-08-01 11:41:25 +02:00
commit a510c91d48
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Zotlabs/Lib/Apps.php
View File

@ -169,7 +169,15 @@ class Apps {
$requires = explode(',',$ret['requires']);
foreach($requires as $require) {
$require = trim(strtolower($require));
$config = false;
if(substr($require, 0, 7) == 'config:') {
$config = true;
$require = ltrim($require, 'config:');
}
$toggle = (($require[0] == '!') ? 0 : 1);
switch($require) {
case 'nologin':
if(local_channel())
@ -192,9 +200,10 @@ class Apps {
unset($ret);
break;
default:
$unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true);
$unset = ((get_config('system', ltrim($require, '!')) == $toggle) ? false : true);
if($config)
$unset = ((get_config('system', ltrim($require, '!')) == $toggle) ? false : true);
else
$unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true);
if($unset)
unset($ret);
break;
@ -308,9 +317,18 @@ class Apps {
if($k === 'requires') {
$requires = explode(',',$v);
foreach($requires as $require) {
$require = trim(strtolower($require));
$config = false;
if(substr($require, 0, 7) == 'config:') {
$config = true;
$require = ltrim($require, 'config:');
}
$toggle = (($require[0] == '!') ? 0 : 1);
switch($require) {
case 'nologin':
if(local_channel())
@ -334,9 +352,10 @@ class Apps {
return '';
break;
default:
$unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true);
$unset = ((get_config('system', ltrim($require, '!')) == $toggle) ? false : true);
if($config)
$unset = ((get_config('system', ltrim($require, '!')) == $toggle) ? false : true);
else
$unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true);
if($unset)
return '';
break;

2
app/pubstream.apd
View File

@ -1,6 +1,6 @@
version: 1
url: $baseurl/pubstream
requires: !disable_discover_tab
requires: config:!disable_discover_tab
name: Public Stream
photo: icon:globe
categories: Social