Merge pull request #4440 from rabuzarus/20180211_-_fix_variables_part_two

[friendica.git] / view / theme / frio / config.php

diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php
index 8add86ea05ec85f76ab0c1efd15d74d7672fe15f..9081d9df47cb6c7c98244ad9673bf970a1307c00 100644 (file)
--- a/view/theme/frio/config.php
+++ b/view/theme/frio/config.php
@@ -2,10 +2,11 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 
-require_once('view/theme/frio/php/Image.php');
+require_once 'view/theme/frio/php/Image.php';
 
 function theme_post(App $a) {
        if (!local_user()) {
@@ -39,6 +40,8 @@ function theme_admin_post(App $a) {
                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());
        }
 }
@@ -47,7 +50,7 @@ function theme_content(App $a) {
        if (!local_user()) {
                return;
        }
-       $arr = array();
+       $arr = [];
 
        $arr["schema"]           = PConfig::get(local_user(), 'frio', 'schema');
        $arr["nav_bg"]           = PConfig::get(local_user(), 'frio', 'nav_bg');
@@ -65,7 +68,7 @@ function theme_admin(App $a) {
        if (!local_user()) {
                return;
        }
-       $arr = array();
+       $arr = [];
 
        $arr["schema"]           = Config::get('frio', 'schema');
        $arr["nav_bg"]           = Config::get('frio', 'nav_bg');
@@ -75,6 +78,8 @@ function theme_admin(App $a) {
        $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');
 
        return frio_form($arr);
 }
@@ -85,11 +90,11 @@ function frio_form($arr) {
        $scheme_info = get_schema_info($arr["schema"]);
        $disable = $scheme_info["overwrites"];
        if (!is_array($disable)) {
-               $disable = array();
+               $disable = [];
        }
 
-       $scheme_choices = array();
-       $scheme_choices["---"] = t("Default");
+       $scheme_choices = [];
+       $scheme_choices["---"] = L10n::t("Default");
        $files = glob('view/theme/frio/schema/*.php');
        if ($files) {
                foreach ($files as $file) {
@@ -101,22 +106,32 @@ function frio_form($arr) {
                }
        }
 
-       $background_image_help = "<strong>" . t("Note"). ": </strong>".t("Check image permissions if all users are allowed to visit the image");
+       $background_image_help = "<strong>" . L10n::t("Note"). ": </strong>".L10n::t("Check image permissions if all users are allowed to visit the image");
 
        $t = get_markup_template('theme_settings.tpl');
-       $o .= replace_macros($t, array(
-               '$submit'           => t('Submit'),
+       $ctx = [
+               '$submit'           => L10n::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),
+               '$title'            => L10n::t("Theme settings"),
+               '$schema'           => ['frio_schema', L10n::t("Select scheme"), $arr["schema"], '', $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],
+               '$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_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' => Image::get_options($arr),
-       ));
+       ];
+
+       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];
+       }
+       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];
+       }
+
+
+       $o = replace_macros($t, $ctx);
 
        return $o;
 }