X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Ffrio%2Fstyle.php;h=d8bffa9c645c4ff048b0b329a2927f7e32d2d4e9;hb=6e7ca479d63d9740c83074cd95b454da0c686885;hp=811db092a21e7fad932aeecb4269d2ad48f63594;hpb=0f82c3348dccbc9f3ce5023e14d042a4113232ac;p=friendica.git

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index 811db092a2..d8bffa9c64 100644
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -14,12 +14,12 @@ $scheme_modified = 0;
 
 if ($a->module !== 'install') {
 	// Get the UID of the profile owner.
-	$uid = Profile::getThemeUid();
+	$uid = defaults($_REQUEST, 'puid', 0);
 	if ($uid) {
 		PConfig::load($uid, 'frio');
 
 		// Load the profile owners pconfig.
-		$scheme           = PConfig::get($uid, 'frio', 'scheme');
+		$scheme           = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema'));
 		$nav_bg           = PConfig::get($uid, 'frio', 'nav_bg');
 		$nav_icon_color   = PConfig::get($uid, 'frio', 'nav_icon_color');
 		$link_color       = PConfig::get($uid, 'frio', 'link_color');
@@ -38,7 +38,7 @@ if ($a->module !== 'install') {
 		Config::load('frio');
 
 		// Load frios system config.
-		$scheme           = Config::get('frio', 'scheme');
+		$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');
@@ -63,7 +63,7 @@ if ($a->module !== 'install') {
 // Setting $scheme 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 scheme.
-if (x($_REQUEST, 'scheme')) {
+if (!empty($_REQUEST['scheme'])) {
 	$scheme = $_REQUEST['scheme'];
 }
 
@@ -110,6 +110,7 @@ if (empty($login_bg_image) && empty($login_bg_color)) {
 	$login_bg_image = 'img/login_bg.jpg';
 }
 $login_bg_color   = (empty($login_bg_color)   ? '#ededed'      : $login_bg_color);
+$login_bg_image   = (empty($login_bg_image)   ? ''             : $login_bg_image);
 
 $contentbg_transp = ((isset($contentbg_transp) && $contentbg_transp != '') ? $contentbg_transp : 100);
 
@@ -152,22 +153,28 @@ if (!isset($link_hover_color)) {
 if (!isset($bg_image_option)) {
 	$bg_image_option = null;
 }
+
 switch ($bg_image_option) {
 	case 'stretch':
 		$background_size_img = '100%';
+		$background_repeat = 'no-repeat';
 		break;
 	case 'cover':
 		$background_size_img = 'cover';
+		$background_repeat = 'no-repeat';
 		break;
 	case 'repeat':
 		$background_size_img = 'auto';
+		$background_repeat = 'repeat';
 		break;
 	case 'contain':
 		$background_size_img = 'contain';
+		$background_repeat = 'repeat';
 		break;
 
 	default:
 		$background_size_img = 'auto';
+		$background_repeat = 'no-repeat';
 		break;
 }
 
@@ -187,6 +194,7 @@ $options = [
 	'$contentbg_transp'            => $contentbg_transp,
 	'$background_image'            => $background_image,
 	'$background_size_img'         => $background_size_img,
+	'$background_repeat'           => $background_repeat,
 	'$login_bg_image'              => $login_bg_image,
 	'$login_bg_color'              => $login_bg_color
 ];
@@ -217,7 +225,8 @@ header('ETag: "' . $etag . '"');
 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'])) {
+/// @todo Check if this works at all (possibly clients are sending only the one or the other header) - compare with mod/photo.php
+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(['"', '-gzip'], ['', ''],
 				stripslashes($_SERVER['HTTP_IF_NONE_MATCH']));