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

Fix feature check in apps (missing parenthesis), allow multiple requires (comma separated)

Browse Source
This commit is contained in:
Stefan Parviainen 2014-12-22 17:45:43 +01:00
parent d3830aea96
commit bd2be2b10c
1 changed files with 59 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/apps.php
View File

@ -83,7 +83,9 @@ function parse_app_description($f) {
$ret['target'] = str_replace(array('\'','"'),array(''','&dquot;'),$ret['target']); $ret['target'] = str_replace(array('\'','"'),array(''','&dquot;'),$ret['target']);
if(array_key_exists('requires',$ret)) { if(array_key_exists('requires',$ret)) {
$require = trim(strtolower($ret['requires'])); $requires = explode(',',$ret['requires']);
foreach($requires as $require) {
$require = trim(strtolower($require));
switch($require) { switch($require) {
case 'nologin': case 'nologin':
if(local_user()) if(local_user())
@ -106,12 +108,12 @@ function parse_app_description($f) {
unset($ret); unset($ret);
break; break;
default: default:
if(! local_user() && feature_enabled(local_user(),$require)) if(! (local_user() && feature_enabled(local_user(),$require)))
unset($ret); unset($ret);
break; break;
} }
// logger('require: ' . print_r($ret,true)); }
} }
if($ret) { if($ret) {
translate_system_apps($ret); translate_system_apps($ret);
@ -189,7 +191,9 @@ function app_render($papp,$mode = 'view') {
$papp['desc'] = str_replace(array('\'','"'),array(''','&dquot;'),$papp['desc']); $papp['desc'] = str_replace(array('\'','"'),array(''','&dquot;'),$papp['desc']);
if($k === 'requires') { if($k === 'requires') {
$require = trim(strtolower($v)); $requires = explode(',',$v);
foreach($requires as $require) {
$require = trim(strtolower($require));
switch($require) { switch($require) {
case 'nologin': case 'nologin':
if(local_user()) if(local_user())
@ -213,11 +217,12 @@ function app_render($papp,$mode = 'view') {
return ''; return '';
break; break;
default: default:
if(! local_user() && feature_enabled(local_user(),$require)) if(! (local_user() && feature_enabled(local_user(),$require)))
return ''; return '';
break; break;
} }
}
} }
} }