From a4823269301773c9894cc59f0bb38875f079b519 Mon Sep 17 00:00:00 2001 From: fusionate Date: Tue, 18 Mar 2025 18:04:49 -0600 Subject: [PATCH] Default/Domain/User Settings - List & Edit: Do not mask new input_text_font_password setting. --- core/default_settings/default_setting_edit.php | 2 +- core/default_settings/default_settings.php | 8 ++++---- core/domain_settings/domain_setting_edit.php | 2 +- core/domain_settings/domain_settings.php | 2 +- core/user_settings/user_setting_edit.php | 2 +- core/user_settings/user_settings.php | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php index cb0c89a500..63a3d73d45 100644 --- a/core/default_settings/default_setting_edit.php +++ b/core/default_settings/default_setting_edit.php @@ -518,7 +518,7 @@ echo " \n"; echo " \n"; } - elseif ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text") { + elseif ($subcategory == 'password' || (substr_count($subcategory, '_password') > 0 && $subcategory != 'input_text_font_password') || $category == "login" && $subcategory == "password_reset_key" && $name == "text") { echo " \n"; } elseif (substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) { diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php index 496b384ccf..b4ac145677 100644 --- a/core/default_settings/default_settings.php +++ b/core/default_settings/default_settings.php @@ -208,7 +208,7 @@ //add custom to the list of categories $categories['custom']['formatted'] = $text['label-custom']; $categories['custom']['count'] = null; - + //add the other catefories to the array foreach ($default_setting_categories as $default_setting_category => $quantity) { $category = strtolower($default_setting_category); @@ -398,7 +398,7 @@ if ($row['default_setting_value'] !== $field['default_setting_value']) { $setting_bold = 'font-weight:bold;'; } - + //set the default value if (!empty($field['default_setting_value'])) { $default_value = 'Default: '.$field['default_setting_value']; @@ -406,7 +406,7 @@ else { $default_value = 'Default: null'; } - + //check if default enabled if ($row['default_setting_enabled'] == $field['default_setting_enabled']) { if ($custom_settings) { continue; } @@ -529,7 +529,7 @@ else if ($category == 'theme' && $subcategory == 'custom_css_code' && $name == 'text') { echo " [...]\n"; } - else if ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || substr_count($subcategory, '_key') > 0 || substr_count($subcategory, '_secret') > 0) { + else if ($subcategory == 'password' || (substr_count($subcategory, '_password') > 0 && $subcategory != 'input_text_font_password') || substr_count($subcategory, '_key') > 0 || substr_count($subcategory, '_secret') > 0) { echo " ".str_repeat('*', 10); //use the same number of characters to mask the password length } else if ($category == 'theme' && $subcategory == 'button_icons' && $name == 'text') { diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php index 714135b565..e27048f11d 100644 --- a/core/domain_settings/domain_setting_edit.php +++ b/core/domain_settings/domain_setting_edit.php @@ -565,7 +565,7 @@ echo " \n"; echo " \n"; } - elseif ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text") { + elseif ($subcategory == 'password' || (substr_count($subcategory, '_password') > 0 && $subcategory != 'input_text_font_password') || $category == "login" && $subcategory == "password_reset_key" && $name == "text") { echo " \n"; } elseif ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) { diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php index b98519d69e..f772f503f4 100644 --- a/core/domain_settings/domain_settings.php +++ b/core/domain_settings/domain_settings.php @@ -320,7 +320,7 @@ ) { echo " ".$text['label-'.escape($row['domain_setting_value'])]; } - else if ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || substr_count($subcategory, '_key') || substr_count($subcategory, '_secret') > 0) { + else if ($subcategory == 'password' || (substr_count($subcategory, '_password') > 0 && $subcategory != 'input_text_font_password') || substr_count($subcategory, '_key') || substr_count($subcategory, '_secret') > 0) { echo " ".str_repeat('*', strlen(escape($row['domain_setting_value']))); } else if ($category == 'theme' && $subcategory == 'button_icons' && $name == 'text') { diff --git a/core/user_settings/user_setting_edit.php b/core/user_settings/user_setting_edit.php index 51ab3ca2a0..a27d0267c3 100644 --- a/core/user_settings/user_setting_edit.php +++ b/core/user_settings/user_setting_edit.php @@ -544,7 +544,7 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) { echo " \n"; echo " \n"; } - else if ($user_setting_subcategory == 'password' || substr_count($user_setting_subcategory, '_password') > 0 || $user_setting_category == "login" && $user_setting_subcategory == "password_reset_key" && $user_setting_name == "text") { + else if ($user_setting_subcategory == 'password' || (substr_count($user_setting_subcategory, '_password') > 0 && $user_setting_subcategory != 'input_text_font_password') || $user_setting_category == "login" && $user_setting_subcategory == "password_reset_key" && $user_setting_name == "text") { echo " \n"; } else if ($user_setting_category == "theme" && substr_count($user_setting_subcategory, "_color") > 0 && ($user_setting_name == "text" || $user_setting_name == 'array')) { diff --git a/core/user_settings/user_settings.php b/core/user_settings/user_settings.php index a77d0b249a..e117c3ed9e 100644 --- a/core/user_settings/user_settings.php +++ b/core/user_settings/user_settings.php @@ -320,7 +320,7 @@ ) { echo " ".$text['label-'.escape($row['user_setting_value'])]; } - else if ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || substr_count($subcategory, '_key') || substr_count($subcategory, '_secret') > 0) { + else if ($subcategory == 'password' || (substr_count($subcategory, '_password') > 0 && $subcategory != 'input_text_font_password') || substr_count($subcategory, '_key') || substr_count($subcategory, '_secret') > 0) { echo " ".str_repeat('*', strlen(escape($row['user_setting_value']))); } else if ($category == 'theme' && $subcategory == 'button_icons' && $name == 'text') {