Merge remote-tracking branch 'upstream/develop' into develop

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

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index 76cbb97776f806b044157dd23c4be7710b79e4cd..04379b244ee14316f6bf127e4b0404ee02061a44 100644 (file)
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -1,6 +1,7 @@
 <?php
 require_once 'view/theme/frio/php/PHPColors/Color.php';
 
+use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 
 $schemecss = "";
@@ -29,6 +30,25 @@ if (! $a->install) {
                if (empty($modified)) {
                        PConfig::set($uid, 'frio', 'css_modified', time());
                }
+       } else {
+               Config::load('frio');
+
+               // Load frios system config.
+               $schema           = Config::get("frio", "schema");
+               $nav_bg           = Config::get("frio", "nav_bg");
+               $nav_icon_color   = Config::get("frio", "nav_icon_color");
+               $link_color       = Config::get("frio", "link_color");
+               $bgcolor          = Config::get("frio", "background_color");
+               $contentbg_transp = Config::get("frio", "contentbg_transp");
+               $background_image = Config::get("frio", "background_image");
+               $bg_image_option  = Config::get("frio", "bg_image_option");
+               $modified         = Config::get("frio", "css_modified");
+
+               // There is maybe the case that the user did never modify the theme settings.
+               // In this case we store the present time.
+               if (empty($modified)) {
+                       Config::set('frio', 'css_modified', time());
+               }
        }
 }
 
@@ -40,6 +60,11 @@ if (! $a->install) {
 if ($_REQUEST['schema']) {
        $schema = $_REQUEST['schema'];
 }
+
+// Sanitize the data.
+$schema = !empty($schema) ? basename($schema) : "";
+
+
 if (($schema) && ($schema != '---')) {
        if (file_exists('view/theme/frio/schema/' . $schema . '.php')) {
                $schemefile = 'view/theme/frio/schema/' . $schema . '.php';
@@ -65,14 +90,15 @@ if (! $schema) {
 
 //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
 //individually.  If we don't, we'll have problems if a user has set one, but not all options.
-$nav_bg           = (empty($nav_bg)           ? "#708fa0" :      $nav_bg);
-$nav_icon_color   = (empty($nav_icon_color)   ? "#fff"    :      $nav_icon_color);
-$link_color       = (empty($link_color)       ? "#6fdbe8" :      $link_color);
-$bgcolor          = (empty($bgcolor)          ? "#ededed" :      $bgcolor);
-$background_image = (empty($background_image) ? ''        :      $background_image);
-$modified         = (empty($modified)         ? time()    :      $modified);
-
-$contentbg_transp = ((isset($contentbg_transp) && $contentbg_transp != "") ?  $contentbg_transp : 100);
+$nav_bg           = (empty($nav_bg)           ? "#708fa0"      : $nav_bg);
+$nav_icon_color   = (empty($nav_icon_color)   ? "#fff"         : $nav_icon_color);
+$link_color       = (empty($link_color)       ? "#6fdbe8"      : $link_color);
+$bgcolor          = (empty($bgcolor)          ? "#ededed"      : $bgcolor);
+// The background image can not be empty. So we use a dummy jpg if no image was set.
+$background_image = (empty($background_image) ? 'img/none.jpg' : $background_image);
+$modified         = (empty($modified)         ? time()         :$modified);
+
+$contentbg_transp = ((isset($contentbg_transp) && $contentbg_transp != "") ? $contentbg_transp : 100);
 
 // Calculate some colors in dependance of existing colors.
 // Some colors are calculated to don't have too many selection