From 02ef222fe106b4938a36489bf69bff604a7739cf Mon Sep 17 00:00:00 2001 From: rabuzarus Date: Mon, 12 Feb 2018 16:50:05 +0100 Subject: [PATCH] fix undeclared variables or wrong variable names (/view) --- view/theme/duepuntozero/config.php | 3 +-- view/theme/frio/config.php | 18 +++++++++--------- view/theme/quattro/config.php | 2 +- view/theme/vier/config.php | 4 ++-- view/theme/vier/theme.php | 4 ++-- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/view/theme/duepuntozero/config.php b/view/theme/duepuntozero/config.php index 30eb256237..d8323225d5 100644 --- a/view/theme/duepuntozero/config.php +++ b/view/theme/duepuntozero/config.php @@ -67,8 +67,7 @@ function clean_form(App $a, &$colorset, $user) } $t = get_markup_template("theme_settings.tpl"); - /// @TODO No need for adding string here, $o is not defined - $o .= replace_macros($t, [ + $o = replace_macros($t, [ '$submit' => L10n::t('Submit'), '$baseurl' => System::baseUrl(), '$title' => L10n::t("Theme settings"), diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php index b4161177b7..9081d9df47 100644 --- a/view/theme/frio/config.php +++ b/view/theme/frio/config.php @@ -114,24 +114,24 @@ function frio_form($arr) { '$baseurl' => System::baseUrl(), '$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']], - '$nav_icon_color' => array_key_exists("nav_icon_color", $disable) ? "" : ['frio_nav_icon_color', L10n::t('Navigation bar icon color '), $arr['nav_icon_color']], - '$link_color' => array_key_exists("link_color", $disable) ? "" : ['frio_link_color', L10n::t('Link color'), $arr['link_color'], '', $link_colors], - '$bgcolor' => array_key_exists("bgcolor", $disable) ? "" : ['frio_background_color', L10n::t('Set the background color'), $arr['bgcolor']], - '$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], + '$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]; + $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')]; + $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 = replace_macros($t, $ctx); return $o; } diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php index b4c24a365b..562a9ff5f1 100644 --- a/view/theme/quattro/config.php +++ b/view/theme/quattro/config.php @@ -69,7 +69,7 @@ function quattro_form(App $a, $align, $color, $tfs, $pfs) { } $t = get_markup_template("theme_settings.tpl" ); - $o .= replace_macros($t, [ + $o = replace_macros($t, [ '$submit' => L10n::t('Submit'), '$baseurl' => System::baseUrl(), '$title' => L10n::t("Theme settings"), diff --git a/view/theme/vier/config.php b/view/theme/vier/config.php index 044c6445f2..80225eb08d 100644 --- a/view/theme/vier/config.php +++ b/view/theme/vier/config.php @@ -71,7 +71,7 @@ function theme_admin(App $a) { $helperlist = "https://forum.friendi.ca/profile/helpers"; $t = get_markup_template("theme_admin_settings.tpl"); - $o .= replace_macros($t, [ + $o = replace_macros($t, [ '$helperlist' => ['vier_helperlist', L10n::t('Comma separated list of helper forums'), $helperlist, '', ''], ]); @@ -115,7 +115,7 @@ function vier_form(App $a, $style, $show_pages, $show_profiles, $show_helpers, $ $show_or_not = ['0' => L10n::t("don't show"), '1' => L10n::t("show"),]; $t = get_markup_template("theme_settings.tpl"); - $o .= replace_macros($t, [ + $o = replace_macros($t, [ '$submit' => L10n::t('Submit'), '$baseurl' => System::baseUrl(), '$title' => L10n::t("Theme settings"), diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index 482c584be0..22345c2e1f 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -138,7 +138,7 @@ function vier_community_info() $show_lastusers = get_vier_config("show_lastusers", 1); // get_baseurl - $url = System::baseUrl($ssl_state); + $url = System::baseUrl(); $aside['$url'] = $url; // comunity_profiles @@ -247,7 +247,7 @@ function vier_community_info() $tpl = get_markup_template('widget_forumlist_right.tpl'); - $page .= replace_macros( + $page = replace_macros( $tpl, [ '$title' => L10n::t('Forums'),