Merge pull request #2 from friendica/master

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

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index 7b1b8a350d2a96b38afb2a94acaf69091d5915e6..044f2ab61c9d716312abce4c3c331bc3a9a240a0 100644 (file)
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -1,16 +1,20 @@
 <?php
-require_once 'view/theme/frio/php/PHPColors/Color.php';
-
+/**
+ * @file view/theme/frio/style.php
+ */
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Model\Profile;
+
+require_once 'view/theme/frio/php/PHPColors/Color.php';
 
 $schemecss = "";
 $schemecssfile = false;
 $scheme_modified = 0;
 
-if (! $a->install) {
+if ($a->module !== 'install') {
        // Get the UID of the profile owner.
-       $uid = get_theme_uid();
+       $uid = Profile::getThemeUid();
        if ($uid) {
                PConfig::load($uid, 'frio');
 
@@ -42,6 +46,8 @@ if (! $a->install) {
                $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.
@@ -57,9 +63,14 @@ if (! $a->install) {
 // Setting $schema to '' wasn't working for some reason, so we'll check it's
 // not --- like the mobile theme does instead.
 // Allow layouts to over-ride the schema.
-if ($_REQUEST['schema']) {
+if (x($_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';
@@ -74,11 +85,11 @@ if (($schema) && ($schema != '---')) {
 // should leave it for admins to define for themselves.
 // default.php and default.css MUST be symlinks to existing schema files.
 if (! $schema) {
-       if(file_exists('view/theme/frio/schema/default.php')) {
+       if (file_exists('view/theme/frio/schema/default.php')) {
                $schemefile = 'view/theme/frio/schema/default.php';
                require_once $schemefile;
        }
-       if(file_exists('view/theme/frio/schema/default.css')) {
+       if (file_exists('view/theme/frio/schema/default.css')) {
                $schemecssfile = 'view/theme/frio/schema/default.css';
        }
 }
@@ -93,12 +104,20 @@ $bgcolor          = (empty($bgcolor)          ? "#ededed"      : $bgcolor);
 $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);
+
+// 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.
 // Some colors are calculated to don't have too many selection
 // fields in the theme settings.
-if (! $menu_background_hover_color) {
+if (!isset($menu_background_hover_color)) {
        $mbhc = new Color($nav_bg);
        $mcolor = $mbhc->getHex();
 
@@ -110,7 +129,7 @@ if (! $menu_background_hover_color) {
                $menu_background_hover_color = '#' . $mbhc->lighten(5);
        }
 }
-if (! $nav_icon_hover_color) {
+if (!isset($nav_icon_hover_color)) {
        $nihc = new Color($nav_bg);
 
        if ($nihc->isLight()) {
@@ -119,7 +138,7 @@ if (! $nav_icon_hover_color) {
                $nav_icon_hover_color = '#' . $nihc->lighten(10);
        }
 }
-if (! $link_hover_color) {
+if (!isset($link_hover_color)) {
        $lhc = new Color($link_color);
        $lcolor = $lhc->getHex();
 
@@ -128,10 +147,12 @@ if (! $link_hover_color) {
        } else {
                $link_hover_color = '#' . $lhc->lighten(5);
        }
-
 }
 
 // Convert $bg_image_options into css.
+if (!isset($bg_image_option)) {
+       $bg_image_option = null;
+}
 switch ($bg_image_option) {
        case "stretch":
                $background_size_img = "100%";
@@ -154,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,
@@ -167,7 +188,9 @@ $options = array (
        '$contentbg_transp'            => $contentbg_transp,
        '$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');
 
@@ -197,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)) {