From 630855586da32a9a81eb359c58162241031d97cb Mon Sep 17 00:00:00 2001 From: Alex <40072887+alexdcrane@users.noreply.github.com> Date: Thu, 26 Mar 2026 19:19:33 +0000 Subject: [PATCH] Delete setting_value_input_type (#7818) * Delete setting_value_input_type default setting * Update domain_setting_edit.php * Update default_setting_edit.php * Update app_config.php * Update app_defaults.php --- core/default_settings/app_config.php | 8 -------- core/default_settings/app_defaults.php | 9 ++++++++- core/default_settings/default_setting_edit.php | 6 ------ core/domain_settings/domain_setting_edit.php | 8 +------- core/user_settings/user_setting_edit.php | 8 +------- 5 files changed, 10 insertions(+), 29 deletions(-) diff --git a/core/default_settings/app_config.php b/core/default_settings/app_config.php index 7b9fb3be1..c45d0b0c6 100644 --- a/core/default_settings/app_config.php +++ b/core/default_settings/app_config.php @@ -313,14 +313,6 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Destination after login"; $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "47b951c9-b339-4733-9104-a979f6e2f551"; - $apps[$x]['default_settings'][$y]['default_setting_category'] = "domain"; - $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "setting_value_input_type"; - $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; - $apps[$x]['default_settings'][$y]['default_setting_value'] = "textarea"; - $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; - $apps[$x]['default_settings'][$y]['default_setting_description'] = ""; - $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "2e217303-53ff-4dda-b74e-7f07738d83c2"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "editor"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "font_size"; diff --git a/core/default_settings/app_defaults.php b/core/default_settings/app_defaults.php index f8ef77bf5..ee92fef11 100644 --- a/core/default_settings/app_defaults.php +++ b/core/default_settings/app_defaults.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2019 + Portions created by the Initial Developer are Copyright (C) 2008-2026 the Initial Developer. All Rights Reserved. Contributor(s): @@ -515,6 +515,13 @@ $database->execute($sql); unset($sql); + // Delete setting_value_input_type + $sql = "delete from v_default_settings "; + $sql .= "where default_setting_category = 'domain' "; + $sql .= "and default_setting_subcategory = 'setting_value_input_type' "; + $database->execute($sql, null); + unset($sql); + } ?> diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php index a7e536976..0dfa1462e 100644 --- a/core/default_settings/default_setting_edit.php +++ b/core/default_settings/default_setting_edit.php @@ -512,12 +512,6 @@ echo " \n"; echo " \n"; } - elseif ($category == "domain" && $subcategory == "setting_value_input_type" && $name == "text" ) { - echo " \n"; - } elseif ($subcategory == 'password' || (substr_count($subcategory, '_password') > 0 && $subcategory != 'input_text_font_password') || $category == "login" && $subcategory == "password_reset_key" && $name == "text") { echo " \n"; } diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php index 0eb694a0a..8b5691933 100644 --- a/core/domain_settings/domain_setting_edit.php +++ b/core/domain_settings/domain_setting_edit.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2025 + Portions created by the Initial Developer are Copyright (C) 2008-2026 the Initial Developer. All Rights Reserved. Contributor(s): @@ -559,12 +559,6 @@ echo " \n"; echo " \n"; } - elseif ($category == "domain" && $subcategory == "setting_value_input_type" && $name == "text" ) { - echo " \n"; - } elseif ($subcategory == 'password' || (substr_count($subcategory, '_password') > 0 && $subcategory != 'input_text_font_password') || $category == "login" && $subcategory == "password_reset_key" && $name == "text") { echo " \n"; } diff --git a/core/user_settings/user_setting_edit.php b/core/user_settings/user_setting_edit.php index 1871de6f5..2925f5993 100644 --- a/core/user_settings/user_setting_edit.php +++ b/core/user_settings/user_setting_edit.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2023 + Portions created by the Initial Developer are Copyright (C) 2008-2026 the Initial Developer. All Rights Reserved. Contributor(s): @@ -524,12 +524,6 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) { echo " \n"; echo " \n"; } - else if ($user_setting_category == "domain" && $user_setting_subcategory == "setting_value_input_type" && $user_setting_name == "text" ) { - echo " \n"; - } 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"; }