X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Ffrio%2Fstyle.php;h=58bee7eaee1efa3ac02643b110f0e9296c3cdfb5;hb=02bca72de35949666026f30c8dc7418fe696393d;hp=363f7cd44deb827ebaab84acfd59f1b81c2b3463;hpb=c58dc357d4fb97fc7d22e5c2db03a4f22719185c;p=friendica.git diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php index 363f7cd44d..58bee7eaee 100644 --- a/view/theme/frio/style.php +++ b/view/theme/frio/style.php @@ -1,12 +1,29 @@ . + * */ -use Friendica\Core\Config; use Friendica\DI; +use Friendica\Network\HTTPException\NotModifiedException; use Friendica\Util\Strings; +require_once 'view/theme/frio/theme.php'; require_once 'view/theme/frio/php/PHPColors/Color.php'; $scheme = ''; @@ -14,43 +31,64 @@ $schemecss = ''; $schemecssfile = false; $scheme_modified = 0; -Config::load('frio'); - -// Default to hard-coded values for empty settings -$scheme = Config::get('frio', 'scheme', Config::get('frio', 'schema')); -$nav_bg = Config::get('frio', 'nav_bg') ?: '#708fa0'; -$nav_icon_color = Config::get('frio', 'nav_icon_color') ?: '#ffffff'; -$link_color = Config::get('frio', 'link_color') ?: '#6fdbe8'; -$background_color = Config::get('frio', 'background_color') ?: '#ededed'; -$contentbg_transp = Config::get('frio', 'contentbg_transp') ?: ''; -$background_image = Config::get('frio', 'background_image') ?: 'img/none.png'; -$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') ?: time(); +/* + * This script can be included when the maintenance mode is on, which requires us to avoid any config call and + * use the following hardcoded defaults + */ +$scheme = null; +$scheme_accent = FRIO_SCHEME_ACCENT_BLUE; +$nav_bg = '#708fa0'; +$nav_icon_color = '#ffffff'; +$link_color = '#6fdbe8'; +$background_color = '#ededed'; +$contentbg_transp = 100; +$background_image = 'img/none.png'; +$bg_image_option = ''; +$login_bg_image = ''; +$login_bg_color = ''; +$modified = time(); + +if (DI::mode()->has(\Friendica\App\Mode::MAINTENANCEDISABLED)) { + DI::config()->load('frio'); + + // Default to hard-coded values for empty settings + $scheme = DI::config()->get('frio', 'scheme', DI::config()->get('frio', 'schema')); + $scheme_accent = DI::config()->get('frio', 'scheme_accent') ?: $scheme_accent; + $nav_bg = DI::config()->get('frio', 'nav_bg') ?: $nav_bg; + $nav_icon_color = DI::config()->get('frio', 'nav_icon_color') ?: $nav_icon_color; + $link_color = DI::config()->get('frio', 'link_color') ?: $link_color; + $background_color = DI::config()->get('frio', 'background_color') ?: $background_color; + $contentbg_transp = DI::config()->get('frio', 'contentbg_transp') ?? $contentbg_transp; + $background_image = DI::config()->get('frio', 'background_image') ?: $background_image; + $bg_image_option = DI::config()->get('frio', 'bg_image_option') ?: $bg_image_option; + $login_bg_image = DI::config()->get('frio', 'login_bg_image') ?: $login_bg_image; + $login_bg_color = DI::config()->get('frio', 'login_bg_color') ?: $login_bg_color; + $modified = DI::config()->get('frio', 'css_modified') ?: $modified; + + // 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; + $scheme_accent = DI::pConfig()->get($uid, 'frio', 'scheme_accent') ?: $scheme_accent; + $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; + } +} 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 scheme // Setting $scheme to '' wasn't working for some reason, so we'll check it's @@ -60,9 +98,9 @@ if (!empty($_REQUEST['scheme'])) { $scheme = $_REQUEST['scheme']; } -$scheme = Strings::sanitizeFilePathItem($scheme); +$scheme = Strings::sanitizeFilePathItem($scheme ?? ''); -if (($scheme) && ($scheme != '---')) { +if ($scheme && ($scheme != '---')) { if (file_exists('view/theme/frio/scheme/' . $scheme . '.php')) { $schemefile = 'view/theme/frio/scheme/' . $scheme . '.php'; require_once $schemefile; @@ -85,7 +123,7 @@ if (!$scheme) { } } -$contentbg_transp = ((isset($contentbg_transp) && $contentbg_transp != '') ? $contentbg_transp : 100); +$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 @@ -108,7 +146,7 @@ if (!isset($nav_icon_hover_color)) { if ($nihc->isLight()) { $nav_icon_hover_color = '#' . $nihc->darken(10); } else { - $nav_icon_hover_color = '#' . $nihc->lighten(10); + $nav_icon_hover_color = '#' . $nihc->lighten(20); } } if (!isset($link_hover_color)) { @@ -169,7 +207,9 @@ $options = [ '$background_size_img' => $background_size_img, '$background_repeat' => $background_repeat, '$login_bg_image' => $login_bg_image, - '$login_bg_color' => $login_bg_color + '$login_bg_color' => $login_bg_color, + '$font_color_darker' => $font_color_darker ?? '#222', + '$font_color' => $font_color ?? '#444', ]; $css_tpl = file_get_contents('view/theme/frio/css/style.css'); @@ -205,8 +245,7 @@ if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && isset($_SERVER['HTTP_IF_NONE_MA stripslashes($_SERVER['HTTP_IF_NONE_MATCH'])); if (($cached_modified == $modified) && ($cached_etag == $etag)) { - header('HTTP/1.1 304 Not Modified'); - exit(); + throw new NotModifiedException(); } }