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

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index 7354d8ee37..d8bffa9c64 100644
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -14,16 +14,16 @@ $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.
-		$schema           = PConfig::get($uid, 'frio', 'schema');
+		$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');
-		$bgcolor          = PConfig::get($uid, 'frio', 'background_color');
+		$background_color = PConfig::get($uid, 'frio', 'background_color');
 		$contentbg_transp = PConfig::get($uid, 'frio', 'contentbg_transp');
 		$background_image = PConfig::get($uid, 'frio', 'background_image');
 		$bg_image_option  = PConfig::get($uid, 'frio', 'bg_image_option');
@@ -38,11 +38,11 @@ if ($a->module !== 'install') {
 		Config::load('frio');
 
 		// Load frios system config.
-		$schema           = Config::get('frio', 'schema');
+		$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');
-		$bgcolor          = Config::get('frio', 'background_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');
@@ -59,38 +59,38 @@ if ($a->module !== 'install') {
 }
 
 // Now load the scheme.  If a value is changed above, we'll keep the settings
-// If not, we'll keep those defined by the schema
-// Setting $schema to '' wasn't working for some reason, so we'll check it's
+// If not, we'll keep those defined by the scheme
+// 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 schema.
-if (x($_REQUEST, 'schema')) {
-	$schema = $_REQUEST['schema'];
+// Allow layouts to over-ride the scheme.
+if (!empty($_REQUEST['scheme'])) {
+	$scheme = $_REQUEST['scheme'];
 }
 
 // Sanitize the data.
-$schema = !empty($schema) ? basename($schema) : '';
+$scheme = !empty($scheme) ? basename($scheme) : '';
 
 
-if (($schema) && ($schema != '---')) {
-	if (file_exists('view/theme/frio/schema/' . $schema . '.php')) {
-		$schemefile = 'view/theme/frio/schema/' . $schema . '.php';
+if (($scheme) && ($scheme != '---')) {
+	if (file_exists('view/theme/frio/scheme/' . $scheme . '.php')) {
+		$schemefile = 'view/theme/frio/scheme/' . $scheme . '.php';
 		require_once $schemefile;
 	}
-	if (file_exists('view/theme/frio/schema/' . $schema . '.css')) {
-		$schemecssfile = 'view/theme/frio/schema/' . $schema . '.css';
+	if (file_exists('view/theme/frio/scheme/' . $scheme . '.css')) {
+		$schemecssfile = 'view/theme/frio/scheme/' . $scheme . '.css';
 	}
 }
 
-// If we haven't got a schema, load the default.  We shouldn't touch this - we
+// If we haven't got a scheme, load the default.  We shouldn't touch this - we
 // 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')) {
-		$schemefile = 'view/theme/frio/schema/default.php';
+// default.php and default.css MUST be symlinks to existing scheme files.
+if (!$scheme) {
+	if (file_exists('view/theme/frio/scheme/default.php')) {
+		$schemefile = 'view/theme/frio/scheme/default.php';
 		require_once $schemefile;
 	}
-	if (file_exists('view/theme/frio/schema/default.css')) {
-		$schemecssfile = 'view/theme/frio/schema/default.css';
+	if (file_exists('view/theme/frio/scheme/default.css')) {
+		$schemecssfile = 'view/theme/frio/scheme/default.css';
 	}
 }
 
@@ -99,7 +99,7 @@ if (!$schema) {
 $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);
-$bgcolor          = (empty($bgcolor)          ? '#ededed'      : $bgcolor);
+$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.jpg' : $background_image);
 $modified         = (empty($modified)         ? time()         : $modified);
@@ -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;
 }
 
@@ -183,10 +190,11 @@ $options = [
 	'$menu_background_hover_color' => $menu_background_hover_color,
 	'$btn_primary_color'           => $nav_icon_color,
 	'$btn_primary_hover_color'     => $menu_background_hover_color,
-	'$bgcolor'                     => $bgcolor,
+	'$background_color'            => $background_color,
 	'$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']));