Updated towards hypolites suggestions

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index 57abd7711460d4c0a12a50455b30e0da790df43b..12cf8d20acbe6a6ab8c3f6690109273d2caf6c43 100644 (file)
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -15,6 +15,28 @@ $schemecssfile = false;
 $scheme_modified = 0;
 
 if ($a->module !== 'install') {
+
+       Config::load('frio');
+
+       // Load frios system config.
+       $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', '#fff');
+       $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');
+
+       // 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());
+       }
+
        // Get the UID of the profile owner.
        $uid = defaults($_REQUEST, 'puid', 0);
        if ($uid) {
@@ -36,27 +58,6 @@ if ($a->module !== 'install') {
                if (empty($modified)) {
                        PConfig::set($uid, 'frio', 'css_modified', time());
                }
-       } else {
-               Config::load('frio');
-
-               // Load frios system config.
-               $scheme           = Config::get('frio', 'scheme', 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');
-               $background_color = 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');
-               $login_bg_image   = Config::get('frio', 'login_bg_image');
-               $login_bg_color   = Config::get('frio', 'login_bg_color');
-               $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());
-               }
        }
 }
 
@@ -93,24 +94,6 @@ if (!$scheme) {
                $schemecssfile = 'view/theme/frio/scheme/default.css';
        }
 }
-//If no scheme was set default to login theme.
-$nav_bg           = (empty($nav_bg)           ? Config::get('frio', 'nav_bg')           : $nav_bg);
-$nav_icon_color   = (empty($nav_icon_color)   ? Config::get('frio', 'nav_icon_color')   : $nav_icon_color);
-$link_color       = (empty($link_color)       ? Config::get('frio', 'link_color')       : $link_color);
-$background_color = (empty($background_color) ? Config::get('frio', 'background_color') : $background_color);
-$background_image = (empty($background_image) ? Config::get('frio', 'background_image') : $background_image);
-
-//If login theme unset default to master default
-//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);
-$background_color = (empty($background_color) ? '#ededed'      : $background_color);
-// 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.png' : $background_image);
-$modified         = (empty($modified)         ? time()         : $modified);
-
 
 // set a default login bg image if no custom image and no custom bg color are set.
 if (empty($login_bg_image) && empty($login_bg_color)) {