X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=view%2Ftheme%2Ffrio%2Fconfig.php;h=95d9a0e4eca507efe915be1b6df5e02f7868f9c5;hb=6c36fd9e01510a14fea9de766b4afe6760912a2e;hp=8bab362ff92812cf5183b1da737a13aa16c58438;hpb=9b5bef6deaf75514cb967f51f56ec357a8b53b2b;p=friendica.git

diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php
index 8bab362ff9..95d9a0e4ec 100644
--- a/view/theme/frio/config.php
+++ b/view/theme/frio/config.php
@@ -2,9 +2,8 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
-use Friendica\Core\System;
+use Friendica\Core\Renderer;
+use Friendica\DI;
 
 require_once 'view/theme/frio/php/Image.php';
 
@@ -15,36 +14,38 @@ function theme_post(App $a)
 	}
 
 	if (isset($_POST['frio-settings-submit'])) {
-		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());
+		DI::pConfig()->set(local_user(), 'frio', 'scheme',           $_POST['frio_scheme']           ?? '');
+		DI::pConfig()->set(local_user(), 'frio', 'nav_bg',           $_POST['frio_nav_bg']           ?? '');
+		DI::pConfig()->set(local_user(), 'frio', 'nav_icon_color',   $_POST['frio_nav_icon_color']   ?? '');
+		DI::pConfig()->set(local_user(), 'frio', 'link_color',       $_POST['frio_link_color']       ?? '');
+		DI::pConfig()->set(local_user(), 'frio', 'background_color', $_POST['frio_background_color'] ?? '');
+		DI::pConfig()->set(local_user(), 'frio', 'contentbg_transp', $_POST['frio_contentbg_transp'] ?? '');
+		DI::pConfig()->set(local_user(), 'frio', 'background_image', $_POST['frio_background_image'] ?? '');
+		DI::pConfig()->set(local_user(), 'frio', 'bg_image_option',  $_POST['frio_bg_image_option']  ?? '');
+		DI::pConfig()->set(local_user(), 'frio', 'css_modified',     time());
+		DI::pConfig()->set(local_user(), 'frio', 'enable_compose',   $_POST['frio_enable_compose']   ?? 0);
 	}
 }
 
 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',           $_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', 'css_modified',     time());
+		Config::set('frio', 'enable_compose',   $_POST['frio_enable_compose']   ?? 0);
 	}
 }
 
@@ -55,14 +56,18 @@ function theme_content(App $a)
 	}
 	$arr = [];
 
-	$arr['scheme']           = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'schema'));
-	$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['background_color'] = 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 = DI::config()->get('frio', 'scheme', DI::config()->get('frio', 'scheme'));
+
+	$arr['scheme']           = DI::pConfig()->get(local_user(), 'frio', 'scheme', DI::pConfig()->get(local_user(), 'frio', 'schema', $node_scheme));
+	$arr['share_string']     = '';
+	$arr['nav_bg']           = DI::pConfig()->get(local_user(), 'frio', 'nav_bg'          , DI::config()->get('frio', 'nav_bg'));
+	$arr['nav_icon_color']   = DI::pConfig()->get(local_user(), 'frio', 'nav_icon_color'  , DI::config()->get('frio', 'nav_icon_color'));
+	$arr['link_color']       = DI::pConfig()->get(local_user(), 'frio', 'link_color'      , DI::config()->get('frio', 'link_color'));
+	$arr['background_color'] = DI::pConfig()->get(local_user(), 'frio', 'background_color', DI::config()->get('frio', 'background_color'));
+	$arr['contentbg_transp'] = DI::pConfig()->get(local_user(), 'frio', 'contentbg_transp', DI::config()->get('frio', 'contentbg_transp'));
+	$arr['background_image'] = DI::pConfig()->get(local_user(), 'frio', 'background_image', DI::config()->get('frio', 'background_image'));
+	$arr['bg_image_option']  = DI::pConfig()->get(local_user(), 'frio', 'bg_image_option' , DI::config()->get('frio', 'bg_image_option'));
+	$arr['enable_compose']   = DI::pConfig()->get(local_user(), 'frio', 'enable_compose'  , DI::config()->get('frio', 'enable_compose'));
 
 	return frio_form($arr);
 }
@@ -74,16 +79,18 @@ function theme_admin(App $a)
 	}
 	$arr = [];
 
-	$arr['scheme']           = Config::get('frio', 'scheme', Config::get('frio', 'scheme'));
-	$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['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['scheme']           = DI::config()->get('frio', 'scheme', DI::config()->get('frio', 'schema'));
+	$arr['share_string']     = '';
+	$arr['nav_bg']           = DI::config()->get('frio', 'nav_bg');
+	$arr['nav_icon_color']   = DI::config()->get('frio', 'nav_icon_color');
+	$arr['link_color']       = DI::config()->get('frio', 'link_color');
+	$arr['background_color'] = DI::config()->get('frio', 'background_color');
+	$arr['contentbg_transp'] = DI::config()->get('frio', 'contentbg_transp');
+	$arr['background_image'] = DI::config()->get('frio', 'background_image');
+	$arr['bg_image_option']  = DI::config()->get('frio', 'bg_image_option');
+	$arr['login_bg_image']   = DI::config()->get('frio', 'login_bg_image');
+	$arr['login_bg_color']   = DI::config()->get('frio', 'login_bg_color');
+	$arr['enable_compose']   = DI::config()->get('frio', 'enable_compose');
 
 	return frio_form($arr);
 }
@@ -99,7 +106,7 @@ function frio_form($arr)
 	}
 
 	$scheme_choices = [];
-	$scheme_choices['---'] = L10n::t('Custom');
+	$scheme_choices['---'] = DI::l10n()->t('Custom');
 	$files = glob('view/theme/frio/scheme/*.php');
 	if ($files) {
 		foreach ($files as $file) {
@@ -111,33 +118,34 @@ function frio_form($arr)
 		}
 	}
 
-	$background_image_help = '<strong>' . L10n::t('Note') . ': </strong>' . L10n::t('Check image permissions if all users are allowed to see the image');
+	$background_image_help = '<strong>' . DI::l10n()->t('Note') . ': </strong>' . DI::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 color scheme'), $arr['scheme'], '', $scheme_choices],
-		'$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],
-		'$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'),
+		'$submit'           => DI::l10n()->t('Submit'),
+		'$title'            => DI::l10n()->t('Theme settings'),
+		'$scheme'           => ['frio_scheme', DI::l10n()->t('Select color scheme'), $arr['scheme'], '', $scheme_choices],
+		'$share_string'     => ['frio_share_string', DI::l10n()->t('Copy or paste schemestring'), $arr['share_string'], DI::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', DI::l10n()->t('Navigation bar background color'), $arr['nav_bg'], '', false],
+		'$nav_icon_color'   => array_key_exists('nav_icon_color', $disable) ? '' : ['frio_nav_icon_color', DI::l10n()->t('Navigation bar icon color '), $arr['nav_icon_color'], '', false],
+		'$link_color'       => array_key_exists('link_color', $disable) ? '' : ['frio_link_color', DI::l10n()->t('Link color'), $arr['link_color'], '', false],
+		'$background_color' => array_key_exists('background_color', $disable) ? '' : ['frio_background_color', DI::l10n()->t('Set the background color'), $arr['background_color'], '', false],
+		'$contentbg_transp' => array_key_exists('contentbg_transp', $disable) ? '' : ['frio_contentbg_transp', DI::l10n()->t('Content background opacity'), ($arr['contentbg_transp'] ?? 0) ?: 100, ''],
+		'$background_image' => array_key_exists('background_image', $disable) ? '' : ['frio_background_image', DI::l10n()->t('Set the background image'), $arr['background_image'], $background_image_help, false],
+		'$bg_image_options_title' => DI::l10n()->t('Background image style'),
 		'$bg_image_options' => Image::get_options($arr),
+		'$enable_compose'   => ['frio_enable_compose', DI::l10n()->t('Enable Compose page'), $arr['enable_compose'], DI::l10n()->t('This replaces the jot modal window for writing new posts with a link to <a href="compose">the new Compose page</a>.')],
 	];
 
 	if (array_key_exists('login_bg_image', $arr) && !array_key_exists('login_bg_image', $disable)) {
-		$ctx['$login_bg_image'] = ['frio_login_bg_image', L10n::t('Login page background image'), $arr['login_bg_image'], $background_image_help, false];
+		$ctx['$login_bg_image'] = ['frio_login_bg_image', DI::l10n()->t('Login page background image'), $arr['login_bg_image'], $background_image_help, false];
 	}
 
 	if (array_key_exists('login_bg_color', $arr) && !array_key_exists('login_bg_color', $disable)) {
-		$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];
+		$ctx['$login_bg_color'] = ['frio_login_bg_color', DI::l10n()->t('Login page background color'), $arr['login_bg_color'], DI::l10n()->t('Leave background image and color empty for theme defaults'), false];
 	}
 
-	$o = replace_macros($t, $ctx);
+	$o = Renderer::replaceMacros($t, $ctx);
 
 	return $o;
 }