From b1ddaecccc3d92519775c19b86ebefb6cef6fb51 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Tue, 19 Mar 2024 10:50:24 +0100 Subject: [PATCH] #12997 remove skins from every site --- pandora_console/godmode/users/configure_user.php | 14 ++++++-------- pandora_console/godmode/users/user_management.php | 8 ++++---- pandora_console/include/constants.php | 4 ++++ pandora_console/operation/users/user_edit.php | 10 +++++----- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index 633495a4df..7f6bf069ef 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -40,8 +40,6 @@ require_once $config['homedir'].'/include/functions_visual_map.php'; require_once $config['homedir'].'/include/functions_custom_fields.php'; enterprise_include_once('include/functions_profile.php'); -$isFunctionSkins = enterprise_include_once('include/functions_skins.php'); - // Add the columns for the enterprise Pandora edition. $enterprise_include = false; if (ENTERPRISE_NOT_HOOK !== enterprise_include('include/functions_policies.php')) { @@ -1306,12 +1304,12 @@ if ($new_user) { if (is_metaconsole() === false) { // User only can change skins if has more than one group. - if (function_exists('skins_print_select')) { - if (count($usr_groups) > 1) { - if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) { - $skin = '

'.__('Skin').'

'; - $skin .= skins_print_select($id_usr, 'skin', $user_info['id_skin'], '', __('None'), 0, true).'
'; - } + if (count($usr_groups) > 1) { + if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) { + $skin = '

'.__('Skin').'

'; + $skins[DEFAULT_THEME] = __('Default theme'); + $skins[BLACK_THEME] = __('Black theme'); + $skin .= html_print_select($skins, 'skin', $user_info['id_skin'], '', __('None'), 0, true).'
'; } } } diff --git a/pandora_console/godmode/users/user_management.php b/pandora_console/godmode/users/user_management.php index cb251ebb18..7b400085a6 100644 --- a/pandora_console/godmode/users/user_management.php +++ b/pandora_console/godmode/users/user_management.php @@ -720,10 +720,10 @@ if (is_metaconsole() === true) { $userManagementTable->data['line2_looknfeel'][1] = $outputMetaAccess[1]; } } else { - if (function_exists('skins_print_select')) { - $userManagementTable->data['line1_looknfeel'][1] = __('User color scheme').$hin_change_theme; - $userManagementTable->data['line2_looknfeel'][1] = skins_print_select($id_usr, 'skin', $user_info['id_skin'], '', __('None'), 0, true); - } + $userManagementTable->data['line1_looknfeel'][1] = __('User color scheme').$hin_change_theme; + $skins[DEFAULT_THEME] = __('Default theme'); + $skins[BLACK_THEME] = __('Black theme'); + $userManagementTable->data['line2_looknfeel'][1] = html_print_select($skins, 'skin', $user_info['id_skin'], '', __('None'), 0, true); } $performance_variables_control = (array) json_decode(io_safe_output($config['performance_variables_control'])); diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php index 4c640ec3b6..be001f2d3e 100644 --- a/pandora_console/include/constants.php +++ b/pandora_console/include/constants.php @@ -300,6 +300,10 @@ define('HEADER_LOGO_DEFAULT_COLLAPSED', 'logo-default-pandorafms-collapsed.png') define('HEADER_LOGO_BLACK_CLASSIC', 'logo-black-pandorafms.png'); define('HEADER_LOGO_BLACK_COLLAPSED', 'logo-default-pandorafms-collapsed.png'); +// Pandora Themes. +define('DEFAULT_THEME', 1); +define('BLACK_THEME', 2); + // Status images. // For modules. define('STATUS_MODULE_OK', 'module_ok.png'); diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php index 31a0463de2..7f77a09f93 100644 --- a/pandora_console/operation/users/user_edit.php +++ b/pandora_console/operation/users/user_edit.php @@ -516,11 +516,11 @@ $skin = ''; $home_screen .= html_print_input_text('data_section', $user_info['data_section'], '', 60, 255, true, false); // User only can change skins if has more than one group. - if (function_exists('skins_print_select')) { - if (count($usr_groups) > 1) { - $skin = '

'.__('Theme').':

'; - $skin .= skins_print_select($id_usr, 'skin', $user_info['id_skin'], '', __('None'), 0, true).'
'; - } + if (count($usr_groups) > 1) { + $skin = '

'.__('Theme').':

'; + $skins[DEFAULT_THEME] = __('Default theme'); + $skins[BLACK_THEME] = __('Black theme'); + $skin .= html_print_select($id_usr, 'skin', $user_info['id_skin'], '', __('None'), 0, true).'
'; }