Merge pull request #4440 from rabuzarus/20180211_-_fix_variables_part_two

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

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index 7bc9629d4fd12218f0417bb6d0c86cedd9ed929d..044f2ab61c9d716312abce4c3c331bc3a9a240a0 100644 (file)
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -47,6 +47,7 @@ if ($a->module !== 'install') {
                $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.
@@ -101,9 +102,16 @@ $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);
-$login_bg_image   = (empty($login_bg_image)   ? 'img/login_bg.jpg' : $login_bg_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)) {
+       $login_bg_image   = (empty($login_bg_image)   ? 'img/login_bg.jpg' : $login_bg_image);
+}
+$login_bg_color = (empty($login_bg_color) ? "#ededed" : $login_bg_color);
+
+
 $contentbg_transp = ((isset($contentbg_transp) && $contentbg_transp != "") ? $contentbg_transp : 100);
 
 // Calculate some colors in dependance of existing colors.
@@ -167,7 +175,7 @@ switch ($bg_image_option) {
 // Convert transparency level from percentage to opacity value.
 $contentbg_transp = $contentbg_transp / 100;
 
-$options = array (
+$options =  [
        '$nav_bg'                      => $nav_bg,
        '$nav_icon_color'              => $nav_icon_color,
        '$nav_icon_hover_color'        => $nav_icon_hover_color,
@@ -181,7 +189,8 @@ $options = array (
        '$background_image'            => $background_image,
        '$background_size_img'         => $background_size_img,
        '$login_bg_image'              => $login_bg_image,
-);
+       '$login_bg_color'              => $login_bg_color
+];
 
 $css_tpl = file_get_contents('view/theme/frio/css/style.css');
 
@@ -211,7 +220,7 @@ header('Last-Modified: '.$modified);
 // Only send the CSS file if it was changed.
 if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
        $cached_modified = gmdate('r', strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']));
-       $cached_etag = str_replace(array('"', "-gzip"), array('', ''),
+       $cached_etag = str_replace(['"', "-gzip"], ['', ''],
                                stripslashes($_SERVER['HTTP_IF_NONE_MATCH']));
 
        if (($cached_modified == $modified) && ($cached_etag == $etag)) {