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

diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php
index 6d6b7dee60..95d9a0e4ec 100644
--- a/view/theme/frio/config.php
+++ b/view/theme/frio/config.php
@@ -2,129 +2,150 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
-use Friendica\Core\System;
+use Friendica\Core\Renderer;
+use Friendica\DI;
 
-require_once('view/theme/frio/php/Image.php');
+require_once 'view/theme/frio/php/Image.php';
 
-function theme_post(App $a) {
+function theme_post(App $a)
+{
 	if (!local_user()) {
 		return;
 	}
 
 	if (isset($_POST['frio-settings-submit'])) {
-		PConfig::set(local_user(), 'frio', 'schema',           $_POST["frio_schema"]);
-		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', '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()) {
+function theme_admin_post(App $a)
+{
+	if (!is_site_admin()) {
 		return;
 	}
 
 	if (isset($_POST['frio-settings-submit'])) {
-		Config::set('frio', 'schema',           $_POST["frio_schema"]);
-		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', '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);
 	}
 }
 
-function theme_content(App $a) {
+function theme_content(App $a)
+{
 	if (!local_user()) {
 		return;
 	}
-	$arr = array();
+	$arr = [];
+
+	$node_scheme = DI::config()->get('frio', 'scheme', DI::config()->get('frio', 'scheme'));
 
-	$arr["schema"]           = 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["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');
+	$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);
 }
 
-function theme_admin(App $a) {
+function theme_admin(App $a)
+{
 	if (!local_user()) {
 		return;
 	}
-	$arr = array();
-
-	$arr["schema"]           = Config::get('frio', 'schema');
-	$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["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 = [];
+
+	$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);
 }
 
-function frio_form($arr) {
-	require_once("view/theme/frio/php/schema.php");
+function frio_form($arr)
+{
+	require_once 'view/theme/frio/php/scheme.php';
 
-	$scheme_info = get_schema_info($arr["schema"]);
-	$disable = $scheme_info["overwrites"];
+	$scheme_info = get_scheme_info($arr['scheme']);
+	$disable = $scheme_info['overwrites'];
 	if (!is_array($disable)) {
-		$disable = array();
+		$disable = [];
 	}
 
-	$scheme_choices = array();
-	$scheme_choices["---"] = t("Default");
-	$files = glob('view/theme/frio/schema/*.php');
+	$scheme_choices = [];
+	$scheme_choices['---'] = DI::l10n()->t('Custom');
+	$files = glob('view/theme/frio/scheme/*.php');
 	if ($files) {
 		foreach ($files as $file) {
-			$f = basename($file, ".php");
+			$f = basename($file, '.php');
 			if ($f != 'default') {
-				$scheme_name = $f;
+				$scheme_name = ucfirst($f);
 				$scheme_choices[$f] = $scheme_name;
 			}
 		}
 	}
 
-	$background_image_help = "<strong>" . t("Note"). ": </strong>".t("Check image permissions if all users are allowed to visit the image");
-
-	$t = get_markup_template('theme_settings.tpl');
-	$ctx = array(
-		'$submit'           => t('Submit'),
-		'$baseurl'          => System::baseUrl(),
-		'$title'            => t("Theme settings"),
-		'$schema'           => array('frio_schema', t("Select scheme"), $arr["schema"], '', $scheme_choices),
-		'$nav_bg'           => array_key_exists("nav_bg", $disable) ? "" : array('frio_nav_bg', t('Navigation bar background color'), $arr['nav_bg']),
-		'$nav_icon_color'   => array_key_exists("nav_icon_color", $disable) ? "" : array('frio_nav_icon_color', t('Navigation bar icon color '), $arr['nav_icon_color']),
-		'$link_color'       => array_key_exists("link_color", $disable) ? "" : array('frio_link_color', t('Link color'), $arr['link_color'], '', $link_colors),
-		'$bgcolor'          => array_key_exists("bgcolor", $disable) ? "" : array('frio_background_color', t('Set the background color'), $arr['bgcolor']),
-		'$contentbg_transp' => array_key_exists("contentbg_transp", $disable) ? "" : array('frio_contentbg_transp', t("Content background transparency"), ((isset($arr["contentbg_transp"]) && $arr["contentbg_transp"] != "") ? $arr["contentbg_transp"] : 100)),
-		'$background_image' => array_key_exists("background_image", $disable ) ? "" : array('frio_background_image', t('Set the background image'), $arr['background_image'], $background_image_help),
+	$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 = Renderer::getMarkupTemplate('theme_settings.tpl');
+	$ctx = [
+		'$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', DI::l10n()->t('Login page background image'), $arr['login_bg_image'], $background_image_help, false];
+	}
 
-	if ( array_key_exists("login_bg_image", $arr ) &&  !array_key_exists("login_bg_image", $disable ) ) { 
-		$ctx['$login_bg_image']  = array('frio_login_bg_image', t('Login page background image'), $arr['login_bg_image'], $background_image_help);
+	if (array_key_exists('login_bg_color', $arr) && !array_key_exists('login_bg_color', $disable)) {
+		$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;
 }