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

make config requirements in apps more universal - provide key and value

Browse Source
This commit is contained in:
git-marijus 2017-08-06 23:20:24 +02:00
parent b0d1fa09c1
commit 1c0c01ccfe
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Zotlabs/Lib/Apps.php
View File

@ -174,10 +174,9 @@ class Apps {
if(substr($require, 0, 7) == 'config:') { if(substr($require, 0, 7) == 'config:') {
$config = true; $config = true;
$require = ltrim($require, 'config:'); $require = ltrim($require, 'config:');
$require = explode('=', $require);
} }
$toggle = (($require[0] == '!') ? 0 : 1);
switch($require) { switch($require) {
case 'nologin': case 'nologin':
if(local_channel()) if(local_channel())
@ -201,7 +200,7 @@ class Apps {
break; break;
default: default:
if($config) if($config)
$unset = ((get_config('system', ltrim($require, '!')) == $toggle) ? false : true); $unset = ((get_config('system', $require[0]) == $require[1]) ? false : true);
else else
$unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true); $unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true);
if($unset) if($unset)
@ -325,10 +324,9 @@ class Apps {
if(substr($require, 0, 7) == 'config:') { if(substr($require, 0, 7) == 'config:') {
$config = true; $config = true;
$require = ltrim($require, 'config:'); $require = ltrim($require, 'config:');
$require = explode('=', $require);
} }
$toggle = (($require[0] == '!') ? 0 : 1);
switch($require) { switch($require) {
case 'nologin': case 'nologin':
if(local_channel()) if(local_channel())
@ -353,7 +351,7 @@ class Apps {
break; break;
default: default:
if($config) if($config)
$unset = ((get_config('system', ltrim($require, '!')) == $toggle) ? false : true); $unset = ((get_config('system', $require[0]) == $require[1]) ? false : true);
else else
$unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true); $unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true);
if($unset) if($unset)

4
app/pubstream.apd
View File

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