X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Ffrio%2Fconfig.php;h=0f3eda4c940a494372cdaf3e8e36878b3e1b2aad;hb=9cf4562200f337775ddff4f07966cfc23dedddac;hp=a3d8d94bdfa4fb6b14fc9a004dc1f0ad971c70b7;hpb=3bfa6facfc1294707368877d68caed50cbedf064;p=friendica.git
diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php
index a3d8d94bdf..0f3eda4c94 100644
--- a/view/theme/frio/config.php
+++ b/view/theme/frio/config.php
@@ -4,6 +4,7 @@ use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
use Friendica\Core\System;
require_once 'view/theme/frio/php/Image.php';
@@ -15,35 +16,35 @@ function theme_post(App $a)
}
if (isset($_POST['frio-settings-submit'])) {
- PConfig::set(local_user(), 'frio', 'scheme', $_POST['frio_scheme']);
- PConfig::set(local_user(), 'frio', 'nav_bg', $_POST['frio_nav_bg']);
- PConfig::set(local_user(), 'frio', 'nav_icon_color', $_POST['frio_nav_icon_color']);
- PConfig::set(local_user(), 'frio', 'link_color', $_POST['frio_link_color']);
- PConfig::set(local_user(), 'frio', 'background_color', $_POST['frio_background_color']);
- PConfig::set(local_user(), 'frio', 'contentbg_transp', $_POST['frio_contentbg_transp']);
- PConfig::set(local_user(), 'frio', 'background_image', $_POST['frio_background_image']);
- PConfig::set(local_user(), 'frio', 'bg_image_option', $_POST['frio_bg_image_option']);
+ PConfig::set(local_user(), 'frio', 'scheme', defaults($_POST, 'frio_scheme', ''));
+ PConfig::set(local_user(), 'frio', 'nav_bg', defaults($_POST, 'frio_nav_bg', ''));
+ PConfig::set(local_user(), 'frio', 'nav_icon_color', defaults($_POST, 'frio_nav_icon_color', ''));
+ PConfig::set(local_user(), 'frio', 'link_color', defaults($_POST, 'frio_link_color', ''));
+ PConfig::set(local_user(), 'frio', 'background_color', defaults($_POST, 'frio_background_color', ''));
+ PConfig::set(local_user(), 'frio', 'contentbg_transp', defaults($_POST, 'frio_contentbg_transp', ''));
+ PConfig::set(local_user(), 'frio', 'background_image', defaults($_POST, 'frio_background_image', ''));
+ PConfig::set(local_user(), 'frio', 'bg_image_option', defaults($_POST, 'frio_bg_image_option', ''));
PConfig::set(local_user(), 'frio', 'css_modified', time());
}
}
function theme_admin_post(App $a)
{
- if (!local_user()) {
+ if (!is_site_admin()) {
return;
}
if (isset($_POST['frio-settings-submit'])) {
- Config::set('frio', 'scheme', $_POST['frio_scheme']);
- Config::set('frio', 'nav_bg', $_POST['frio_nav_bg']);
- Config::set('frio', 'nav_icon_color', $_POST['frio_nav_icon_color']);
- Config::set('frio', 'link_color', $_POST['frio_link_color']);
- Config::set('frio', 'background_color', $_POST['frio_background_color']);
- Config::set('frio', 'contentbg_transp', $_POST['frio_contentbg_transp']);
- Config::set('frio', 'background_image', $_POST['frio_background_image']);
- Config::set('frio', 'bg_image_option', $_POST['frio_bg_image_option']);
- Config::set('frio', 'login_bg_image', $_POST['frio_login_bg_image']);
- Config::set('frio', 'login_bg_color', $_POST['frio_login_bg_color']);
+ Config::set('frio', 'scheme', defaults($_POST, 'frio_scheme', ''));
+ Config::set('frio', 'nav_bg', defaults($_POST, 'frio_nav_bg', ''));
+ Config::set('frio', 'nav_icon_color', defaults($_POST, 'frio_nav_icon_color', ''));
+ Config::set('frio', 'link_color', defaults($_POST, 'frio_link_color', ''));
+ Config::set('frio', 'background_color', defaults($_POST, 'frio_background_color', ''));
+ Config::set('frio', 'contentbg_transp', defaults($_POST, 'frio_contentbg_transp', ''));
+ Config::set('frio', 'background_image', defaults($_POST, 'frio_background_image', ''));
+ Config::set('frio', 'bg_image_option', defaults($_POST, 'frio_bg_image_option', ''));
+ Config::set('frio', 'login_bg_image', defaults($_POST, 'frio_login_bg_image', ''));
+ Config::set('frio', 'login_bg_color', defaults($_POST, 'frio_login_bg_color', ''));
Config::set('frio', 'css_modified', time());
}
}
@@ -55,14 +56,17 @@ function theme_content(App $a)
}
$arr = [];
- $arr['scheme'] = PConfig::get(local_user(), 'frio', 'scheme');
- $arr['nav_bg'] = PConfig::get(local_user(), 'frio', 'nav_bg');
- $arr['nav_icon_color'] = PConfig::get(local_user(), 'frio', 'nav_icon_color');
- $arr['link_color'] = PConfig::get(local_user(), 'frio', 'link_color');
- $arr['bgcolor'] = PConfig::get(local_user(), 'frio', 'background_color');
- $arr['contentbg_transp'] = PConfig::get(local_user(), 'frio', 'contentbg_transp');
- $arr['background_image'] = PConfig::get(local_user(), 'frio', 'background_image');
- $arr['bg_image_option'] = PConfig::get(local_user(), 'frio', 'bg_image_option');
+ $node_scheme = Config::get('frio', 'scheme', Config::get('frio', 'scheme'));
+
+ $arr['scheme'] = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'schema', $node_scheme));
+ $arr['share_string'] = '';
+ $arr['nav_bg'] = PConfig::get(local_user(), 'frio', 'nav_bg' , Config::get('frio', 'nav_bg'));
+ $arr['nav_icon_color'] = PConfig::get(local_user(), 'frio', 'nav_icon_color' , Config::get('frio', 'nav_icon_color'));
+ $arr['link_color'] = PConfig::get(local_user(), 'frio', 'link_color' , Config::get('frio', 'link_color'));
+ $arr['background_color'] = PConfig::get(local_user(), 'frio', 'background_color', Config::get('frio', 'background_color'));
+ $arr['contentbg_transp'] = PConfig::get(local_user(), 'frio', 'contentbg_transp', Config::get('frio', 'contentbg_transp'));
+ $arr['background_image'] = PConfig::get(local_user(), 'frio', 'background_image', Config::get('frio', 'background_image'));
+ $arr['bg_image_option'] = PConfig::get(local_user(), 'frio', 'bg_image_option' , Config::get('frio', 'bg_image_option'));
return frio_form($arr);
}
@@ -74,16 +78,17 @@ function theme_admin(App $a)
}
$arr = [];
- $arr['scheme'] = Config::get('frio', 'scheme');
+ $arr['scheme'] = Config::get('frio', 'scheme', Config::get('frio', 'scheme'));
+ $arr['share_string'] = '';
$arr['nav_bg'] = Config::get('frio', 'nav_bg');
$arr['nav_icon_color'] = Config::get('frio', 'nav_icon_color');
$arr['link_color'] = Config::get('frio', 'link_color');
- $arr['bgcolor'] = Config::get('frio', 'background_color');
+ $arr['background_color'] = Config::get('frio', 'background_color');
$arr['contentbg_transp'] = Config::get('frio', 'contentbg_transp');
$arr['background_image'] = Config::get('frio', 'background_image');
$arr['bg_image_option'] = Config::get('frio', 'bg_image_option');
$arr['login_bg_image'] = Config::get('frio', 'login_bg_image');
- $arr['login_bg_color'] = Config::get('frio', 'login_bg_color');
+ $arr['login_bg_color'] = Config::get('frio', 'login_bg_color');
return frio_form($arr);
}
@@ -99,32 +104,33 @@ function frio_form($arr)
}
$scheme_choices = [];
- $scheme_choices['---'] = L10n::t('Default');
+ $scheme_choices['---'] = L10n::t('Custom');
$files = glob('view/theme/frio/scheme/*.php');
if ($files) {
foreach ($files as $file) {
$f = basename($file, '.php');
if ($f != 'default') {
- $scheme_name = $f;
+ $scheme_name = ucfirst($f);
$scheme_choices[$f] = $scheme_name;
}
}
}
- $background_image_help = '' . L10n::t('Note') . ': ' . L10n::t('Check image permissions if all users are allowed to visit the image');
+ $background_image_help = '' . L10n::t('Note') . ': ' . L10n::t('Check image permissions if all users are allowed to see the image');
- $t = get_markup_template('theme_settings.tpl');
+ $t = Renderer::getMarkupTemplate('theme_settings.tpl');
$ctx = [
'$submit' => L10n::t('Submit'),
- '$baseurl' => System::baseUrl(),
'$title' => L10n::t('Theme settings'),
- '$scheme' => ['frio_scheme', L10n::t('Select scheme'), $arr['scheme'], '', $scheme_choices],
+ '$scheme' => ['frio_scheme', L10n::t('Select color scheme'), $arr['scheme'], '', $scheme_choices],
+ '$share_string' => ['frio_share_string', L10n::t('Copy or paste schemestring'), $arr['share_string'], L10n::t('You can copy this string to share your theme with others. Pasting here applies the schemestring'), false, false],
'$nav_bg' => array_key_exists('nav_bg', $disable) ? '' : ['frio_nav_bg', L10n::t('Navigation bar background color'), $arr['nav_bg'], '', false],
'$nav_icon_color' => array_key_exists('nav_icon_color', $disable) ? '' : ['frio_nav_icon_color', L10n::t('Navigation bar icon color '), $arr['nav_icon_color'], '', false],
'$link_color' => array_key_exists('link_color', $disable) ? '' : ['frio_link_color', L10n::t('Link color'), $arr['link_color'], '', false],
- '$bgcolor' => array_key_exists('bgcolor', $disable) ? '' : ['frio_background_color', L10n::t('Set the background color'), $arr['bgcolor'], '', false],
- '$contentbg_transp' => array_key_exists('contentbg_transp', $disable) ? '' : ['frio_contentbg_transp', L10n::t('Content background opacity'), ((isset($arr['contentbg_transp']) && $arr['contentbg_transp'] != '') ? $arr['contentbg_transp'] : 100), ''],
+ '$background_color' => array_key_exists('background_color', $disable) ? '' : ['frio_background_color', L10n::t('Set the background color'), $arr['background_color'], '', false],
+ '$contentbg_transp' => array_key_exists('contentbg_transp', $disable) ? '' : ['frio_contentbg_transp', L10n::t('Content background opacity'), defaults($arr, 'contentbg_transp', 100), ''],
'$background_image' => array_key_exists('background_image', $disable) ? '' : ['frio_background_image', L10n::t('Set the background image'), $arr['background_image'], $background_image_help, false],
+ '$bg_image_options_title' => L10n::t('Background image style'),
'$bg_image_options' => Image::get_options($arr),
];
@@ -136,7 +142,7 @@ function frio_form($arr)
$ctx['$login_bg_color'] = ['frio_login_bg_color', L10n::t('Login page background color'), $arr['login_bg_color'], L10n::t('Leave background image and color empty for theme defaults'), false];
}
- $o = replace_macros($t, $ctx);
+ $o = Renderer::replaceMacros($t, $ctx);
return $o;
}