Merge pull request #1 from friendica/develop

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

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index c39e672dfa4dd74781ecc1c9d23e54496861dc10..3d9c7743ab8e1a6161d929b10e887f483e159c85 100644 (file)
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -1,10 +1,25 @@
 <?php
 /**
- * @file view/theme/frio/style.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
-use Friendica\Core\Config;
-use Friendica\Core\PConfig;
+use Friendica\DI;
 use Friendica\Util\Strings;
 
 require_once 'view/theme/frio/php/PHPColors/Color.php';
@@ -14,20 +29,20 @@ $schemecss = '';
 $schemecssfile = false;
 $scheme_modified = 0;
 
-Config::load('frio');
+DI::config()->load('frio');
 
 // Default to hard-coded values for empty settings
-$scheme           = Config::get('frio', 'scheme', Config::get('frio', 'schema'));
-$nav_bg           = Config::get('frio', 'nav_bg')           ?: '#708fa0';
-$nav_icon_color   = Config::get('frio', 'nav_icon_color')   ?: '#ffffff';
-$link_color       = Config::get('frio', 'link_color')       ?: '#6fdbe8';
-$background_color = Config::get('frio', 'background_color') ?: '#ededed';
-$contentbg_transp = Config::get('frio', 'contentbg_transp') ?: '';
-$background_image = Config::get('frio', 'background_image') ?: 'img/none.png';
-$bg_image_option  = Config::get('frio', 'bg_image_option')  ?: '';
-$login_bg_image   = Config::get('frio', 'login_bg_image')   ?: '';
-$login_bg_color   = Config::get('frio', 'login_bg_color')   ?: '';
-$modified         = Config::get('frio', 'css_modified')     ?: time();
+$scheme           = DI::config()->get('frio', 'scheme', DI::config()->get('frio', 'schema'));
+$nav_bg           = DI::config()->get('frio', 'nav_bg')           ?: '#708fa0';
+$nav_icon_color   = DI::config()->get('frio', 'nav_icon_color')   ?: '#ffffff';
+$link_color       = DI::config()->get('frio', 'link_color')       ?: '#6fdbe8';
+$background_color = DI::config()->get('frio', 'background_color') ?: '#ededed';
+$contentbg_transp = DI::config()->get('frio', 'contentbg_transp') ?: '';
+$background_image = DI::config()->get('frio', 'background_image') ?: 'img/none.png';
+$bg_image_option  = DI::config()->get('frio', 'bg_image_option')  ?: '';
+$login_bg_image   = DI::config()->get('frio', 'login_bg_image')   ?: '';
+$login_bg_color   = DI::config()->get('frio', 'login_bg_color')   ?: '';
+$modified         = DI::config()->get('frio', 'css_modified')     ?: time();
 
 if (!$login_bg_image && !$login_bg_color) {
        $login_bg_image = 'img/login_bg.jpg';
@@ -37,18 +52,18 @@ $login_bg_color = $login_bg_color ?: '#ededed';
 // Get the UID of the profile owner.
 $uid = $_REQUEST['puid'] ?? 0;
 if ($uid) {
-       PConfig::load($uid, 'frio');
+       DI::pConfig()->load($uid, 'frio');
 
        // Only override display settings that have actually been set
-       $scheme           = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema')) ?: $scheme;
-       $nav_bg           = PConfig::get($uid, 'frio', 'nav_bg')           ?: $nav_bg;
-       $nav_icon_color   = PConfig::get($uid, 'frio', 'nav_icon_color')   ?: $nav_icon_color;
-       $link_color       = PConfig::get($uid, 'frio', 'link_color')       ?: $link_color;
-       $background_color = PConfig::get($uid, 'frio', 'background_color') ?: $background_color;
-       $contentbg_transp = PConfig::get($uid, 'frio', 'contentbg_transp') ?: $contentbg_transp;
-       $background_image = PConfig::get($uid, 'frio', 'background_image') ?: $background_image;
-       $bg_image_option  = PConfig::get($uid, 'frio', 'bg_image_option')  ?: $bg_image_option;
-       $modified         = PConfig::get($uid, 'frio', 'css_modified')     ?: $modified;
+       $scheme           = DI::pConfig()->get($uid, 'frio', 'scheme', DI::pConfig()->get($uid, 'frio', 'schema')) ?: $scheme;
+       $nav_bg           = DI::pConfig()->get($uid, 'frio', 'nav_bg')           ?: $nav_bg;
+       $nav_icon_color   = DI::pConfig()->get($uid, 'frio', 'nav_icon_color')   ?: $nav_icon_color;
+       $link_color       = DI::pConfig()->get($uid, 'frio', 'link_color')       ?: $link_color;
+       $background_color = DI::pConfig()->get($uid, 'frio', 'background_color') ?: $background_color;
+       $contentbg_transp = DI::pConfig()->get($uid, 'frio', 'contentbg_transp') ?: $contentbg_transp;
+       $background_image = DI::pConfig()->get($uid, 'frio', 'background_image') ?: $background_image;
+       $bg_image_option  = DI::pConfig()->get($uid, 'frio', 'bg_image_option')  ?: $bg_image_option;
+       $modified         = DI::pConfig()->get($uid, 'frio', 'css_modified')     ?: $modified;
 }
 
 // Now load the scheme.  If a value is changed above, we'll keep the settings