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 xdev_merge

Browse Source
This commit is contained in:
zotlabs
2017-08-01 18:20:34 -07:00
parent a97b09210e 6614d465d6
commit 6e9fb9b9fd
9 changed files with 9803 additions and 10388 deletions
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;