Merge branch '2019.06-rc'

[friendica.git] / view / theme / frio / style.php

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index 824378793644601bc1be5770ad9795662ec0f780..6a8aaf2c2819fcd06e1e292573c4b1934b421be1 100644 (file)
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -5,9 +5,11 @@
 
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Util\Strings;
 
 require_once 'view/theme/frio/php/PHPColors/Color.php';
 
+$scheme = '';
 $schemecss = '';
 $schemecssfile = false;
 $scheme_modified = 0;
@@ -20,7 +22,6 @@ if ($a->module !== 'install') {
 
                // Load the profile owners pconfig.
                $scheme           = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema'));
-               \Friendica\Core\Logger::alert($scheme);
                $nav_bg           = PConfig::get($uid, 'frio', 'nav_bg');
                $nav_icon_color   = PConfig::get($uid, 'frio', 'nav_icon_color');
                $link_color       = PConfig::get($uid, 'frio', 'link_color');
@@ -68,9 +69,7 @@ if (!empty($_REQUEST['scheme'])) {
        $scheme = $_REQUEST['scheme'];
 }
 
-// Sanitize the data.
-$scheme = !empty($scheme) ? basename($scheme) : '';
-
+$scheme = Strings::sanitizeFilePathItem($scheme);
 
 if (($scheme) && ($scheme != '---')) {
        if (file_exists('view/theme/frio/scheme/' . $scheme . '.php')) {