From: Michael Date: Tue, 31 Jan 2017 05:14:32 +0000 (+0000) Subject: Bugfix issue 3116: Only allowed themes are displayed X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=49834676c76fbdd724d19d46514c10e86c1760f4;p=friendica.git Bugfix issue 3116: Only allowed themes are displayed --- diff --git a/mod/admin.php b/mod/admin.php index 13a00ff6aa..1475130834 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -863,12 +863,22 @@ function admin_page_site(App $a) { $theme_choices_mobile["---"] = t("No special theme for mobile devices"); $files = glob('view/theme/*'); if($files) { + + $allowed_theme_list = Config::get('system', 'allowed_themes'); + foreach($files as $file) { if(intval(file_exists($file.'/unsupported'))) continue; $f = basename($file); + + // Only show allowed themes here + if (($allowed_theme_list != '') AND !strstr($allowed_theme_list, $f)) { + continue; + } + $theme_name = ((file_exists($file.'/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f); + if(file_exists($file.'/mobile')) { $theme_choices_mobile[$f] = $theme_name; } else { @@ -1695,6 +1705,15 @@ function admin_page_themes(App $a) { if($files) { foreach($files as $file) { $f = basename($file); + + // Is there a style file? + $theme_files = glob('view/theme/'.$f.'/style.*'); + + // If not then quit + if (count($theme_files) == 0) { + continue; + } + $is_experimental = intval(file_exists($file.'/experimental')); $is_supported = 1-(intval(file_exists($file.'/unsupported'))); $is_allowed = intval(in_array($f,$allowed_themes));