<?php
-require_once 'view/theme/frio/php/PHPColors/Color.php';
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+use Friendica\DI;
+use Friendica\Util\Strings;
-use Friendica\Core\Config;
-use Friendica\Core\PConfig;
+require_once 'view/theme/frio/php/PHPColors/Color.php';
-$schemecss = "";
+$scheme = '';
+$schemecss = '';
$schemecssfile = false;
$scheme_modified = 0;
-if ($a->module !== 'install') {
- // Get the UID of the profile owner.
- $uid = get_theme_uid();
- if ($uid) {
- PConfig::load($uid, 'frio');
-
- // Load the profile owners pconfig.
- $schema = 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");
- $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");
- $modified = PConfig::get($uid, "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)) {
- PConfig::set($uid, 'frio', 'css_modified', time());
- }
- } else {
- Config::load('frio');
-
- // Load frios system config.
- $schema = 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");
- $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");
- $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());
- }
- }
+DI::config()->load('frio');
+
+// Default to hard-coded values for empty settings
+$scheme = DI::config()->get('frio', 'scheme', DI::config()->get('frio', 'schema'));
+$nav_bg = DI::config()->get('frio', 'nav_bg') ?: '#708fa0';
+$nav_icon_color = DI::config()->get('frio', 'nav_icon_color') ?: '#ffffff';
+$link_color = DI::config()->get('frio', 'link_color') ?: '#6fdbe8';
+$background_color = DI::config()->get('frio', 'background_color') ?: '#ededed';
+$contentbg_transp = DI::config()->get('frio', 'contentbg_transp') ?: '';
+$background_image = DI::config()->get('frio', 'background_image') ?: 'img/none.png';
+$bg_image_option = DI::config()->get('frio', 'bg_image_option') ?: '';
+$login_bg_image = DI::config()->get('frio', 'login_bg_image') ?: '';
+$login_bg_color = DI::config()->get('frio', 'login_bg_color') ?: '';
+$modified = DI::config()->get('frio', 'css_modified') ?: time();
+
+if (!$login_bg_image && !$login_bg_color) {
+ $login_bg_image = 'img/login_bg.jpg';
+}
+$login_bg_color = $login_bg_color ?: '#ededed';
+
+// Get the UID of the profile owner.
+$uid = $_REQUEST['puid'] ?? 0;
+if ($uid) {
+ DI::pConfig()->load($uid, 'frio');
+
+ // Only override display settings that have actually been set
+ $scheme = DI::pConfig()->get($uid, 'frio', 'scheme', DI::pConfig()->get($uid, 'frio', 'schema')) ?: $scheme;
+ $nav_bg = DI::pConfig()->get($uid, 'frio', 'nav_bg') ?: $nav_bg;
+ $nav_icon_color = DI::pConfig()->get($uid, 'frio', 'nav_icon_color') ?: $nav_icon_color;
+ $link_color = DI::pConfig()->get($uid, 'frio', 'link_color') ?: $link_color;
+ $background_color = DI::pConfig()->get($uid, 'frio', 'background_color') ?: $background_color;
+ $contentbg_transp = DI::pConfig()->get($uid, 'frio', 'contentbg_transp') ?: $contentbg_transp;
+ $background_image = DI::pConfig()->get($uid, 'frio', 'background_image') ?: $background_image;
+ $bg_image_option = DI::pConfig()->get($uid, 'frio', 'bg_image_option') ?: $bg_image_option;
+ $modified = DI::pConfig()->get($uid, 'frio', 'css_modified') ?: $modified;
}
// 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 = Strings::sanitizeFilePathItem($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';
}
}
-//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);
-$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);
-
-$contentbg_transp = ((isset($contentbg_transp) && $contentbg_transp != "") ? $contentbg_transp : 100);
+$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
} 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%";
+ case 'stretch':
+ $background_size_img = '100%';
+ $background_repeat = 'no-repeat';
break;
- case "cover":
- $background_size_img ="cover";
+ case 'cover':
+ $background_size_img = 'cover';
+ $background_repeat = 'no-repeat';
break;
- case "repeat":
- $background_size_img = "auto";
+ case 'repeat':
+ $background_size_img = 'auto';
+ $background_repeat = 'repeat';
break;
- case "contain":
- $background_size_img = "contain";
+ case 'contain':
+ $background_size_img = 'contain';
+ $background_repeat = 'repeat';
break;
default:
- $background_size_img = "auto";
+ $background_size_img = 'auto';
+ $background_repeat = 'no-repeat';
break;
}
// 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,
'$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
+];
$css_tpl = file_get_contents('view/theme/frio/css/style.css');
// Set a header for caching.
header('Cache-Control: public');
-header('ETag: "'.$etag.'"');
-header('Last-Modified: '.$modified);
+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(array('"', "-gzip"), array('', ''),
+ $cached_etag = str_replace(['"', '-gzip'], ['', ''],
stripslashes($_SERVER['HTTP_IF_NONE_MATCH']));
if (($cached_modified == $modified) && ($cached_etag == $etag)) {
projects / friendica.git / blobdiff