From bab3248d57dc7dfe09310ae0a03e4e4e5fb9d82c Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Wed, 15 Mar 2023 08:56:15 +0100 Subject: [PATCH 01/13] Monitor view with not normal at start --- .../operation/agentes/status_monitor.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index b1aff8bc72..6b25fd3ec2 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -152,6 +152,13 @@ if ($ag_freestring !== '' || $moduletype !== '' || $datatype !== '' $autosearch = true; } +// The execution has not been done manually. +$userRequest = (bool) get_parameter('uptbutton'); +if ($userRequest === false) { + $autosearch = true; + $status = AGENT_MODULE_STATUS_NOT_NORMAL; +} + if (is_metaconsole() === false) { $ag_group = (int) get_parameter('ag_group', 0); } else { @@ -2270,11 +2277,7 @@ if (empty($result) === false) { $tablePagination = ui_pagination($count_modules, false, $offset, 0, true, 'offset', false); } } else { - if ($first_interaction) { - ui_print_info_message(['no_close' => true, 'message' => __('This group doesn\'t have any monitor')]); - } else { - ui_print_info_message(['no_close' => true, 'message' => __('Sorry no search parameters')]); - } + ui_print_info_message(['no_close' => true, 'message' => __('Sorry no search parameters')]); } if (is_metaconsole() !== true) { From 8a7b60e983411e9ffe590bceeafc9eb1a328ccda Mon Sep 17 00:00:00 2001 From: Jonathan Date: Wed, 15 Mar 2023 09:58:56 +0100 Subject: [PATCH 02/13] PDF changes visual --- .../reporting/reporting_builder.main.php | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.main.php b/pandora_console/godmode/reporting/reporting_builder.main.php index 702a4e670b..44199148b6 100755 --- a/pandora_console/godmode/reporting/reporting_builder.main.php +++ b/pandora_console/godmode/reporting/reporting_builder.main.php @@ -176,6 +176,31 @@ if (is_metaconsole() === true) { ); } +if (is_metaconsole() === true) { + $table->data['description'][0] = __('Description'); + $table->data['description'][1] = html_print_textarea( + 'description', + 2, + 80, + $description, + '', + true + ); +} else { + $table->colspan[1][0] = 2; + $table->data[1][0] = html_print_label_input_block( + __('Description'), + html_print_textarea( + 'description', + 2, + 1, + $description, + '', + true + ) + ); +} + if ($report_id_user == $config['id_user'] || is_user_admin($config['id_user']) ) { @@ -222,7 +247,7 @@ if ($report_id_user == $config['id_user'] $table->data['access'][1] .= ''; $table->data['access'][1] .= ''; } else { - $table->data[1][0] = html_print_label_input_block( + $table->data[2][0] = html_print_label_input_block( __('Write Access').ui_print_help_tip( __('For example, you want a report that the people of "All" groups can see but you want to edit only for you or your group.'), true @@ -244,7 +269,7 @@ if ($report_id_user == $config['id_user'] $options['div_class'] = ''; } - $table->data[1][1] = html_print_label_input_block( + $table->data[2][1] = html_print_label_input_block( __('Group'), html_print_select_groups( false, @@ -277,7 +302,7 @@ if ($enterpriseEnable) { true ); } else { - $table->data[2][0] = html_print_label_input_block( + $table->data[2][1] = html_print_label_input_block( __('Non interactive report'), html_print_checkbox_switch( 'non_interactive', @@ -289,29 +314,6 @@ if ($enterpriseEnable) { } } -if (is_metaconsole() === true) { - $table->data['description'][0] = __('Description'); - $table->data['description'][1] = html_print_textarea( - 'description', - 2, - 80, - $description, - '', - true - ); -} else { - $table->data[2][1] = html_print_label_input_block( - __('Description'), - html_print_textarea( - 'description', - 2, - 1, - $description, - '', - true - ) - ); -} if (enterprise_installed() === true) { if (is_metaconsole() === true) { From 6ac41ed907c1de71532816f1480eb8f20145193c Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Wed, 15 Mar 2023 11:15:04 +0100 Subject: [PATCH 03/13] Icon added --- pandora_console/images/world@svg.svg | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 pandora_console/images/world@svg.svg diff --git a/pandora_console/images/world@svg.svg b/pandora_console/images/world@svg.svg new file mode 100644 index 0000000000..c71297eda4 --- /dev/null +++ b/pandora_console/images/world@svg.svg @@ -0,0 +1,9 @@ + + + + Dark / 20 / web@svg + Created with Sketch. + + + + \ No newline at end of file From 938e8cd777d47679cb8dc77768853db668a44a93 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Wed, 15 Mar 2023 11:30:22 +0100 Subject: [PATCH 04/13] Dashboards widgets --- pandora_console/include/ajax/module.php | 34 +++++++++++++++++-- pandora_console/include/functions_ui.php | 26 +++++++++++--- .../Dashboard/Widgets/AvgSumMaxMinModule.php | 22 ++++++------ .../lib/Dashboard/Widgets/ModulesByStatus.php | 28 +++++++++++++-- .../lib/Dashboard/Widgets/alerts_fired.php | 11 ++++-- .../lib/Dashboard/Widgets/module_icon.php | 22 ++++++------ .../lib/Dashboard/Widgets/module_status.php | 20 +++++------ .../lib/Dashboard/Widgets/module_value.php | 22 ++++++------ .../lib/Dashboard/Widgets/os_quick_report.php | 10 +++--- .../lib/Dashboard/Widgets/sla_percent.php | 22 ++++++------ pandora_console/include/styles/tables.css | 4 +++ 11 files changed, 151 insertions(+), 70 deletions(-) diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index 5b34b6860c..94e573c4bc 100755 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -1750,7 +1750,9 @@ if (check_login()) { INNER JOIN tagente ON tagente_modulo.id_agente = tagente.id_agente INNER JOIN tagente_estado - ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo' + ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo + WHERE %s', + $where ); $recordsTotal = db_get_value_sql($sql_count); @@ -1795,6 +1797,32 @@ if (check_login()) { } } + if (in_array(0, $servers_ids) === true) { + $sql = sprintf( + 'SELECT + tagente_modulo.nombre, + tagente.alias, + tagente.id_agente, + tagente_estado.last_status_change, + tagente_estado.estado + FROM tagente_modulo + INNER JOIN tagente + ON tagente_modulo.id_agente = tagente.id_agente + INNER JOIN tagente_estado + ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo + WHERE %s', + $where + ); + + $res_sql = db_get_all_rows_sql($sql); + + foreach ($res_sql as $row_sql) { + $row_sql['server_name'] = __('Metaconsole'); + $row_sql['server_url'] = $config['homeurl']; + array_push($data, $row_sql); + } + } + // Drop temporary table if exist. db_process_sql('DROP TEMPORARY TABLE IF EXISTS temp_modules_status;'); @@ -1852,7 +1880,9 @@ if (check_login()) { $sql_count = sprintf( 'SELECT COUNT(*) AS "total" - FROM temp_modules_status' + FROM temp_modules_status + WHERE %s', + $where ); $recordsTotal = db_get_value_sql($sql_count); diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 1c632d6f9e..89dc45d586 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -723,7 +723,23 @@ function ui_print_group_icon($id_group, $return=false, $path='', $style='', $lin $output .= ''.groups_get_name($id_group, true).' '; } else { if (empty($icon) === true) { - $output .= '  '; + $output .= ''; + $output .= ''; + $output .= html_print_image( + 'images/unknown@groups.svg', + true, + [ + 'style' => $style, + 'class' => 'main_menu_icon '.$class, + 'alt' => groups_get_name($id_group, true), + 'title' => groups_get_name($id_group, true), + ], + false, + false, + false, + true + ); + $output .= ''; } else { if (empty($class) === true) { $class = 'bot'; @@ -3879,8 +3895,8 @@ function ui_print_datatable(array $parameters) } $js .= 'if ($("#'.$table_id.' tr td").length == 1) { - $("div[id^=info_box_]").show(); - $("div[id^=info_box_]").removeClass(\'invisible_important\'); + $(".datatable-msg-info-'.$table_id.'").show(); + $(".datatable-msg-info-'.$table_id.'").removeClass(\'invisible_important\'); $("table#'.$table_id.'").hide(); $("div.dataTables_paginate").hide(); $("div.dataTables_info").hide(); @@ -3891,7 +3907,7 @@ function ui_print_datatable(array $parameters) $(".dataTables_paginate.paging_simple_numbers").show() } } else { - $("div[id^=info_box_]").hide(); + $(".datatable-msg-info-'.$table_id.'").hide(); $("table#'.$table_id.'").show(); $("div.dataTables_paginate").show(); $("div.dataTables_info").show(); @@ -4028,7 +4044,7 @@ function ui_print_datatable(array $parameters) // Order. $info_msg_arr = []; $info_msg_arr['message'] = $emptyTable; - $info_msg_arr['div_class'] = 'info_box_container invisible_important'; + $info_msg_arr['div_class'] = 'info_box_container invisible_important datatable-msg-info-'.$table_id; $info_msg = '
'.ui_print_info_message($info_msg_arr).'
'; $err_msg = '
'; diff --git a/pandora_console/include/lib/Dashboard/Widgets/AvgSumMaxMinModule.php b/pandora_console/include/lib/Dashboard/Widgets/AvgSumMaxMinModule.php index cf7edb70c6..033761afdf 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/AvgSumMaxMinModule.php +++ b/pandora_console/include/lib/Dashboard/Widgets/AvgSumMaxMinModule.php @@ -316,8 +316,8 @@ class AvgSumMaxMinModule extends Widget $values['unit'] = $decoder['unit']; } - if (isset($decoder['layout']) === true) { - $values['layout'] = $decoder['layout']; + if (isset($decoder['horizontal']) === true) { + $values['horizontal'] = $decoder['horizontal']; } return $values; @@ -505,14 +505,14 @@ class AvgSumMaxMinModule extends Widget ], ]; - // Layout. + // Horizontal. $inputs[] = [ - 'label' => __('Layout').ui_print_help_tip(__('Off: vertical. On: horizontal'), true), + 'label' => __('Horizontal').ui_print_help_tip(__('If not, layout is vertical'), true), 'arguments' => [ 'wrapper' => 'div', - 'name' => 'layout', + 'name' => 'horizontal', 'type' => 'switch', - 'value' => $values['layout'], + 'value' => $values['horizontal'], 'return' => true, ], ]; @@ -541,7 +541,7 @@ class AvgSumMaxMinModule extends Widget $values['sizeLabel'] = \get_parameter_switch('sizeLabel'); $values['text_color'] = \get_parameter('text_color', 0); $values['unit'] = \get_parameter_switch('unit'); - $values['layout'] = \get_parameter_switch('layout'); + $values['horizontal'] = \get_parameter_switch('horizontal'); return $values; } @@ -643,8 +643,8 @@ class AvgSumMaxMinModule extends Widget $output .= '
'; $orientation = ''; - if ((int) $this->values['layout'] === 1) { - $orientation = 'flex'; + if ((int) $this->values['horizontal'] === 1) { + $orientation = 'flex aligni_center'; } else { $orientation = 'grid'; } @@ -653,7 +653,7 @@ class AvgSumMaxMinModule extends Widget $output .= '
'; // Div value. - $output .= '
'; + $output .= '
'; if (is_numeric($data) === true) { $dataDatos = remove_right_zeros( @@ -679,7 +679,7 @@ class AvgSumMaxMinModule extends Widget if (empty($label) === false) { // Div Label. - $output .= '
'.$label.'
'; + $output .= '
'.$label.'
'; } $output .= '
'; diff --git a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php index 21fa53d21c..2944663135 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php +++ b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php @@ -179,7 +179,7 @@ class ModulesByStatus extends Widget // This forces at least a first configuration. // This forces at least a first configuration. $this->configurationRequired = false; - if (empty($this->values['status']) === true) { + if (empty($this->values['status']) === true && $this->values['status'] !== '0') { $this->configurationRequired = true; } @@ -311,6 +311,8 @@ class ModulesByStatus extends Widget $nodes_fields[$server['id']] = $server['server_name']; } + $nodes_fields[0] = __('Metaconsola'); + $nodes_selected = explode(',', $values['nodes']); (isset($values['nodes']) === false) ? $nodes_selected = $servers_ids : ''; @@ -369,6 +371,8 @@ class ModulesByStatus extends Widget { $this->size = parent::getSize(); + global $config; + $output = ''; if (is_metaconsole() === true) { @@ -413,7 +417,7 @@ class ModulesByStatus extends Widget [ 'id' => $tableId, 'class' => 'info_table align-left-important', - 'style' => 'width: 100%', + 'style' => 'width: 99%', 'columns' => $columns, 'column_names' => $column_names, 'ajax_url' => 'include/ajax/module', @@ -430,6 +434,26 @@ class ModulesByStatus extends Widget 'direction' => 'desc', ], 'csv' => 0, + 'pagination_options' => [ + [ + 5, + 10, + 25, + 100, + 200, + 500, + 1000, + ], + [ + 5, + 10, + 25, + 100, + 200, + 500, + 1000, + ], + ], ] ); } catch (\Exception $e) { diff --git a/pandora_console/include/lib/Dashboard/Widgets/alerts_fired.php b/pandora_console/include/lib/Dashboard/Widgets/alerts_fired.php index 68107388b4..48eeefac75 100755 --- a/pandora_console/include/lib/Dashboard/Widgets/alerts_fired.php +++ b/pandora_console/include/lib/Dashboard/Widgets/alerts_fired.php @@ -284,11 +284,16 @@ class AlertsFiredWidget extends Widget if (isset($groups) === true && is_array($groups) === true) { $table = new \StdClass(); - $table->class = 'databox data'; + $table->class = 'databox data centered'; $table->cellspacing = '0'; - $table->width = '90%'; + $table->width = '100%'; $table->data = []; $table->size = []; + $table->style = []; + $table->style[0] = 'text-align: left;'; + $table->style[1] = 'text-align: left;'; + $table->style[2] = 'text-align: left;'; + $table->style[3] = 'text-align: left;'; $url = $config['homeurl']; $url .= 'index.php?sec=estado&sec2=operation/agentes/alerts_status'; @@ -335,7 +340,7 @@ class AlertsFiredWidget extends Widget if ($flag === true) { $height = (count($table->data) * 30); $style = 'min-width:300px; min-height:'.$height.'px;'; - $output .= '
'; + $output .= '
'; $output .= html_print_table($table, true); $output .= '
'; } else { diff --git a/pandora_console/include/lib/Dashboard/Widgets/module_icon.php b/pandora_console/include/lib/Dashboard/Widgets/module_icon.php index 316e8813b3..6790d70616 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/module_icon.php +++ b/pandora_console/include/lib/Dashboard/Widgets/module_icon.php @@ -305,8 +305,8 @@ class ModuleIconWidget extends Widget $values['imageSrc'] = $decoder['imageSrc']; } - if (isset($decoder['layout']) === true) { - $values['layout'] = $decoder['layout']; + if (isset($decoder['horizontal']) === true) { + $values['horizontal'] = $decoder['horizontal']; } return $values; @@ -486,14 +486,14 @@ class ModuleIconWidget extends Widget ], ]; - // Layout. + // Horizontal. $inputs[] = [ - 'label' => __('Layout').ui_print_help_tip(__('Off: vertical. On: horizontal'), true), + 'label' => __('Horizontal').ui_print_help_tip(__('If not, layout is vertical'), true), 'arguments' => [ 'wrapper' => 'div', - 'name' => 'layout', + 'name' => 'horizontal', 'type' => 'switch', - 'value' => $values['layout'], + 'value' => $values['horizontal'], 'return' => true, ], ]; @@ -520,7 +520,7 @@ class ModuleIconWidget extends Widget $values['sizeValue'] = \get_parameter('sizeValue', 0); $values['sizeLabel'] = \get_parameter_switch('sizeLabel'); $values['sizeIcon'] = \get_parameter_switch('sizeIcon'); - $values['layout'] = \get_parameter_switch('layout'); + $values['horizontal'] = \get_parameter_switch('horizontal'); return $values; } @@ -563,7 +563,7 @@ class ModuleIconWidget extends Widget $output .= '
'; $orientation = ''; - if ((int) $this->values['layout'] === 1) { + if ((int) $this->values['horizontal'] === 1) { $orientation = 'flex aligni_center'; } else { $orientation = 'grid'; @@ -596,7 +596,7 @@ class ModuleIconWidget extends Widget // Div image. $style_icon = 'flex: 0 1 '.$sizeIcon.'px;'; - $output .= '
'; + $output .= '
'; $output .= html_print_image( 'images/console/icons/'.$icon.$color_icon.'.png', true, @@ -604,7 +604,7 @@ class ModuleIconWidget extends Widget ); $output .= '
'; // Div value. - $output .= '
'; + $output .= '
'; $output .= remove_right_zeros( number_format($data_module, $config['graph_precision'], $config['decimal_separator'], $config['thousand_separator']) ).$unit; @@ -612,7 +612,7 @@ class ModuleIconWidget extends Widget if (empty($label) === false) { // Div Label. - $output .= '
'.$label.'
'; + $output .= '
'.$label.'
'; } $output .= '
'; diff --git a/pandora_console/include/lib/Dashboard/Widgets/module_status.php b/pandora_console/include/lib/Dashboard/Widgets/module_status.php index f8b7dda933..a9e72fd528 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/module_status.php +++ b/pandora_console/include/lib/Dashboard/Widgets/module_status.php @@ -300,8 +300,8 @@ class ModuleStatusWidget extends Widget $values['imageSrc'] = $decoder['imageSrc']; } - if (isset($decoder['layout']) === true) { - $values['layout'] = $decoder['layout']; + if (isset($decoder['horizontal']) === true) { + $values['horizontal'] = $decoder['horizontal']; } return $values; @@ -465,14 +465,14 @@ class ModuleStatusWidget extends Widget ], ]; - // Layout. + // Horizontal. $inputs[] = [ - 'label' => __('Layout').ui_print_help_tip(__('Off: vertical. On: horizontal'), true), + 'label' => __('Horizontal').ui_print_help_tip(__('If not, layout is vertical'), true), 'arguments' => [ 'wrapper' => 'div', - 'name' => 'layout', + 'name' => 'horizontal', 'type' => 'switch', - 'value' => $values['layout'], + 'value' => $values['horizontal'], 'return' => true, ], ]; @@ -499,7 +499,7 @@ class ModuleStatusWidget extends Widget $values['sizeValue'] = \get_parameter('sizeValue', 0); $values['sizeLabel'] = \get_parameter_switch('sizeLabel'); $values['sizeIcon'] = \get_parameter_switch('sizeIcon'); - $values['layout'] = \get_parameter_switch('layout'); + $values['horizontal'] = \get_parameter_switch('horizontal'); return $values; } @@ -560,7 +560,7 @@ class ModuleStatusWidget extends Widget $output .= '
'; $orientation = ''; - if ((int) $this->values['layout'] === 1) { + if ((int) $this->values['horizontal'] === 1) { $orientation = 'flex aligni_center'; } else { $orientation = 'grid'; @@ -570,7 +570,7 @@ class ModuleStatusWidget extends Widget $output .= '
'; // Div image. - $output .= '
'; + $output .= '
'; $output .= html_print_image( 'images/console/icons/'.$icon, true, @@ -580,7 +580,7 @@ class ModuleStatusWidget extends Widget if (empty($label) === false) { // Div Label. - $output .= '
'.$label.'
'; + $output .= '
'.$label.'
'; } $output .= '
'; diff --git a/pandora_console/include/lib/Dashboard/Widgets/module_value.php b/pandora_console/include/lib/Dashboard/Widgets/module_value.php index 818db36b92..83521f6b25 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/module_value.php +++ b/pandora_console/include/lib/Dashboard/Widgets/module_value.php @@ -284,8 +284,8 @@ class ModuleValueWidget extends Widget $values['sizeLabel'] = $decoder['sizeLabel']; } - if (isset($decoder['layout']) === true) { - $values['layout'] = $decoder['layout']; + if (isset($decoder['horizontal']) === true) { + $values['horizontal'] = $decoder['horizontal']; } return $values; @@ -389,14 +389,14 @@ class ModuleValueWidget extends Widget ], ]; - // Layout. + // Horizontal. $inputs[] = [ - 'label' => __('Layout').ui_print_help_tip(__('Off: vertical. On: horizontal'), true), + 'label' => __('Horizontal').ui_print_help_tip(__('If not, layout is vertical'), true), 'arguments' => [ 'wrapper' => 'div', - 'name' => 'layout', + 'name' => 'horizontal', 'type' => 'switch', - 'value' => $values['layout'], + 'value' => $values['horizontal'], 'return' => true, ], ]; @@ -421,7 +421,7 @@ class ModuleValueWidget extends Widget $values['moduleId'] = \get_parameter('moduleId', 0); $values['sizeValue'] = \get_parameter('sizeValue', 0); $values['sizeLabel'] = \get_parameter_switch('sizeLabel'); - $values['layout'] = \get_parameter_switch('layout'); + $values['horizontal'] = \get_parameter_switch('horizontal'); return $values; } @@ -471,8 +471,8 @@ class ModuleValueWidget extends Widget $output .= '
'; $orientation = ''; - if ((int) $this->values['layout'] === 1) { - $orientation = 'flex'; + if ((int) $this->values['horizontal'] === 1) { + $orientation = 'flex aligni_center'; } else { $orientation = 'grid'; } @@ -481,7 +481,7 @@ class ModuleValueWidget extends Widget $output .= '
'; // Div value. - $output .= '
'; + $output .= '
'; if (is_numeric($data_module) === true) { $dataDatos = remove_right_zeros( @@ -502,7 +502,7 @@ class ModuleValueWidget extends Widget if (empty($label) === false) { // Div Label. - $output .= '
'.$label.'
'; + $output .= '
'.$label.'
'; } $output .= '
'; diff --git a/pandora_console/include/lib/Dashboard/Widgets/os_quick_report.php b/pandora_console/include/lib/Dashboard/Widgets/os_quick_report.php index f775ec7444..cd500e2972 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/os_quick_report.php +++ b/pandora_console/include/lib/Dashboard/Widgets/os_quick_report.php @@ -300,18 +300,20 @@ class OsQuickReportWidget extends Widget $table->style[1] = 'background-color: '.$values['background'].';'; $table->style[2] = 'background-color: '.$values['background'].'; font-size: 1.5em; font-weight: bolder;'; $table->style[3] = 'background-color: '.$values['background'].'; font-size: 1.5em; font-weight: bolder;'; - $table->style[4] = 'background-color: '.$values['background'].'; font-size: 1.5em; font-weight: bolder;'; - $table->style[5] = 'background-color: '.$values['background'].'; font-size: 1.5em; font-weight: bolder;'; + $table->style[4] = 'background-color: '.$values['background'].';'; + $table->style[5] = 'background-color: '.$values['background'].';'; foreach ($result as $id => $os) { $data = []; + ($os['critical'] > 0) ? $color_critical = 'color: '.COL_CRITICAL.';' : $color_critical = ''; + ($os['unknown'] > 0) ? $color_unknown = 'color: '.COL_UNKNOWN.';' : $color_unknown = ''; $data[0] = ui_print_os_icon($id, false, true); $data[1] = $os['name']; $data[2] = $os['total']; $data[3] = $os['normal']; - $data[4] = $os['critical']; - $data[5] = $os['unknown']; + $data[4] = ''.$os['critical'].''; + $data[5] = ''.$os['unknown'].''; $table->data[] = $data; } diff --git a/pandora_console/include/lib/Dashboard/Widgets/sla_percent.php b/pandora_console/include/lib/Dashboard/Widgets/sla_percent.php index 874d07fee2..2e7483d58e 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/sla_percent.php +++ b/pandora_console/include/lib/Dashboard/Widgets/sla_percent.php @@ -289,8 +289,8 @@ class SLAPercentWidget extends Widget $values['period'] = $decoder['period']; } - if (isset($decoder['layout']) === true) { - $values['layout'] = $decoder['layout']; + if (isset($decoder['horizontal']) === true) { + $values['horizontal'] = $decoder['horizontal']; } return $values; @@ -408,14 +408,14 @@ class SLAPercentWidget extends Widget ], ]; - // Layout. + // Horizontal. $inputs[] = [ - 'label' => __('Layout').ui_print_help_tip(__('Off: vertical. On: horizontal'), true), + 'label' => __('Horizontal').ui_print_help_tip(__('If not, layout is vertical'), true), 'arguments' => [ 'wrapper' => 'div', - 'name' => 'layout', + 'name' => 'horizontal', 'type' => 'switch', - 'value' => $values['layout'], + 'value' => $values['horizontal'], 'return' => true, ], ]; @@ -441,7 +441,7 @@ class SLAPercentWidget extends Widget $values['period'] = \get_parameter('period', 0); $values['sizeValue'] = \get_parameter('sizeValue', ''); $values['sizeLabel'] = \get_parameter('sizeLabel', ''); - $values['layout'] = \get_parameter_switch('layout'); + $values['horizontal'] = \get_parameter_switch('horizontal'); return $values; } @@ -516,8 +516,8 @@ class SLAPercentWidget extends Widget $output .= '
'; $orientation = ''; - if ((int) $this->values['layout'] === 1) { - $orientation = 'flex'; + if ((int) $this->values['horizontal'] === 1) { + $orientation = 'flex aligni_center'; } else { $orientation = 'grid'; } @@ -525,13 +525,13 @@ class SLAPercentWidget extends Widget // General div. $output .= '
'; // Div value. - $output .= '
'; + $output .= '
'; $output .= $sla_array['sla_fixed'].'%'; $output .= '
'; if (empty($label) === false) { // Div Label. - $output .= '
'.$label.'
'; + $output .= '
'.$label.'
'; } $output .= '
'; diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css index 39b3368e69..25be958969 100644 --- a/pandora_console/include/styles/tables.css +++ b/pandora_console/include/styles/tables.css @@ -806,3 +806,7 @@ div[id^="auto-os-"] > img { .dataTables_paginate.paging_simple_numbers { margin-right: 0; } + +.w22px { + width: 22px; +} From c346aefeaa76aa323fa7a3810a4d4c5af9486553 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Wed, 15 Mar 2023 12:41:10 +0100 Subject: [PATCH 05/13] #10685 changed in system fav, tips and Tactical group view --- pandora_console/godmode/agentes/configurar_agente.php | 6 ------ pandora_console/godmode/groups/group_list.php | 5 ++--- pandora_console/godmode/groups/tactical.php | 7 ++++--- pandora_console/include/class/TipsWindow.class.php | 11 ++++++----- pandora_console/include/styles/tactical_groups.css | 3 +++ pandora_console/include/styles/tips_window.css | 9 +++++---- pandora_console/operation/agentes/group_view.php | 2 +- pandora_console/operation/agentes/ver_agente.php | 6 ++++++ pandora_console/views/dashboard/tipsWindow.php | 7 +++++-- 9 files changed, 32 insertions(+), 24 deletions(-) diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 385f4a5a8c..f559b4e3eb 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -827,12 +827,6 @@ if ($id_agente) { 'link' => '', 'label' => $tab_name, ], - ], - [ - 'id_element' => $id_agente, - 'url' => 'godmode/agentes/configurar_agente&tab=main&id_agente='.$id_agente, - 'label' => agents_get_alias($id_agente), - 'section' => 'Agents', ] ); } diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php index 6e604c7e1a..1afd26363e 100644 --- a/pandora_console/godmode/groups/group_list.php +++ b/pandora_console/godmode/groups/group_list.php @@ -718,7 +718,7 @@ if ($is_management_allowed === true 'tfavmenu_user', [ 'id_element' => $id_group, - 'section' => 'Tactic_group', + 'section' => 'Groups', 'id_user' => $config['id_user'], ] ); @@ -906,7 +906,6 @@ if ($tab == 'tree') { foreach ($groups as $key => $group) { $url_edit = 'index.php?sec=gagente&sec2=godmode/groups/configure_group&id_group='.$group['id_grupo']; - $url_tactical = 'index.php?sec=gagente&sec2=godmode/groups/tactical&id_group='.$group['id_grupo']; if (is_metaconsole()) { $url_delete = 'index.php?sec=gagente&sec2=godmode/groups/group_list&delete_group=1&id_group='.$group['id_grupo'].'&tab=groups'; } else { @@ -915,7 +914,7 @@ if ($tab == 'tree') { $table->data[$key][0] = $group['id_grupo']; if ($is_management_allowed === true) { - $table->data[$key][1] = ''.$group['nombre'].''; + $table->data[$key][1] = ''.$group['nombre'].''; } else { $table->data[$key][1] = $group['nombre']; } diff --git a/pandora_console/godmode/groups/tactical.php b/pandora_console/godmode/groups/tactical.php index d7984c3212..5339590bc4 100644 --- a/pandora_console/godmode/groups/tactical.php +++ b/pandora_console/godmode/groups/tactical.php @@ -72,14 +72,14 @@ if (is_metaconsole() === false) { ], [ 'link' => '', - 'label' => __('Tactic group'), + 'label' => __('Tactical group view'), ], ], [ 'id_element' => $id_group, 'url' => 'gagent&sec2=godmode/groups/tactical&id_group='.$id_group, 'label' => groups_get_name($id_group), - 'section' => 'Tactic_group', + 'section' => 'Groups', ] ); } @@ -187,7 +187,7 @@ try { [ 'id' => 'list_agents_tactical', 'class' => 'info_table', - 'style' => 'width: 100%', + 'style' => 'width: 99%', 'columns' => $columns, 'column_names' => $columnNames, 'return' => true, @@ -196,6 +196,7 @@ try { 'method' => 'getAgentsByGroup', 'id_group' => $id_group, ], + 'dom_elements' => 'lpfti', 'no_sortable_columns' => [-1], 'order' => [ 'field' => 'alias', diff --git a/pandora_console/include/class/TipsWindow.class.php b/pandora_console/include/class/TipsWindow.class.php index 6f159c8ec7..2ed452cc98 100644 --- a/pandora_console/include/class/TipsWindow.class.php +++ b/pandora_console/include/class/TipsWindow.class.php @@ -157,11 +157,12 @@ class TipsWindow View::render( 'dashboard/tipsWindow', [ - 'title' => $initialTip['title'], - 'text' => $initialTip['text'], - 'url' => $initialTip['url'], - 'files' => $initialTip['files'], - 'id' => $initialTip['id'], + 'title' => $initialTip['title'], + 'text' => $initialTip['text'], + 'url' => $initialTip['url'], + 'files' => $initialTip['files'], + 'id' => $initialTip['id'], + 'totalTips' => $this->getTotalTipsShowUser(), ] ); } diff --git a/pandora_console/include/styles/tactical_groups.css b/pandora_console/include/styles/tactical_groups.css index 383e9ef37f..1c399d1b3b 100644 --- a/pandora_console/include/styles/tactical_groups.css +++ b/pandora_console/include/styles/tactical_groups.css @@ -29,3 +29,6 @@ rect { .graph-distribution-so { margin-top: 55px; } +#list_agents_tactical_wrapper .dataTables_length { + margin-bottom: 10px; +} diff --git a/pandora_console/include/styles/tips_window.css b/pandora_console/include/styles/tips_window.css index 1fba4472d4..6e8927aa4d 100644 --- a/pandora_console/include/styles/tips_window.css +++ b/pandora_console/include/styles/tips_window.css @@ -12,7 +12,7 @@ padding: 0px; } .window { - background-image: linear-gradient(180deg, #fffce8 0%, #ffffff 100%); + background-image: white; width: 640px; width: 100%; border-radius: 5px; @@ -145,9 +145,6 @@ color: #14524f; font-weight: 600; } -#url_tip .arrow_tips { - font-size: 20px; -} span.count-round-tip { width: 6px !important; height: 6px !important; @@ -211,3 +208,7 @@ span.disable { .buttons_actions input { width: 32px; } +.hide-button { + opacity: 0; + pointer-events: none; +} diff --git a/pandora_console/operation/agentes/group_view.php b/pandora_console/operation/agentes/group_view.php index fa4d171e24..d14a3d3262 100644 --- a/pandora_console/operation/agentes/group_view.php +++ b/pandora_console/operation/agentes/group_view.php @@ -321,7 +321,7 @@ if (empty($result_groups) === false) { $link = ""; } else { $deep = groups_get_group_deep($data['_id_']); - $link = ""; + $link = ""; } $group_name = ''.ui_print_truncate_text($data['_name_'], 50).''; diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index da85b53430..b21cca1b32 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -1940,6 +1940,12 @@ if ((bool) $config['pure'] === false) { 'link' => '', 'label' => $tab_name, ], + ], + [ + 'id_element' => $id_agente, + 'url' => 'operation/agentes/ver_agente&id_agente='.$id_agente, + 'label' => agents_get_alias($id_agente), + 'section' => 'Agents', ] ); } diff --git a/pandora_console/views/dashboard/tipsWindow.php b/pandora_console/views/dashboard/tipsWindow.php index b95cf058c6..8279cfdd39 100644 --- a/pandora_console/views/dashboard/tipsWindow.php +++ b/pandora_console/views/dashboard/tipsWindow.php @@ -73,10 +73,13 @@ $output .= '

'; $output .= $text; $output .= '

'; +$link_class = 'invisible'; if (empty($url) === false && $url !== '') { - $output .= ''.__('See more info').'→'; + $link_class = ''; } +$output .= ''.__('See more info').''; + $output .= '
'; $output .= '
'; @@ -116,7 +119,7 @@ if ($preview === true) { '', [ 'onclick' => 'next_tip()', - 'class' => 'mini', + 'class' => ($totalTips === '1') ? 'mini hide-button' : 'mini', ], true ); From 17ba51d2bfb0a6a841e20c6fc6244c04e20375e3 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Wed, 15 Mar 2023 13:53:23 +0100 Subject: [PATCH 06/13] cluster view --- .../include/class/SnmpConsole.class.php | 5 +- pandora_console/include/styles/pandora.css | 2 +- .../operation/agentes/estado_monitores.php | 142 ++++++++++-------- .../operation/agentes/log_sources_status.php | 25 +-- pandora_console/views/cluster/list.php | 35 ++--- pandora_console/views/cluster/view.php | 93 ++++++------ 6 files changed, 158 insertions(+), 144 deletions(-) diff --git a/pandora_console/include/class/SnmpConsole.class.php b/pandora_console/include/class/SnmpConsole.class.php index f1895dfc51..3f48eb2c22 100644 --- a/pandora_console/include/class/SnmpConsole.class.php +++ b/pandora_console/include/class/SnmpConsole.class.php @@ -259,7 +259,10 @@ class SnmpConsole extends HTML 'class' => 'snmp-td', ], 'alert', - 'action', + [ + 'text' => 'action', + 'class' => 'table_action_buttons w120px', + ], [ 'text' => 'm', 'class' => 'mw60px pdd_0px', diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index b504b76a44..c99e661547 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -8144,7 +8144,7 @@ div.graph div.legend table { overflow: hidden; background-color: var(--secondary-color); min-height: calc(100vh - 200px); - border: 1px solid #cacaca; + /* border: 1px solid #cacaca; */ } /* diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php index 57f06fd940..4edd12ee5f 100755 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -187,7 +187,7 @@ html_print_div( 'class' => 'agent_details_line', 'content' => ui_toggle( $html_toggle, - ''.__('List of modules').''.$help_not_init.ui_print_help_tip( + __('List of modules').' '.$help_not_init.ui_print_help_tip( __('To see the list of modules paginated, enable this option in the Styles Configuration.'), true ).reporting_tiny_stats( @@ -201,9 +201,9 @@ html_print_div( false, false, true, - 'box-flat agent_details_col', + '', 'white-box-content', - 'width_available' + 'box-flat white_table_graph w100p' ), ], ); @@ -543,58 +543,83 @@ function print_form_filter_monitors( $form_text = ''; $table = new stdClass(); $table->class = 'filter-table-adv'; - $table->id = 'module_filter_agent_view'; - $table->styleTable = 'border-radius: 0;padding: 0;margin: 0 0 10px;'; + // $table->id = 'module_filter_agent_view'; + // $table->styleTable = 'border-radius: 0;padding: 0;margin: 0 0 10px;'; $table->width = '100%'; - $table->cellstyle[0][0] = 'width: 0'; - $table->cellstyle[0][1] = 'width: 0'; - $table->cellstyle[0][2] = 'width: 0'; + $table->size[0] = '25%'; + $table->size[1] = '25%'; + $table->size[2] = '25%'; + $table->size[3] = '25%'; // Captions. - $table->data[0][0] = html_print_input_hidden('filter_monitors', 1, true); - $table->data[0][0] .= html_print_input_hidden('monitors_change_filter', 1, true); - $table->data[0][0] .= __('Status:'); - $table->data[0][1] = __('Free text for search (*):').ui_print_help_tip( - __('Search by module name, list matches.'), - true + $table->data[0][0] = html_print_label_input_block( + html_print_input_hidden('filter_monitors', 1, true).html_print_input_hidden( + 'monitors_change_filter', + 1, + true + ).__('Status:'), + html_print_select( + $status_list, + 'status_filter_monitor', + $status_filter_monitor, + '', + '', + 0, + true, + false, + true, + 'w100p', + false, + 'width:100%' + ) ); - $table->data[0][2] = __('Module group'); - $table->data[0][3] = __('Show in hierachy mode'); - // Inputs. - $table->data[1][0] = html_print_select( - $status_list, - 'status_filter_monitor', - $status_filter_monitor, - '', - '', - 0, - true + + $table->data[0][1] = html_print_label_input_block( + __('Free text for search (*):').ui_print_help_tip( + __('Search by module name, list matches.'), + true + ), + html_print_input_text( + 'status_text_monitor', + $status_text_monitor, + '', + '', + 100, + true + ) ); - $table->data[1][1] = html_print_input_text( - 'status_text_monitor', - $status_text_monitor, - '', - '', - 100, - true + + $table->data[0][2] = html_print_label_input_block( + __('Module group'), + html_print_select( + $rows_select, + 'status_module_group', + $status_module_group, + '', + '', + 0, + true, + false, + true, + 'w100p', + false, + 'width:100%' + ) ); - $table->data[1][2] = html_print_select( - $rows_select, - 'status_module_group', - $status_module_group, - '', - '', - 0, - true - ); - $table->data[1][3] = html_print_switch( - [ - 'name' => 'status_hierachy_mode', - 'value' => $all_events_24h, - 'onchange' => 'change_module_filter()', - 'id' => 'checkbox-status_hierachy_mode', - ] + + $table->data[0][3] = html_print_label_input_block( + __('Show in hierachy mode'), + html_print_switch( + [ + 'name' => 'status_hierachy_mode', + 'value' => $all_events_24h, + 'onchange' => 'change_module_filter()', + 'id' => 'checkbox-status_hierachy_mode', + ] + ) ); + $form_text = html_print_table($table, true); + $filtersButtons = []; $filtersButtons[] = html_print_button( @@ -603,8 +628,9 @@ function print_form_filter_monitors( false, 'filter_modules();', [ - 'icon' => 'search', - 'mode' => 'secondary mini', + 'icon' => 'search', + 'mode' => 'secondary mini', + 'style' => 'margin-left: 15px', ], true ); @@ -621,16 +647,6 @@ function print_form_filter_monitors( true ); - $table->data[1][4] = html_print_div( - [ - 'class' => 'action-buttons', - 'content' => implode('', $filtersButtons), - ], - true - ); - - $form_text .= html_print_table($table, true); - // TODO. Unused code. if ($status_filter_monitor === -1 && empty($status_text_monitor) === true && $status_module_group === -1) { $filter_hidden = true; @@ -639,4 +655,10 @@ function print_form_filter_monitors( } echo $form_text; + html_print_div( + [ + 'class' => 'action-buttons-right-forced', + 'content' => implode('', $filtersButtons), + ] + ); } diff --git a/pandora_console/operation/agentes/log_sources_status.php b/pandora_console/operation/agentes/log_sources_status.php index 9e4dd50518..bab810fa5f 100644 --- a/pandora_console/operation/agentes/log_sources_status.php +++ b/pandora_console/operation/agentes/log_sources_status.php @@ -94,6 +94,19 @@ if (!empty($table->data)) { echo '
'; html_print_table($table); echo '
'; + $html_content = ob_get_clean(); + // Create controlled toggle content. + ui_toggle( + $html_content, + __('Log sources status'), + 'log_sources_status', + !$log_sources_defined, + false, + '', + 'white_table_graph_content no-padding-imp', + 'white-box-content', + 'box-flat white_thable_graph mrgn_top_30px' + ); } else { ui_print_info_message(['no_close' => true, 'message' => __('No log sources found') ]); $log_sources_defined = false; @@ -109,18 +122,6 @@ html_print_input_hidden('redirect_search', 1, false); echo ''; -$html_content = ob_get_clean(); - -// Create controlled toggle content. -ui_toggle( - $html_content, - __('Log sources status'), - 'log_sources_status', - !$log_sources_defined, - false, - '', - 'white_table_graph_content no-padding-imp' -); ?> diff --git a/pandora_console/views/cluster/list.php b/pandora_console/views/cluster/list.php index c72f1752a1..4a4db2f36f 100644 --- a/pandora_console/views/cluster/list.php +++ b/pandora_console/views/cluster/list.php @@ -50,7 +50,7 @@ try { 'known_status', [ 'text' => 'options', - 'class' => 'action_buttons', + 'class' => 'table_action_buttons', ], ]; @@ -102,6 +102,7 @@ try { ], ], ], + 'filter_main_class' => 'box-flat white_table_graph fixed_filter_bar', ] ); } catch (Exception $e) { @@ -109,24 +110,20 @@ try { } if (check_acl($config['id_user'], 0, 'AW')) { - HTML::printForm( + $buttons[] = html_print_submit_button( + __('New cluster'), + 'submit', + false, [ - 'form' => [ - 'method' => 'POST', - 'action' => ui_get_full_url($model->url.'&op=new'), - ], - 'inputs' => [ - [ - 'class' => 'w100p', - 'arguments' => [ - 'name' => 'submit', - 'label' => __('New cluster'), - 'type' => 'submit', - 'attributes' => 'class="sub next"', - 'return' => true, - ], - ], - ], - ] + 'class' => 'sub ok', + 'icon' => 'next', + ], + true ); + echo '
'; + html_print_action_buttons( + implode('', $buttons), + ['type' => 'form_action'] + ); + echo '
'; } diff --git a/pandora_console/views/cluster/view.php b/pandora_console/views/cluster/view.php index 775ca3e30a..a15bb1584c 100644 --- a/pandora_console/views/cluster/view.php +++ b/pandora_console/views/cluster/view.php @@ -358,17 +358,13 @@ $map_manager = new NetworkMap( * */ -$table_events = '
'; -$table_events .= '
'; -$table_events .= html_print_image( - 'images/arrow_down_green.png', - true -); -$table_events .= ''; +$table_events = '
'; +$table_events .= '
'; +$table_events .= ''; $table_events .= __('Events (Last 24h)'); -$table_events .= ''; +$table_events .= ''; $table_events .= '
'; -$table_events .= '
'; +$table_events .= '
'; $table_events .= graph_graphic_agentevents( $cluster->agent()->id_agente(), 95, @@ -384,29 +380,34 @@ $table_events .= '
'; ?>
-
-
- -
-
-
- -
- +
+
+
+ +
+
+
+ +
+ +
+
+
+
-
- -
+
+ +
+
-
printMap(); ?> @@ -414,10 +415,6 @@ $table_events .= '
';
-
- -
-
agent()->id_agente(); @@ -427,28 +424,22 @@ require_once $config['homedir'].'/operation/agentes/estado_monitores.php'; [ - 'action' => $model->url.'&op=view&id='.$cluster->id(), - 'method' => 'POST', - ], - 'inputs' => [ - [ - 'arguments' => [ - 'name' => 'submit', - 'label' => __('Reload'), - 'type' => 'submit', - 'attributes' => 'class="sub cancel"', - 'return' => true, - ], - ], - ], + 'class' => 'sub ok', + 'icon' => 'next', ], - false + true ); - -echo '
'; +echo '
'; +html_print_action_buttons( + implode('', $buttons), + ['type' => 'form_action'] +); +echo '
'; // Print always go back button. HTML::printForm($model->getGoBackForm(), false); From bed1e34fd216f9f5d28e73d3ac77635ed616bfc7 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Wed, 15 Mar 2023 15:58:28 +0100 Subject: [PATCH 07/13] Dashboards widgets --- .../godmode/agentes/agent_manager.php | 25 ++- .../include/class/ExternalTools.class.php | 159 +++++++++++------- .../javascript/jquery.pandora.controls.js | 39 ++--- pandora_console/include/styles/dashboards.css | 8 + .../agentes/interface_view.functions.php | 38 ++--- 5 files changed, 152 insertions(+), 117 deletions(-) diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index f524fb7d9e..9281c04e44 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -487,21 +487,18 @@ if (isset($groups[$grupo]) === true || $new_agent === true) { $tableAgent->data['primary_group'][0] .= html_print_input_hidden('grupo', $grupo, true); } -$tableAgent->data['primary_group'][0] .= html_print_div( - [ - 'content' => ui_print_group_icon( - $grupo, - true, - '', - ($id_agente === 0) ? 'display: none;' : '', - true, - false, - false, - 'after_input_icon' - ), - ], - true +$tableAgent->data['primary_group'][0] .= ''; +$tableAgent->data['primary_group'][0] .= ui_print_group_icon( + $grupo, + true, + '', + ($id_agente === 0) ? 'display: none;' : '', + true, + false, + false, + 'after_input_icon' ); +$tableAgent->data['primary_group'][0] .= ''; $tableAgent->data['caption_interval'][0] = __('Interval'); // $tableAgent->rowstyle['interval'] = 'width: 260px'; diff --git a/pandora_console/include/class/ExternalTools.class.php b/pandora_console/include/class/ExternalTools.class.php index 67345a61f8..3bcdce51ab 100644 --- a/pandora_console/include/class/ExternalTools.class.php +++ b/pandora_console/include/class/ExternalTools.class.php @@ -528,77 +528,103 @@ class ExternalTools extends HTML // Form table. $table = new StdClass(); - $table->class = 'fixed_filter_bar'; + $table->class = 'fixed_filter_bar filter-table-adv pdd_15px'; $table->id = 'externalToolTable'; - $table->cellstyle['captions'][0] = 'width: 0'; - $table->cellstyle['captions'][1] = 'width: 0'; - $table->cellstyle['captions'][2] = 'width: 0'; + $table->size[0] = '25%'; + $table->size[1] = '25%'; + $table->size[2] = '25%'; + $table->size[3] = '25%'; + $table->colspan = []; + $table->colspan[1][0] = 4; + // $table->cellclass[0][2] = 'snmpcolumn'; + // $table->cellclass[0][2] = 'snmpcolumn'; + // $table->cellclass[0][3] = 'snmpcolumn'; + // $table->cellclass[0][3] = 'snmpcolumn'; $table->data = []; - $table->data['captions'][0] = __('Operation'); - - $table->data['inputs'][0] = html_print_select( - $commandList, - 'operation', - $this->operation, - 'mostrarColumns(this.value)', - __('Please select'), - 0, - true + $table->data[0][0] = html_print_label_input_block( + __('Operation'), + html_print_select( + $commandList, + 'operation', + $this->operation, + 'mostrarColumns(this.value)', + __('Please select'), + 0, + true, + false, + true, + 'w100p', + false, + 'width: 100%;' + ) ); - $table->data['captions'][1] = __('IP Adress'); - $table->data['inputs'][1] = html_print_select( - $ipsSelect, - 'select_ips', - $principal_ip, - '', - '', - 0, - true + $table->data[0][1] = html_print_label_input_block( + __('IP Adress'), + html_print_select( + $ipsSelect, + 'select_ips', + $principal_ip, + '', + '', + 0, + true, + false, + true, + 'w100p', + false, + 'width: 100%;' + ) ); - $table->cellclass['captions'][2] = 'snmpcolumn'; - $table->cellclass['inputs'][2] = 'snmpcolumn'; - $table->data['captions'][2] = __('SNMP Version'); - $table->data['inputs'][2] = html_print_select( + $table->data[0][2] = html_print_label_input_block( + __('SNMP Version'), + html_print_select( + [ + '1' => 'v1', + '2c' => 'v2c', + ], + 'select_version', + $this->snmp_version, + '', + '', + 0, + true, + false, + true, + 'w100p', + false, + 'width: 100%;' + ), + ['div_class' => 'snmpcolumn'] + ); + + $table->data[0][3] = html_print_label_input_block( + __('SNMP Community'), + html_print_input_text( + 'community', + $this->community, + '', + 50, + 255, + true, + false, + false, + '', + 'w100p' + ), + ['div_class' => 'snmpcolumn'] + ); + + $table->data[1][0] = html_print_submit_button( + __('Execute'), + 'submit', + false, [ - '1' => 'v1', - '2c' => 'v2c', - ], - 'select_version', - $this->snmp_version, - '', - '', - 0, - true - ); - - $table->cellclass['captions'][3] = 'snmpcolumn'; - $table->cellclass['inputs'][3] = 'snmpcolumn'; - $table->data['captions'][3] = __('SNMP Community'); - $table->data['inputs'][3] = html_print_input_text( - 'community', - $this->community, - '', - 50, - 255, - true - ); - - $table->data['inputs'][4] = html_print_div( - [ - 'class' => 'action-buttons', - 'content' => html_print_submit_button( - __('Execute'), - 'submit', - false, - [ - 'icon' => 'cog', - 'mode' => 'mini', - ], - true - ), + 'icon' => 'cog', + 'mode' => 'mini', + 'class' => 'float-right mrgn_right_10px', ], true ); @@ -716,7 +742,7 @@ class ExternalTools extends HTML */ private function performExecution(string $command='', string $caption='') { - $output = ''; + $output = '
'; try { // If caption is not added, don't show anything. @@ -736,7 +762,7 @@ class ExternalTools extends HTML $output .= __('Command not response'); } - $output .= ''; + $output .= '
'; if ($resultCode !== 0) { throw new Exception( @@ -774,6 +800,8 @@ class ExternalTools extends HTML { $output = ''; + echo '
'; + if (validate_address($ip) === false) { $output .= ui_print_error_message( __('The ip or dns name entered cannot be resolved'), @@ -938,6 +966,7 @@ class ExternalTools extends HTML } } + echo '
'; return $output; } diff --git a/pandora_console/include/javascript/jquery.pandora.controls.js b/pandora_console/include/javascript/jquery.pandora.controls.js index bbb33af07d..92cd39c3ff 100644 --- a/pandora_console/include/javascript/jquery.pandora.controls.js +++ b/pandora_console/include/javascript/jquery.pandora.controls.js @@ -296,7 +296,7 @@ $.extend({ pandoraSelectGroupIcon: new (function() { this.defaults = { - alertSelect: "select#id_group", + alertSelect: "select#grupo", spanPreview: "#group_preview", debug: false }; @@ -315,25 +315,26 @@ $(this).change(function() { var id_group = this.value; + let href = $("a", config.spanPreview).attr("href"); + let hrefPosition = href.search("group_id="); + let hrefNew = href.slice(0, hrefPosition) + "group_id=" + id_group; - $(config.spanPreview).fadeOut("fast", function() { - $("img", config.spanPreview).remove(); - jQuery.post( - "ajax.php", - { - page: "godmode/groups/group_list", - get_group_json: 1, - id_group: id_group - }, - function(data) { - var img = $("").attr("src", "images/" + data["icon"]); - $(config.spanPreview) - .append(img) - .fadeIn("fast"); - }, - "json" - ); - }); + jQuery.post( + "ajax.php", + { + page: "godmode/groups/group_list", + get_group_json: 1, + id_group: id_group + }, + function(data) { + $("img", config.spanPreview).attr( + "src", + "images/" + data["icon"] + ); + $("a", config.spanPreview).attr("href", hrefNew); + }, + "json" + ); }); }); }; diff --git a/pandora_console/include/styles/dashboards.css b/pandora_console/include/styles/dashboards.css index 501cfe40da..3ac49172d4 100644 --- a/pandora_console/include/styles/dashboards.css +++ b/pandora_console/include/styles/dashboards.css @@ -843,3 +843,11 @@ div.widget-mrgn-0px > div.parent_graph { div.widget-mrgn-0px > div.parent_graph > div[id^="graph_"] { width: calc(100% + 14px) !important; } + +div.content-widget + > div.container-center + > div.centered.w90p + > div#container_show_stats + > canvas { + height: 310px; +} diff --git a/pandora_console/operation/agentes/interface_view.functions.php b/pandora_console/operation/agentes/interface_view.functions.php index 591346c526..27e4e0a3e9 100644 --- a/pandora_console/operation/agentes/interface_view.functions.php +++ b/pandora_console/operation/agentes/interface_view.functions.php @@ -146,35 +146,35 @@ function print_filters($sec) $filters .= ''; } else { - $table->style[0] = 'font-weight: bold;'; - - $table->data[0][0] = ''.__('Interfaces').''; - $table->data[0][1] = html_print_select( - [], - 'selected_interfaces[]', - '', - '', - '', - 0, - true, - true, - true, - '', - false, - 'min-width: 180px; max-width: 200px;' + $table->data[0][0] = html_print_label_input_block( + __('Interfaces'), + html_print_select( + [], + 'selected_interfaces[]', + '', + '', + '', + 0, + true, + true, + true, + '', + false, + 'min-width: 200px; max-width: 250px; min-height: 70px;' + ) ); $filters = '
'; $filters .= html_print_table($table, true); - $filters .= "
".html_print_submit_button( + $filters .= html_print_submit_button( __('Show'), 'uptbutton', false, - 'class="sub search mgn_tp_0"', + ['class' => 'float-right mini'], true - ).'
'; + ); $filters .= '
'; } From 30538265e87f6a764d9693dcaf241a47035e9f5c Mon Sep 17 00:00:00 2001 From: Jonathan Date: Wed, 15 Mar 2023 16:06:42 +0100 Subject: [PATCH 08/13] Cluster wizzard visual fix --- .../lib/ClusterViewer/ClusterWizard.php | 5 +++- pandora_console/views/cluster/edit.php | 30 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/lib/ClusterViewer/ClusterWizard.php b/pandora_console/include/lib/ClusterViewer/ClusterWizard.php index df7385eabf..4cc04e2318 100644 --- a/pandora_console/include/lib/ClusterViewer/ClusterWizard.php +++ b/pandora_console/include/lib/ClusterViewer/ClusterWizard.php @@ -1250,7 +1250,10 @@ class ClusterWizard extends \HTML 'name' => 'next', 'label' => $str, 'type' => 'submit', - 'attributes' => 'class="sub next"', + 'attributes' => [ + 'icon' => 'wand', + 'mode' => 'primary', + ], 'return' => true, ], ]; diff --git a/pandora_console/views/cluster/edit.php b/pandora_console/views/cluster/edit.php index 525d159bab..eb144c5e72 100644 --- a/pandora_console/views/cluster/edit.php +++ b/pandora_console/views/cluster/edit.php @@ -127,3 +127,33 @@ if (empty($form) === false) { // Print always go back button. HTML::printForm($wizard->getGoBackForm(), false); + +html_print_action_buttons( + '', + [] +); + +?> + + \ No newline at end of file From 84fe5695d8545f27e6f667a089e3eb7d402141b9 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Wed, 15 Mar 2023 16:34:18 +0100 Subject: [PATCH 09/13] Visual styles Setup view --- .../godmode/setup/setup_visuals.php | 3470 +++++++++-------- pandora_console/include/styles/pandora.css | 36 +- pandora_console/include/styles/tables.css | 4 + 3 files changed, 1913 insertions(+), 1597 deletions(-) diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index 5fb042fe66..2b5c553ca1 100755 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -1,16 +1,31 @@ width = '100%'; -$table_behaviour->class = 'databox filters'; -$table_behaviour->style[0] = 'font-weight: bold;'; -$table_behaviour->size[0] = '50%'; -$table_behaviour->data = []; - -$table_behaviour->data[$row][0] = __('Block size for pagination'); -$table_behaviour->data[$row][1] = html_print_input( - [ - 'type' => 'number', - 'size' => 5, - 'max' => $performance_variables_control['block_size']->max, - 'name' => 'block_size', - 'value' => $config['global_block_size'], - 'return' => true, - 'min' => $performance_variables_control['block_size']->min, - 'style' => 'width:50px', - ] -); -$row++; - $values = []; $values[5] = human_time_description_raw(5); $values[30] = human_time_description_raw(30); @@ -89,178 +82,87 @@ $values[SECONDS_5MINUTES] = human_time_description_raw(SECONDS_5MINUTES); $values[SECONDS_10MINUTES] = human_time_description_raw(SECONDS_10MINUTES); $values[SECONDS_30MINUTES] = human_time_description_raw(SECONDS_30MINUTES); -$table_behaviour->data[$row][0] = __('Paginated module view'); -$table_behaviour->data[$row][1] = html_print_checkbox_switch( - 'paginate_module', - 1, - $config['paginate_module'], - true +$table_behaviour = new stdClass(); +$table_behaviour->width = '100%'; +$table_behaviour->class = 'filter-table-adv'; +$table_behaviour->size[0] = '50%'; +$table_behaviour->data = []; + +$table_behaviour->data[$row][] = html_print_label_input_block( + __('Block size for pagination'), + html_print_input( + [ + 'type' => 'number', + 'size' => 5, + 'max' => $performance_variables_control['block_size']->max, + 'name' => 'block_size', + 'value' => $config['global_block_size'], + 'return' => true, + 'min' => $performance_variables_control['block_size']->min, + 'style' => 'width:50px', + ] + ) +); + +$table_behaviour->data[$row][] = html_print_label_input_block( + __('Click to display lateral menus'), + html_print_checkbox_switch( + 'click_display', + 1, + $config['click_display'], + true + ) +); + +$row++; + +$table_behaviour->data[$row][] = html_print_label_input_block( + __('Paginated module view'), + html_print_checkbox_switch( + 'paginate_module', + 1, + $config['paginate_module'], + true + ) +); +$table_behaviour->data[$row][] = html_print_label_input_block( + __('Display data of proc modules in other format'), + html_print_checkbox_switch( + 'render_proc', + 1, + $config['render_proc'], + true + ) ); $row++; -$table_behaviour->data[$row][0] = __('Display data of proc modules in other format'); -$table_behaviour->data[$row][1] = html_print_checkbox_switch( - 'render_proc', - 1, - $config['render_proc'], - true +$table_behaviour->data[$row][] = html_print_label_input_block( + __('Display text proc modules have state is ok'), + html_print_input_text('render_proc_ok', $config['render_proc_ok'], '', 25, 25, true) ); -$row++; - -$table_behaviour->data[$row][0] = __('Display text proc modules have state is ok'); -$table_behaviour->data[$row][1] = html_print_input_text('render_proc_ok', $config['render_proc_ok'], '', 25, 25, true); -$row++; - -$table_behaviour->data[$row][0] = __('Display text when proc modules have state critical'); -$table_behaviour->data[$row][1] = html_print_input_text('render_proc_fail', $config['render_proc_fail'], '', 25, 25, true); -$row++; - -$table_behaviour->data[$row][0] = __('Click to display lateral menus'); -$table_behaviour->data[$row][1] = html_print_checkbox_switch( - 'click_display', - 1, - $config['click_display'], - true +$table_behaviour->data[$row][] = html_print_label_input_block( + __('Display text when proc modules have state critical'), + html_print_input_text('render_proc_fail', $config['render_proc_fail'], '', 25, 25, true) ); $row++; if (enterprise_installed() === true) { - $table_behaviour->data[$row][0] = __('Service label font size'); - $table_behaviour->data[$row][1] = html_print_input_text('service_label_font_size', $config['service_label_font_size'], '', 5, 5, true); - $row++; - - $table_behaviour->data[$row][0] = __('Space between items in Service maps'); - $table_behaviour->data[$row][1] = html_print_input_text('service_item_padding_size', $config['service_item_padding_size'], '', 5, 5, true, false, false, 'onChange="change_servicetree_nodes_padding()"'); $row++; + $table_behaviour->data[$row][] = html_print_label_input_block( + __('Service label font size'), + html_print_input_text('service_label_font_size', $config['service_label_font_size'], '', 5, 5, true) + ); + $table_behaviour->data[$row][] = html_print_label_input_block( + __('Space between items in Service maps'), + html_print_input_text('service_item_padding_size', $config['service_item_padding_size'], '', 5, 5, true, false, false, 'onChange="change_servicetree_nodes_padding()"') + ); } + // ---------------------------------------------------------------------- // ---------------------------------------------------------------------- // STYLE CONFIGURATION // ---------------------------------------------------------------------- -$table_styles = new stdClass(); -$table_styles->width = '100%'; -$table_styles->class = 'databox filters'; -$table_styles->style[0] = 'font-weight: bold;'; -$table_styles->style[1] = 'display: flex; align-items: center;'; -$table_styles->size[0] = '50%'; -$table_styles->data = []; - - -$table_styles->data[$row][0] = __('Style template'); -$table_styles->data[$row][1] = html_print_select( - themes_get_css(), - 'style', - $config['style'].'.css', - '', - '', - '', - true -); -$row++; - -$table_styles->data[$row][0] = __('Status icon set'); -$iconsets['default'] = __('Colors'); -$iconsets['faces'] = __('Faces'); -$iconsets['color_text'] = __('Colors and text'); -$table_styles->data[$row][1] = html_print_select( - $iconsets, - 'status_images_set', - $config['status_images_set'], - '', - '', - '', - true -); -$table_styles->data[$row][1] .= html_print_button( - __('View'), - 'status_set_preview', - false, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true -); -$row++; - -// Divs to show icon status Colours (Default). -$icon_unknown_ball = ui_print_status_image(STATUS_AGENT_UNKNOWN_BALL, '', true); -$icon_unknown = ui_print_status_image(STATUS_AGENT_UNKNOWN, '', true); -$icon_ok_ball = ui_print_status_image(STATUS_AGENT_OK_BALL, '', true); -$icon_ok = ui_print_status_image(STATUS_AGENT_OK, '', true); -$icon_warning_ball = ui_print_status_image(STATUS_AGENT_WARNING_BALL, '', true); -$icon_warning = ui_print_status_image(STATUS_AGENT_WARNING, '', true); -$icon_bad_ball = ui_print_status_image(STATUS_AGENT_CRITICAL_BALL, '', true); -$icon_bad = ui_print_status_image(STATUS_AGENT_CRITICAL, '', true); -// End - Divs to show icon status Colours (Default). -$table_styles->data[$row][0] = __('Login background'); -$backgrounds_list_jpg = list_files('images/backgrounds', 'jpg', 1, 0); -$backgrounds_list_gif = list_files('images/backgrounds', 'gif', 1, 0); -$backgrounds_list_png = list_files('images/backgrounds', 'png', 1, 0); -$backgrounds_list = array_merge($backgrounds_list_jpg, $backgrounds_list_png); -$backgrounds_list = array_merge($backgrounds_list, $backgrounds_list_gif); -asort($backgrounds_list); - -$open = false; -if (enterprise_installed() === false) { - $open = true; -} - -// Custom favicon. -$files = list_files('images/custom_favicon', 'ico', 1, 0); -$table_styles->data[$row][0] = __('Custom favicon'); -$table_styles->data[$row][1] = html_print_select( - $files, - 'custom_favicon', - $config['custom_favicon'], - 'setup_visuals_change_favicon();', - __('Default'), - '', - true, - false, - true, - '', - false, - 'width:240px' -); -$table_styles->data[$row][1] .= '   '.html_print_image( - ui_get_favicon(), - true, - ['id' => 'favicon_preview'] -); -$row++; - -$table_styles->data[$row][0] = __('Custom background logo'); -$table_styles->data[$row][1] = html_print_select( - $backgrounds_list, - 'login_background', - $config['login_background'], - '', - __('Default'), - '', - true, - false, - true, - '', - false, - 'width:240px' -); -$table_styles->data[$row][1] .= html_print_button( - __('View'), - 'login_background_preview', - false, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true -); -$row++; /** @@ -311,1369 +213,7 @@ function logo_custom_enterprise($name, $logo) } -$table_styles->data[$row][0] = __('Custom logo (menu)'); -$table_styles->data[$row][1] = logo_custom_enterprise('custom_logo', $config['custom_logo']); -$table_styles->data[$row][1] .= ' '.html_print_button( - __('View'), - 'custom_logo_preview', - $open, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true, - false, - $open, - 'visualmodal' -); -$row++; - -$table_styles->data[$row][0] = __('Custom logo collapsed (menu)'); -$table_styles->data[$row][1] = logo_custom_enterprise('custom_logo_collapsed', $config['custom_logo_collapsed']); -$table_styles->data[$row][1] .= ' '.html_print_button( - __('View'), - 'custom_logo_collapsed_preview', - $open, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true, - false, - $open, - 'visualmodal' -); -$row++; - -$table_styles->data[$row][0] = __('Custom logo (header white background)'); -if (enterprise_installed() === true) { - $ent_files = list_files('enterprise/images/custom_logo', 'png', 1, 0); - $open_files = list_files('images/custom_logo', 'png', 1, 0); - - $table_styles->data[$row][1] = html_print_select( - array_merge($open_files, $ent_files), - 'custom_logo_white_bg', - $config['custom_logo_white_bg'], - '', - '', - '', - true, - false, - true, - '', - $open, - 'width:240px' - ); -} else { - $table_styles->data[$row][1] = html_print_select( - list_files('images/custom_logo', 'png', 1, 0), - 'custom_logo_white_bg', - $config['custom_logo_white_bg'], - '', - '', - '', - true, - false, - true, - '', - $open, - 'width:240px' - ); -} - -$table_styles->data[$row][1] .= ' '.html_print_button( - __('View'), - 'custom_logo_white_bg_preview', - $open, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true, - false, - $open, - 'visualmodal' -); -$row++; - -$table_styles->data[$row][0] = __('Custom logo (login)'); - -if (enterprise_installed()) { - $table_styles->data[$row][1] = html_print_select( - list_files('enterprise/images/custom_logo_login', 'png', 1, 0), - 'custom_logo_login', - $config['custom_logo_login'], - '', - '', - '', - true, - false, - true, - '', - $open, - 'width:240px' - ); -} else { - $table_styles->data[$row][1] = html_print_select( - '', - 'custom_logo_login', - $config['custom_logo_login'], - '', - '', - '', - true, - false, - true, - '', - $open, - 'width:240px' - ); -} - -$table_styles->data[$row][1] .= ' '.html_print_button( - __('View'), - 'custom_logo_login_preview', - $open, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true, - false, - $open, - 'visualmodal' -); -$row++; - -// Splash login. -if (enterprise_installed() === true) { - $table_styles->data[$row][0] = __('Custom Splash (login)'); - - $table_styles->data[$row][1] = html_print_select( - list_files('enterprise/images/custom_splash_login', 'png', 1, 0), - 'custom_splash_login', - $config['custom_splash_login'], - '', - __('Default'), - 'default', - true, - false, - true, - '', - $open, - 'width:240px' - ); - - $table_styles->data[$row][1] .= ' '.html_print_button( - __('View'), - 'custom_splash_login_preview', - $open, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true, - false, - $open, - 'visualmodal' - ); - $row++; -} - -if (enterprise_installed() === true) { - // Get all the custom logos. - $files = list_files('enterprise/images/custom_general_logos', 'png', 1, 0); - - // Custom docs icon. - $table_styles->data[$row][0] = __('Custom documentation logo'); - - $table_styles->data[$row][1] = html_print_select( - $files, - 'custom_docs_logo', - $config['custom_docs_logo'], - '', - __('None'), - '', - true, - false, - true, - '', - false, - 'width:240px' - ); - $table_styles->data[$row][1] .= ' '.html_print_button( - __('View'), - 'custom_docs_logo_preview', - $open, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true, - false, - $open, - 'visualmodal' - ); - $row++; - - // Custom support icon. - $table_styles->data[$row][0] = __('Custom support logo'); - $table_styles->data[$row][1] = html_print_select( - $files, - 'custom_support_logo', - $config['custom_support_logo'], - '', - __('None'), - '', - true, - false, - true, - '', - false, - 'width:240px' - ); - $table_styles->data[$row][1] .= ' '.html_print_button( - __('View'), - 'custom_support_logo_preview', - $open, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true, - false, - $open, - 'visualmodal' - ); - $row++; - - // Custom center networkmap icon. - $table_styles->data[$row][0] = __('Custom networkmap center logo'); - $table_styles->data[$row][1] = html_print_select( - $files, - 'custom_network_center_logo', - $config['custom_network_center_logo'], - '', - __('Default'), - '', - true, - false, - true, - '', - false, - 'width:240px' - ); - $table_styles->data[$row][1] .= ' '.html_print_button( - __('View'), - 'custom_network_center_logo_preview', - $open, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true, - false, - $open, - 'visualmodal' - ); - $row++; - - // Custom center mobile console icon. - $table_styles->data[$row][0] = __('Custom mobile console icon'); - $table_styles->data[$row][1] = html_print_select( - $files, - 'custom_mobile_console_logo', - $config['custom_mobile_console_logo'], - '', - __('Default'), - '', - true, - false, - true, - '', - false, - 'width:240px' - ); - $table_styles->data[$row][1] .= ' '.html_print_button( - __('View'), - 'custom_mobile_console_logo_preview', - $open, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true, - false, - $open, - 'visualmodal' - ); - $row++; -} - -// Title Header. -$table_styles->data[$row][0] = __('Title (header)'); -$table_styles->data[$row][1] = html_print_input_text('custom_title_header', $config['custom_title_header'], '', 50, 40, true); -$row++; - -// Subtitle Header. -$table_styles->data[$row][0] = __('Subtitle (header)'); -$table_styles->data[$row][1] = html_print_input_text('custom_subtitle_header', $config['custom_subtitle_header'], '', 50, 40, true); -$row++; - -// Login title1. -if (enterprise_installed() === true) { - $table_styles->data[$row][0] = __('Title 1 (login)'); - $table_styles->data[$row][1] = html_print_input_text('custom_title1_login', $config['custom_title1_login'], '', 50, 50, true); - $row++; -} - -// Login text2. -if (enterprise_installed() === true) { - $table_styles->data[$row][0] = __('Title 2 (login)'); - $table_styles->data[$row][1] = html_print_input_text('custom_title2_login', $config['custom_title2_login'], '', 50, 50, true); - $row++; -} - -if (enterprise_installed() === true) { - $table_styles->data[$row][0] = __('Docs URL (login)'); - $table_styles->data[$row][1] = html_print_input_text('custom_docs_url', $config['custom_docs_url'], '', 50, 50, true); - $row++; -} - -if (enterprise_installed() === true) { - $table_styles->data[$row][0] = __('Support URL (login)'); - $table_styles->data[$row][1] = html_print_input_text('custom_support_url', $config['custom_support_url'], '', 50, 50, true); - $row++; -} - -if (enterprise_installed() === true) { - $table_styles->data[$row][0] = __('Product name'); - $table_styles->data[$row][1] = html_print_input_text('rb_product_name', get_product_name(), '', 30, 255, true); - $row++; -} - -if (enterprise_installed() === true) { - $table_styles->data[$row][0] = __('Copyright notice'); - $table_styles->data[$row][1] = html_print_input_text('rb_copyright_notice', get_copyright_notice(), '', 30, 255, true); - $row++; -} - -if (enterprise_installed() === true) { - $table_styles->data[$row][0] = __('Background opacity % (login)'); - $table_styles->data[$row][1] = ""; - $row++; -} - -if (enterprise_installed() === true) { - $table_styles->data[$row][0] = __('Disable logo in graphs'); - $table_styles->data[$row][1] = html_print_checkbox_switch( - 'fixed_graph', - 1, - $config['fixed_graph'], - true - ); - $row++; -} - - /* - Hello there! :) - We added some of what seems to be "buggy" messages to the openSource version recently. This is not to force open-source users to move to the enterprise version, this is just to inform people using Pandora FMS open source that it requires skilled people to maintain and keep it running smoothly without professional support. This does not imply open-source version is limited in any way. If you check the recently added code, it contains only warnings and messages, no limitations except one: we removed the option to add custom logo in header. In the Update Manager section, it warns about the 'danger’ of applying automated updates without a proper backup, remembering in the process that the Enterprise version comes with a human-tested package. Maintaining an OpenSource version with more than 500 agents is not so easy, that's why someone using a Pandora with 8000 agents should consider asking for support. It's not a joke, we know of many setups with a huge number of agents, and we hate to hear that “its becoming unstable and slow” :( - You can of course remove the warnings, that's why we include the source and do not use any kind of trick. And that's why we added here this comment, to let you know this does not reflect any change in our opensource mentality of does the last 14 years. - */ - -$table_styles->data[$row][0] = __('Disable helps'); -$table_styles->data[$row][1] = html_print_checkbox_switch( - 'disable_help', - 1, - $config['disable_help'], - true -); -$row++; - -$table_styles->data[$row][0] = __('Fixed header'); -$table_styles->data[$row][1] = html_print_checkbox_switch( - 'fixed_header', - 1, - $config['fixed_header'], - true -); -$row++; - - -// For 5.1 Autohidden menu feature. -$table_styles->data['autohidden'][0] = __('Automatically hide submenu'); -$table_styles->data['autohidden'][1] = html_print_checkbox_switch( - 'autohidden_menu', - 1, - $config['autohidden_menu'], - true -); - -$table_styles->data[$row][0] = __('Visual effects and animation'); -$table_styles->data[$row][1] = html_print_checkbox_switch( - 'visual_animation', - 1, - $config['visual_animation'], - true -); -$row++; - -$table_styles->data[$row][0] = __('Random background (login)'); -$table_styles->data[$row][1] = html_print_checkbox_switch( - 'random_background', - 1, - $config['random_background'], - true -); -$row++; - - -// ---------------------------------------------------------------------- -// ---------------------------------------------------------------------- -// GIS CONFIGURATION -// ---------------------------------------------------------------------- -$table_gis = new stdClass(); -$table_gis->width = '100%'; -$table_gis->class = 'databox filters'; -$table_gis->style[0] = 'font-weight: bold;'; -$table_gis->style[1] = 'display: flex; align-items: center;'; -$table_gis->size[0] = '50%'; -$table_gis->data = []; - -$table_gis->data[$row][0] = __('GIS Labels'); -$table_gis->data[$row][1] = html_print_checkbox_switch( - 'gis_label', - 1, - $config['gis_label'], - true -); -$row++; - -$listIcons = gis_get_array_list_icons(); -$arraySelectIcon = []; -foreach ($listIcons as $index => $value) { - $arraySelectIcon[$index] = $index; -} - -$table_gis->data[$row][0] = __('Default icon in GIS'); -$table_gis->data[$row][1] = html_print_select( - $arraySelectIcon, - 'gis_default_icon', - $config['gis_default_icon'], - '', - __('Agent icon group'), - '', - true -); -$table_gis->data[$row][1] .= ' '.html_print_button( - __('View'), - 'gis_icon_preview', - false, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true -); -$row++; - -// ---------------------------------------------------------------------- -// ---------------------------------------------------------------------- -// FONT AND TEXT CONFIGURATION -// ---------------------------------------------------------------------- -$table_font = new stdClass(); -$table_font->width = '100%'; -$table_font->class = 'databox filters'; -$table_font->style[0] = 'font-weight: bold;'; -$table_font->size[0] = '50%'; -$table_font->data = []; - -$table_font->data[$row][0] = __('Graphs font size'); - -$font_size_array = [ - 1 => 1, - 2 => 2, - 3 => 3, - 4 => 4, - 5 => 5, - 6 => 6, - 7 => 7, - 8 => 8, - 9 => 9, - 10 => 10, - 11 => 11, - 12 => 12, - 13 => 13, - 14 => 14, - 15 => 15, -]; - -$table_font->data[$row][1] = html_print_select( - $font_size_array, - 'font_size', - $config['font_size'], - '', - '', - 0, - true -); -$row++; - -$table_font->data[$row][0] = __('Agent size text'); -$table_font->data[$row][1] = __('Small:').html_print_input_text('agent_size_text_small', $config['agent_size_text_small'], '', 3, 3, true); -$table_font->data[$row][1] .= ' '.__('Normal:').html_print_input_text('agent_size_text_medium', $config['agent_size_text_medium'], '', 3, 3, true); -$row++; - -$table_font->data[$row][0] = __('Module size text'); -$table_font->data[$row][1] = __('Small:').html_print_input_text('module_size_text_small', $config['module_size_text_small'], '', 3, 3, true); -$table_font->data[$row][1] .= ' '.__('Normal:').html_print_input_text('module_size_text_medium', $config['module_size_text_medium'], '', 3, 3, true); -$row++; - -$table_font->data[$row][0] = __('Description size text'); -$table_font->data[$row][1] = html_print_input_text('description_size_text', $config['description_size_text'], '', 3, 3, true); -$row++; - -$table_font->data[$row][0] = __('Item title size text'); -$table_font->data[$row][1] = html_print_input_text( - 'item_title_size_text', - $config['item_title_size_text'], - '', - 3, - 3, - true -); -$row++; - -$table_font->data[$row][0] = __('Show unit along with value in reports'); -$table_font->data[$row][1] = html_print_checkbox_switch( - 'simple_module_value', - 1, - $config['simple_module_value'], - true -); -$row++; - -// ---------------------------------------------------------------------- -// ---------------------------------------------------------------------- -// CHARS CONFIGURATION -// ---------------------------------------------------------------------- -$table_chars = new stdClass(); -$table_chars->width = '100%'; -$table_chars->class = 'databox filters'; -$table_chars->style[0] = 'font-weight: bold;'; -$table_chars->style[1] = 'display: flex;'; -$table_chars->size[0] = '50%'; -$table_chars->data = []; - -$graphColorAmount = 10; - -for ($i = 1; $i <= $graphColorAmount; $i++) { - $table_chars->data[$row][0] = __('Graph color #'.$i); - $table_chars->data[$row][1] = html_print_input_text( - 'graph_color'.$i, - $config['graph_color'.$i], - '', - 10, - 8, - true - ); - $row++; -} - -$table_chars->data[$row][0] = __('Value to interface graphics'); -$table_chars->data[$row][1] = html_print_input_text( - 'interface_unit', - $config['interface_unit'], - '', - 20, - 20, - true -); -$row++; - -$disabled_graph_precision = false; -if (enterprise_installed() === false) { - $disabled_graph_precision = true; -} - -$table_chars->data[$row][0] = __('Data precision'); -$table_chars->data[$row][1] = html_print_input( - [ - 'type' => 'number', - 'size' => 5, - 'max' => $performance_variables_control['graph_precision']->max, - 'name' => 'graph_precision', - 'value' => $config['graph_precision'], - 'return' => true, - 'min' => $performance_variables_control['graph_precision']->min, - 'style' => 'width:50px', - ($disabled_graph_precision) ? 'readonly' : '' => 'readonly', - 'onchange' => 'change_precision()', - ] -); -$row++; - -if (isset($config['short_module_graph_data']) === false) { - $config['short_module_graph_data'] = true; -} - -$table_chars->data[$row][0] = __('Data precision in graphs'); -$table_chars->data[$row][1] = html_print_input( - [ - 'type' => 'number', - 'size' => 5, - 'max' => $performance_variables_control['short_module_graph_data']->max, - 'name' => 'short_module_graph_data', - 'value' => $config['short_module_graph_data'], - 'return' => true, - 'min' => $performance_variables_control['short_module_graph_data']->min, - 'style' => 'width:50px', - ($disabled_graph_precision) ? 'readonly' : '' => 'readonly', - 'onchange' => 'change_precision()', - ] -); - -$row++; - -$table_chars->data[$row][0] = __( - 'Default line thickness for the Custom Graph.' -); -$table_chars->data[$row][1] = html_print_input_text( - 'custom_graph_width', - $config['custom_graph_width'], - '', - 5, - 5, - true -); -$row++; - -$table_chars->data[$row][0] = __('Number of elements in Custom Graph'); -$table_chars->data[$row][1] = html_print_input_text( - 'items_combined_charts', - $config['items_combined_charts'], - '', - 5, - 5, - true, - false, - false, - '' -); -$row++; - -$table_chars->data[$row][0] = __('Use round corners'); -$table_chars->data[$row][1] = html_print_checkbox_switch( - 'round_corner', - 1, - $config['round_corner'], - true -); -$row++; - -$table_chars->data[$row][0] = __('Chart fit to content'); -$table_chars->data[$row][1] = html_print_checkbox_switch( - 'maximum_y_axis', - 1, - $config['maximum_y_axis'], - true -); -$row++; - -$table_chars->data[$row][0] = __('Type of module charts'); -$table_chars->data[$row][1] = __('Area').' '.html_print_radio_button( - 'type_module_charts', - 'area', - '', - $config['type_module_charts'] == 'area', - true -).'  '; -$table_chars->data[$row][1] .= __('Line').' '.html_print_radio_button( - 'type_module_charts', - 'line', - '', - $config['type_module_charts'] != 'area', - true -); -$row++; - -$table_chars->data[$row][0] = __('Type of interface charts'); -$table_chars->data[$row][1] = __('Area').' '.html_print_radio_button( - 'type_interface_charts', - 'area', - '', - $config['type_interface_charts'] == 'area', - true -).'  '; -$table_chars->data[$row][1] .= __('Line').' '.html_print_radio_button( - 'type_interface_charts', - 'line', - '', - $config['type_interface_charts'] != 'area', - true -); -$row++; - -$table_chars->data[$row][0] = __('Percentile'); -$table_chars->data[$row][1] = html_print_input_text( - 'percentil', - $config['percentil'], - '', - 20, - 20, - true -); -$row++; - -$table_chars->data[$row][0] = __('Graph TIP view:'); - -$options_full_escale = []; -$options_full_escale[0] = __('None'); -$options_full_escale[1] = __('All'); -$options_full_escale[2] = __('On Boolean graphs'); - -$table_chars->data[$row][1] = html_print_select( - $options_full_escale, - 'full_scale_option', - (isset($config['full_scale_option']) === true) ? $config['full_scale_option'] : 0, - '', - '', - 0, - true, - false, - false -); -$row++; - - -$table_chars->data[$row][0] = __('Graph mode'); - -$options_soft_graphs = []; -$options_soft_graphs[0] = __('Show only average by default'); -$options_soft_graphs[1] = __('Show MAX/AVG/MIN by default'); - -$table_chars->data[$row][1] = html_print_select( - $options_soft_graphs, - 'type_mode_graph', - (isset($config['type_mode_graph']) === true) ? $config['type_mode_graph'] : 0, - '', - '', - 0, - true, - false, - false -); -$row++; - -$table_chars->data[$row][0] = __('Zoom graphs:'); - -$options_zoom_graphs = []; -$options_zoom_graphs[1] = 'x1'; -$options_zoom_graphs[2] = 'x2'; -$options_zoom_graphs[3] = 'x3'; -$options_zoom_graphs[4] = 'x4'; -$options_zoom_graphs[5] = 'x5'; - -$table_chars->data[$row][1] = html_print_select( - $options_zoom_graphs, - 'zoom_graph', - $config['zoom_graph'], - '', - '', - 0, - true, - false, - false -); -$row++; - -// ---------------------------------------------------------------------- -// ---------------------------------------------------------------------- -// Visual Consoles -// ---------------------------------------------------------------------- -$table_vc = new stdClass(); -$table_vc->width = '100%'; -$table_vc->class = 'databox filters'; -$table_vc->style[0] = 'font-weight: bold'; -$table_vc->size[0] = '50%'; -$table_vc->data = []; - -// Remove when the new view reaches rock solid stability. -$table_vc->data[$row][0] = __('Legacy Visual Console View'); -$table_vc->data[$row][1] = html_print_checkbox_switch( - 'legacy_vc', - 1, - (bool) $config['legacy_vc'], - true -); -$row++; - -$intervals = [ - 10 => '10 '.__('seconds'), - 30 => '30 '.__('seconds'), - 60 => '1 '.__('minutes'), - 300 => '5 '.__('minutes'), - 900 => '15 '.__('minutes'), - 1800 => '30 '.__('minutes'), - 3600 => '1 '.__('hour'), -]; -$table_vc->data[$row][0] = __('Default cache expiration'); -$table_vc->data[$row][1] = html_print_extended_select_for_time( - 'vc_default_cache_expiration', - $config['vc_default_cache_expiration'], - '', - __('No cache'), - 0, - false, - true, - false, - false, - '', - false, - $intervals -); -$row++; - -$table_vc->data[$row][0] = __('Default interval for refresh on Visual Console'); -$table_vc->data[$row][1] = html_print_select( - $values, - 'vc_refr', - (int) $config['vc_refr'], - '', - 'N/A', - 0, - true, - false, - false -); -$row++; - -$vc_favourite_view_array[0] = __('Classic view'); -$vc_favourite_view_array[1] = __('View of favorites'); -$table_vc->data[$row][0] = __('Type of view of visual consoles'); -$table_vc->data[$row][1] = html_print_select( - $vc_favourite_view_array, - 'vc_favourite_view', - $config['vc_favourite_view'], - '', - '', - 0, - true -); -$row++; - -$table_vc->data[$row][0] = __('Number of favorite visual consoles to show in the menu'); -$table_vc->data[$row][1] = ""; -$row++; - -$table_vc->data[$row][0] = __('Default line thickness for the Visual Console'); -$table_vc->data[$row][1] = html_print_input_text( - 'vc_line_thickness', - (int) $config['vc_line_thickness'], - '', - 5, - 5, - true -); - -$table_vc->data[$row][0] = __('Mobile view not allow visual console orientation'); -$table_vc->data[$row][1] = html_print_checkbox_switch( - 'mobile_view_orientation_vc', - 1, - (bool) $config['mobile_view_orientation_vc'], - true -); -$row++; - - -// ---------------------------------------------------------------------- -// Services -// ---------------------------------------------------------------------- -$table_ser = new stdClass(); -$table_ser->width = '100%'; -$table_ser->class = 'databox filters'; -$table_ser->style[0] = 'font-weight: bold'; -$table_ser->size[0] = '50%'; -$table_ser->data = []; - -$table_ser->data['number'][0] = __('Number of favorite services to show in the menu'); -$table_ser->data['number'][1] = ""; - -// ---------------------------------------------------------------------- -// Reports -// ---------------------------------------------------------------------- -$table_report = new stdClass(); -$table_report->width = '100%'; -$table_report->class = 'databox filters'; -$table_report->style[0] = 'font-weight: bold;'; -$table_report->size[0] = '20%'; - -$table_report->data = []; - -$table_report->data[$row][0] = __('Show report info with description'); -$table_report->data[$row][1] = html_print_checkbox_switch( - 'custom_report_info', - 1, - $config['custom_report_info'], - true -); -$row++; - -$table_report->data[$row][0] = __('Custom report front page'); -$table_report->data[$row][1] = html_print_checkbox_switch( - 'custom_report_front', - 1, - $config['custom_report_front'], - true -); - -$row++; - -$table_report->data[$row][0] = __('PDF font size (px)'); -$table_report->data[$row][1] = ""; - -$row++; - -$table_report->data[$row][0] = __('HTML font size for SLA (em)'); -$table_report->data[$row][1] = ""; - -$row++; - -$table_report->data[$row][0] = __('Graph image height for HTML reports'); -$table_report->data[$row][1] = html_print_input_text('graph_image_height', $config['graph_image_height'], '', 20, 20, true); - -$row++; - -$interval_description = [ - 'large' => 'Long', - 'tiny' => 'Short', -]; -$table_report->data[$row][0] = __('Interval description'); -$table_report->data[$row][1] = html_print_select( - $interval_description, - 'interval_description', - (isset($config['interval_description']) === true) ? $config['interval_description'] : 'large', - '', - '', - '', - true, - false, - false -); - -$row++; - -// ---------------------------------------------------------------------- -$dirItems = scandir($config['homedir'].'/images/custom_logo'); -foreach ($dirItems as $entryDir) { - if (strstr($entryDir, '.jpg') !== false || strstr($entryDir, '.png') !== false) { - $customLogos['images/custom_logo/'.$entryDir] = $entryDir; - } -} - -// Logo. -$table_report->data['custom_report_front-logo'][0] = __('Custom report front').' - '.__('Custom logo').ui_print_help_tip( - __("The dir of custom logos is in your www Console in 'images/custom_logo'. You can upload more files (ONLY JPEG AND PNG) in upload tool in console."), - true -); - -$table_report->data['custom_report_front-logo'][1] = html_print_select( - $customLogos, - 'custom_report_front_logo', - io_safe_output($config['custom_report_front_logo']), - 'showPreview()', - __('Default'), - '', - true -); -// Preview. -$table_report->data['custom_report_front-preview'][0] = __('Custom report front').' - '.'Preview'; -if (empty($config['custom_report_front_logo'])) { - $config['custom_report_front_logo'] = 'images/pandora_logo_white.jpg'; -} - -$table_report->data['custom_report_front-preview'][1] = ''.html_print_image($config['custom_report_front_logo'], true).''; - -// Header. -$table_report->data['custom_report_front-header'][0] = __('Custom report front').' - '.__('Header'); - -// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection. -$table_report->data['custom_report_front-header'][1] = html_print_textarea( - 'custom_report_front_header', - 5, - 15, - io_safe_output($config['custom_report_front_header']), - 'class="w90p height_300px"', - true -); - -// First page. -// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection. -if ($config['custom_report_front']) { - $firstpage_content = $config['custom_report_front_firstpage']; -} else { - $firstpage_content = io_safe_output($config['custom_report_front_firstpage']); -} - -$table_report->data['custom_report_front-first_page'][0] = __('Custom report front').' - '.__('First page'); -$custom_report_front_firstpage = str_replace( - '(_URLIMAGE_)', - ui_get_full_url(false, true, false, false), - io_safe_output($firstpage_content) -); -$table_report->data['custom_report_front-first_page'][1] = html_print_textarea( - 'custom_report_front_firstpage', - 15, - 15, - $custom_report_front_firstpage, - 'class="w90p height_300px"', - true -); - -// Footer. -$table_report->data['custom_report_front-footer'][0] = __('Custom report front').' - '.__('Footer'); - -// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection. -$table_report->data['custom_report_front-footer'][1] = html_print_textarea( - 'custom_report_front_footer', - 5, - 15, - io_safe_output($config['custom_report_front_footer']), - 'class="w90p height_300px""', - true -); - - -// ---------------------------------------------------------------------- -// OTHER CONFIGURATION -// ---------------------------------------------------------------------- -$table_other = new stdClass(); -$table_other->width = '100%'; -$table_other->class = 'databox filters'; -$table_other->style[0] = 'font-weight: bold;'; -$table_other->size[0] = '50%'; -$table_other->size[1] = '26%'; -$table_other->size[2] = '12%'; -$table_other->size[3] = '12%'; -$table_other->data = []; - -$row++; - -$table_other->data[$row][0] = __('Networkmap max width'); -$table_other->data[$row][1] = html_print_input_text( - 'networkmap_max_width', - $config['networkmap_max_width'], - '', - 10, - 20, - true -); -$row++; - -$table_other->data[$row][0] = __('Show only the group name'); -$table_other->data[$row][1] = html_print_checkbox_switch( - 'show_group_name', - 1, - $config['show_group_name'], - true -); -$row++; - -$table_other->data[$row][0] = __('Show empty groups in group view'); -$table_other->data[$row][1] = html_print_checkbox_switch( - 'show_empty_groups', - 1, - $config['show_empty_groups'], - true -); -$row++; - -$table_other->data[$row][0] = __('Date format string'); -$table_other->data[$row][1] = ''.__('Example').' '.date($config['date_format']); -$table_other->data[$row][1] .= html_print_input_text('date_format', $config['date_format'], '', 30, 100, true); -$row++; - -$decimal_separators = [ - ',' => ',', - '.' => '.', -]; - -$table_other->data[$row][0] = __('Decimal separator'); -$table_other->data[$row][1] = html_print_select( - $decimal_separators, - 'decimal_separator', - $config['decimal_separator'], - '', - '', - '', - true, - false, - false -); - -$row++; - -$table_other->data[$row][0] = __('Visible time of successful notifiations'); -$table_other->data[$row][1] .= html_print_input_text('notification_autoclose_time', $config['notification_autoclose_time'], '', 10, 10, true); -$row++; - -if ($config['prominent_time'] === 'comparation') { - $timestamp = false; - $comparation = true; - $compact = false; -} else if ($config['prominent_time'] === 'timestamp') { - $timestamp = true; - $comparation = false; - $compact = false; -} else if ($config['prominent_time'] === 'compact') { - $timestamp = false; - $comparation = false; - $compact = true; -} - -$table_other->data[$row][0] = __('Timestamp, time comparison, or compact mode'); -$table_other->data[$row][1] = '
'; -$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'comparation', __('Comparation in rollover'), $comparation, true); -$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'timestamp', __('Timestamp in rollover'), $timestamp, true); -$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'compact', __('Compact mode'), $compact, true); -$table_other->data[$row][1] .= '
'; - -$row++; - -// ---------------------------------------------------------------------- -// CUSTOM VALUES POST PROCESS -// ---------------------------------------------------------------------- -$table_other->data[$row][0] = __('Custom values post process'); -$table_other->data[$row][1] = __('Value').': '.html_print_input_text('custom_value', '', '', 25, 50, true); -$table_other->data[$row][2] = __('Text').': '.html_print_input_text('custom_text', '', '', 15, 50, true); -$table_other->data[$row][2] .= ' '; -$table_other->data[$row][2] .= html_print_input_hidden( - 'custom_value_add', - '', - true -); -$table_other->data[$row][3] = html_print_button( - __('Add'), - 'custom_value_add_btn', - false, - '', - [ - 'icon' => 'next', - 'mode' => 'link', - ], - true -); - -$row++; - -$table_other->data[$row][0] = ''; -$table_other->data[$row][1] = __('Delete custom values').': '; -$table_other->data[$row][2] = html_print_select( - post_process_get_custom_values(), - 'custom_values', - '', - '', - '', - '', - true -); -$count_custom_postprocess = post_process_get_custom_values(); -$table_other->data[$row][3] = html_print_button( - __('Delete'), - 'custom_values_del_btn', - empty($count_custom_postprocess), - '', - [ - 'icon' => 'delete', - 'mode' => 'link', - ], - true -); -// This hidden field will be filled from jQuery before submit. -$table_other->data[$row][1] .= html_print_input_hidden( - 'custom_value_to_delete', - '', - true -); -$table_other->data[$row][3] .= '

'; - -// ---------------------------------------------------------------------- -// ---------------------------------------------------------------------- -// CUSTOM INTERVAL VALUES -// ---------------------------------------------------------------------- -$row++; -$table_other->data[$row][0] = __('Interval values'); -$units = [ - 1 => __('seconds'), - SECONDS_1MINUTE => __('minutes'), - SECONDS_1HOUR => __('hours'), - SECONDS_1DAY => __('days'), - SECONDS_1MONTH => __('months'), - SECONDS_1YEAR => __('years'), -]; -$table_other->data[$row][1] = __('Value').': '; -$table_other->data[$row][1] .= html_print_input_text('interval_value', '', '', 5, 5, true); -$table_other->data[$row][2] = html_print_select($units, 'interval_unit', 1, '', '', '', true, false, false); -$table_other->data[$row][3] = html_print_button( - __('Add'), - 'interval_add_btn', - false, - '', - [ - 'icon' => 'next', - 'mode' => 'link', - ], - true -); - -$row++; - -$table_other->data[$row][0] = ''; -$table_other->data[$row][1] = __('Delete interval').': '; -$table_other->data[$row][2] = html_print_select(get_periods(false, false), 'intervals', '', '', '', '', true); -$table_other->data[$row][3] = html_print_button( - __('Delete'), - 'interval_del_btn', - empty($config['interval_values']), - '', - [ - 'icon' => 'delete', - 'mode' => 'link', - ], - true -); - -$table_other->data[$row][1] .= html_print_input_hidden('interval_values', $config['interval_values'], true); -// This hidden field will be filled from jQuery before submit. -$table_other->data[$row][1] .= html_print_input_hidden('interval_to_delete', '', true); -$table_other->data[$row][3] .= '

'; -// ---------------------------------------------------------------------- -$row++; - -$table_other->data[$row][0] = __('Module units'); -$table_other->data[$row][1] = __('Value').': '; -$table_other->data[$row][1] .= html_print_input_text('custom_module_unit', '', '', 15, 50, true); -$table_other->data[$row][2] = ''; -$table_other->data[$row][3] = html_print_button( - __('Add'), - 'module_unit_add_btn', - false, - '', - [ - 'icon' => 'next', - 'mode' => 'link', - ], - true -); - -$row++; -$table_other->data[$row][0] = ''; -$table_other->data[$row][1] = __('Delete custom values').': '; -$table_other->data[$row][2] = html_print_select(get_custom_module_units(), 'module_units', '', '', '', '', true, false, true, 'w100p'); -$table_other->data[$row][3] = html_print_button( - __('Delete'), - 'custom_module_unit_del_btn', - empty($count_custom_postprocess), - '', - [ - 'icon' => 'delete', - 'mode' => 'link', - ], - true -); - -$table_other->data[$row][3] .= html_print_input_hidden( - 'custom_module_unit_to_delete', - '', - true -); - -$row++; - -$common_dividers = [ - ';' => ';', - ',' => ',', - '|' => '|', -]; -$table_other->data[$row][0] = __('CSV divider'); -if ($config['csv_divider'] != ';' && $config['csv_divider'] != ',' && $config['csv_divider'] != '|') { - $table_other->data[$row][1] = html_print_input_text( - 'csv_divider', - $config['csv_divider'], - '', - 20, - 255, - true - ); - $table_other->data[$row][1] .= ''.html_print_image( - 'images/logs@svg.svg', - true, - [ - 'id' => 'select', - 'class' => 'main_menu_icon invert_filter', - ] - ).''; -} else { - $table_other->data[$row][1] = html_print_select( - $common_dividers, - 'csv_divider', - $config['csv_divider'], - '', - '', - '', - true, - false, - false - ); - $table_other->data[$row][1] .= ''.html_print_image( - 'images/edit.svg', - true, - [ - 'id' => 'pencil', - 'class' => 'main_menu_icon invert_filter', - ] - ).''; -} - -$row++; - -$decimal_separator = [ - '.' => '.', - ',' => ',', -]; -$table_other->data[$row][0] = __('CSV decimal separator'); -$table_other->data[$row][1] = html_print_select($decimal_separator, 'csv_decimal_separator', $config['csv_decimal_separator'], '', '', '', true, false, false); - -$row++; - -$table_other->data[$row][0] = __('Data multiplier to use in graphs/data'); -$options_data_multiplier = []; -$options_data_multiplier[0] = __('Use 1024 when module unit are bytes'); -$options_data_multiplier[1] = __('Use always 1000'); -$options_data_multiplier[2] = __('Use always 1024'); - - -$table_other->data[$row][1] = html_print_select($options_data_multiplier, 'use_data_multiplier', $config['use_data_multiplier'], '', '', 1, true, false, false);function load_fonts() +function load_fonts() { global $config; @@ -1692,68 +232,1828 @@ $table_other->data[$row][1] = html_print_select($options_data_multiplier, 'use_d } +$iconsets['default'] = __('Colors'); +$iconsets['faces'] = __('Faces'); +$iconsets['color_text'] = __('Colors and text'); + +// Divs to show icon status Colours (Default). +$icon_unknown_ball = ui_print_status_image(STATUS_AGENT_UNKNOWN_BALL, '', true); +$icon_unknown = ui_print_status_image(STATUS_AGENT_UNKNOWN, '', true); +$icon_ok_ball = ui_print_status_image(STATUS_AGENT_OK_BALL, '', true); +$icon_ok = ui_print_status_image(STATUS_AGENT_OK, '', true); +$icon_warning_ball = ui_print_status_image(STATUS_AGENT_WARNING_BALL, '', true); +$icon_warning = ui_print_status_image(STATUS_AGENT_WARNING, '', true); +$icon_bad_ball = ui_print_status_image(STATUS_AGENT_CRITICAL_BALL, '', true); +$icon_bad = ui_print_status_image(STATUS_AGENT_CRITICAL, '', true); +// End - Divs to show icon status Colours (Default). +$backgrounds_list_jpg = list_files('images/backgrounds', 'jpg', 1, 0); +$backgrounds_list_gif = list_files('images/backgrounds', 'gif', 1, 0); +$backgrounds_list_png = list_files('images/backgrounds', 'png', 1, 0); +$backgrounds_list = array_merge($backgrounds_list_jpg, $backgrounds_list_png); +$backgrounds_list = array_merge($backgrounds_list, $backgrounds_list_gif); +asort($backgrounds_list); + +$open = false; +if (enterprise_installed() === false) { + $open = true; +} + +if (enterprise_installed() === true) { + // Get all the custom logos. + $filesCustomLogos = list_files('enterprise/images/custom_general_logos', 'png', 1, 0); + + $ent_files = list_files('enterprise/images/custom_logo', 'png', 1, 0); + $open_files = list_files('images/custom_logo', 'png', 1, 0); + + $entOpenFilesInput = html_print_select( + array_merge($open_files, $ent_files), + 'custom_logo_white_bg', + $config['custom_logo_white_bg'], + '', + '', + '', + true, + false, + true, + '', + $open, + 'width:240px' + ); + + $customLogoLoginInput = html_print_select( + list_files('enterprise/images/custom_logo_login', 'png', 1, 0), + 'custom_logo_login', + $config['custom_logo_login'], + '', + '', + '', + true, + false, + true, + '', + $open, + 'width:240px' + ); +} else { + $entOpenFilesInput = html_print_select( + list_files('images/custom_logo', 'png', 1, 0), + 'custom_logo_white_bg', + $config['custom_logo_white_bg'], + '', + '', + '', + true, + false, + true, + '', + $open, + 'width:240px' + ); + + $customLogoLoginInput = html_print_select( + '', + 'custom_logo_login', + $config['custom_logo_login'], + '', + '', + '', + true, + false, + true, + '', + $open, + 'width:240px' + ); +} + +// Custom favicon. +$filesFavicon = list_files('images/custom_favicon', 'ico', 1, 0); + +$table_styles = new stdClass(); +$table_styles->width = '100%'; +$table_styles->class = 'filter-table-adv'; +$table_styles->size[0] = '50%'; +$table_styles->data = []; + +$table_styles->data[$row][] = html_print_label_input_block( + __('Style template'), + html_print_select( + themes_get_css(), + 'style', + $config['style'].'.css', + '', + '', + '', + true, + false, + true, + '', + false, + 'width: 100%' + ) +); +$row++; +$table_styles->data[$row][] = html_print_label_input_block( + __('Custom favicon'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => html_print_select( + $filesFavicon, + 'custom_favicon', + $config['custom_favicon'], + 'setup_visuals_change_favicon();', + __('Default'), + '', + true, + false, + true, + '', + false, + 'width:240px' + ).html_print_image( + ui_get_favicon(), + true, + ['id' => 'favicon_preview'] + ), + ], + true + ) +); + +$table_styles->data[$row][] = html_print_label_input_block( + __('Custom background logo'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => html_print_select( + $backgrounds_list, + 'login_background', + $config['login_background'], + '', + __('Default'), + '', + true, + false, + true, + '', + false, + 'width:240px' + ).html_print_button( + __('View'), + 'login_background_preview', + false, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true + ), + ], + true + ) +); +$row++; + +$table_styles->data[$row][] = html_print_label_input_block( + __('Custom logo (menu)'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => logo_custom_enterprise('custom_logo', $config['custom_logo']).html_print_button( + __('View'), + 'custom_logo_preview', + $open, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true, + false, + $open, + 'visualmodal' + ), + ], + true + ) +); + +$table_styles->data[$row][] = html_print_label_input_block( + __('Custom logo collapsed (menu)'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => logo_custom_enterprise('custom_logo_collapsed', $config['custom_logo_collapsed']).html_print_button( + __('View'), + 'custom_logo_collapsed_preview', + $open, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true, + false, + $open, + 'visualmodal' + ), + ], + true + ) +); +$row++; + +$table_styles->data[$row][] = html_print_label_input_block( + __('Custom logo (header white background)'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => $entOpenFilesInput.html_print_button( + __('View'), + 'custom_logo_white_bg_preview', + $open, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true, + false, + $open, + 'visualmodal' + ), + ], + true + ) +); + +$table_styles->data[$row][] = html_print_label_input_block( + __('Custom logo (login)'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => $entOpenFilesInput.html_print_button( + __('View'), + 'custom_logo_login_preview', + $open, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true, + false, + $open, + 'visualmodal' + ), + ], + true + ) +); +$row++; + +// Splash login. +if (enterprise_installed() === true) { + $table_styles->data[$row][] = html_print_label_input_block( + __('Custom Splash (login)'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => html_print_select( + list_files('enterprise/images/custom_splash_login', 'png', 1, 0), + 'custom_splash_login', + $config['custom_splash_login'], + '', + __('Default'), + 'default', + true, + false, + true, + '', + $open, + 'width:240px' + ).html_print_button( + __('View'), + 'custom_splash_login_preview', + $open, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true, + false, + $open, + 'visualmodal' + ), + ], + true + ) + ); + + $table_styles->data[$row][] = html_print_label_input_block( + __('Custom documentation logo'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => html_print_select( + $filesCustomLogos, + 'custom_docs_logo', + $config['custom_docs_logo'], + '', + __('None'), + '', + true, + false, + true, + '', + false, + 'width:240px' + ).html_print_button( + __('View'), + 'custom_docs_logo_preview', + $open, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true, + false, + $open, + 'visualmodal' + ), + ], + true + ) + ); + $row++; + + // Custom support icon. + $table_styles->data[$row][] = html_print_label_input_block( + __('Custom support logo'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => html_print_select( + $filesCustomLogos, + 'custom_support_logo', + $config['custom_support_logo'], + '', + __('None'), + '', + true, + false, + true, + '', + false, + 'width:240px' + ).html_print_button( + __('View'), + 'custom_support_logo_preview', + $open, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true, + false, + $open, + 'visualmodal' + ), + ], + true + ) + ); + + $table_styles->data[$row][] = html_print_label_input_block( + __('Custom networkmap center logo'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => html_print_select( + $filesCustomLogos, + 'custom_network_center_logo', + $config['custom_network_center_logo'], + '', + __('Default'), + '', + true, + false, + true, + '', + false, + 'width:240px' + ).html_print_button( + __('View'), + 'custom_network_center_logo_preview', + $open, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true, + false, + $open, + 'visualmodal' + ), + ], + true + ) + ); + $row++; + + // Custom center mobile console icon. + $table_styles->data[$row][] = html_print_label_input_block( + __('Custom mobile console icon'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => html_print_select( + $filesCustomLogos, + 'custom_mobile_console_logo', + $config['custom_mobile_console_logo'], + '', + __('Default'), + '', + true, + false, + true, + '', + false, + 'width:240px' + ).html_print_button( + __('View'), + 'custom_mobile_console_logo_preview', + $open, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true, + false, + $open, + 'visualmodal' + ), + ], + true + ) + ); +} + +$row++; + +// Title Header. +$table_styles->data[$row][] = html_print_label_input_block( + __('Title (header)'), + html_print_input_text('custom_title_header', $config['custom_title_header'], '', 50, 40, true) +); + +// Subtitle Header. +$table_styles->data[$row][] = html_print_label_input_block( + __('Subtitle (header)'), + html_print_input_text('custom_subtitle_header', $config['custom_subtitle_header'], '', 50, 40, true) +); +$row++; + +if (enterprise_installed() === true) { + // Login title1. + $table_styles->data[$row][] = html_print_label_input_block( + __('Title 1 (login)'), + html_print_input_text('custom_title1_login', $config['custom_title1_login'], '', 50, 50, true) + ); + // Login text2. + $table_styles->data[$row][] = html_print_label_input_block( + __('Title 2 (login)'), + html_print_input_text('custom_title2_login', $config['custom_title2_login'], '', 50, 50, true) + ); + $row++; + + $table_styles->data[$row][] = html_print_label_input_block( + __('Docs URL (login)'), + html_print_input_text('custom_docs_url', $config['custom_docs_url'], '', 50, 50, true) + ); + + $table_styles->data[$row][] = html_print_label_input_block( + __('Support URL (login)'), + html_print_input_text('custom_support_url', $config['custom_support_url'], '', 50, 50, true) + ); + $row++; + + $table_styles->data[$row][] = html_print_label_input_block( + __('Product name'), + html_print_input_text('rb_product_name', get_product_name(), '', 30, 255, true) + ); + + $table_styles->data[$row][] = html_print_label_input_block( + __('Copyright notice'), + html_print_input_text('rb_copyright_notice', get_copyright_notice(), '', 30, 255, true) + ); + $row++; + + $table_styles->data[$row][] = html_print_label_input_block( + __('Background opacity % (login)'), + "" + ); + + $table_styles->data[$row][] = html_print_label_input_block( + __('Disable logo in graphs'), + html_print_checkbox_switch( + 'fixed_graph', + 1, + $config['fixed_graph'], + true + ) + ); + $row++; +} + +/* + Hello there! :) + We added some of what seems to be "buggy" messages to the openSource version recently. This is not to force open-source users to move to the enterprise version, this is just to inform people using Pandora FMS open source that it requires skilled people to maintain and keep it running smoothly without professional support. This does not imply open-source version is limited in any way. If you check the recently added code, it contains only warnings and messages, no limitations except one: we removed the option to add custom logo in header. In the Update Manager section, it warns about the 'danger’ of applying automated updates without a proper backup, remembering in the process that the Enterprise version comes with a human-tested package. Maintaining an OpenSource version with more than 500 agents is not so easy, that's why someone using a Pandora with 8000 agents should consider asking for support. It's not a joke, we know of many setups with a huge number of agents, and we hate to hear that “its becoming unstable and slow” :( + You can of course remove the warnings, that's why we include the source and do not use any kind of trick. And that's why we added here this comment, to let you know this does not reflect any change in our opensource mentality of does the last 14 years. +*/ + +$table_styles->data[$row][] = html_print_label_input_block( + __('Disable helps'), + html_print_checkbox_switch( + 'disable_help', + 1, + $config['disable_help'], + true + ) +); + +$table_styles->data[$row][] = html_print_label_input_block( + __('Fixed header'), + html_print_checkbox_switch( + 'fixed_header', + 1, + $config['fixed_header'], + true + ) +); +$row++; + +// For 5.1 Autohidden menu feature. +$table_styles->data[$row][] = html_print_label_input_block( + __('Automatically hide submenu'), + html_print_checkbox_switch( + 'autohidden_menu', + 1, + $config['autohidden_menu'], + true + ) +); + +$table_styles->data[$row][] = html_print_label_input_block( + __('Visual effects and animation'), + html_print_checkbox_switch( + 'visual_animation', + 1, + $config['visual_animation'], + true + ) +); +$row++; + +$table_styles->data[$row][] = html_print_label_input_block( + __('Random background (login)'), + html_print_checkbox_switch( + 'random_background', + 1, + $config['random_background'], + true + ) +); + +// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// GIS CONFIGURATION +// ---------------------------------------------------------------------- +$listIcons = gis_get_array_list_icons(); +$arraySelectIcon = []; +foreach ($listIcons as $index => $value) { + $arraySelectIcon[$index] = $index; +} + +$table_gis = new stdClass(); +$table_gis->width = '100%'; +$table_gis->class = 'filter-table-adv'; +$table_gis->size[0] = '50%'; +$table_gis->data = []; + +$table_gis->data[$row][] = html_print_label_input_block( + __('GIS Labels'), + html_print_checkbox_switch( + 'gis_label', + 1, + $config['gis_label'], + true + ) +); + +$table_gis->data[$row][] = html_print_label_input_block( + __('Default icon in GIS'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => html_print_select( + $arraySelectIcon, + 'gis_default_icon', + $config['gis_default_icon'], + '', + __('Agent icon group'), + '', + true + ).html_print_button( + __('View'), + 'gis_icon_preview', + false, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true + ), + ], + true + ) +); +$row++; + +// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// FONT AND TEXT CONFIGURATION +// ---------------------------------------------------------------------- +$font_size_array = [ + 1 => 1, + 2 => 2, + 3 => 3, + 4 => 4, + 5 => 5, + 6 => 6, + 7 => 7, + 8 => 8, + 9 => 9, + 10 => 10, + 11 => 11, + 12 => 12, + 13 => 13, + 14 => 14, + 15 => 15, +]; + +$table_font = new stdClass(); +$table_font->width = '100%'; +$table_font->class = 'filter-table-adv'; +$table_font->size[0] = '50%'; +$table_font->data = []; + +$table_font->data[$row][] = html_print_label_input_block( + __('Graphs font size'), + html_print_select( + $font_size_array, + 'font_size', + $config['font_size'], + '', + '', + 0, + true, + false, + true, + '', + false, + 'width: 100%' + ) +); + + +$table_font->data[$row][] = html_print_label_input_block( + __('Show unit along with value in reports'), + html_print_checkbox_switch( + 'simple_module_value', + 1, + $config['simple_module_value'], + true + ) +); +$row++; + +$table_font->data[$row][] = html_print_label_input_block( + __('Agent size text'), + html_print_div( + [ + 'class' => 'filter-table-adv-manual', + 'content' => html_print_div( + [ + 'class' => 'w50p', + 'content' => __('Small').html_print_input_text('agent_size_text_small', $config['agent_size_text_small'], '', 10, 3, true), + ], + true + ).html_print_div( + [ + 'class' => 'w50p', + 'content' => __('Normal').html_print_input_text('agent_size_text_medium', $config['agent_size_text_medium'], '', 10, 3, true), + ], + true + ), + ], + true + ) +); +$table_font->data[$row][] = html_print_label_input_block( + __('Module size text'), + html_print_div( + [ + 'class' => 'filter-table-adv-manual', + 'content' => html_print_div( + [ + 'class' => 'w50p', + 'content' => __('Small').html_print_input_text('module_size_text_small', $config['module_size_text_small'], '', 10, 3, true), + ], + true + ).html_print_div( + [ + 'class' => 'w50p', + 'content' => __('Normal').html_print_input_text('module_size_text_medium', $config['module_size_text_medium'], '', 10, 3, true), + ], + true + ), + ], + true + ) +); +$row++; + +$table_font->data[$row][] = html_print_label_input_block( + __('Description size text'), + html_print_input_text( + 'description_size_text', + $config['description_size_text'], + '', + 3, + 3, + true + ) +); +$table_font->data[$row][] = html_print_label_input_block( + __('Item title size text'), + html_print_input_text( + 'item_title_size_text', + $config['item_title_size_text'], + '', + 3, + 3, + true + ) +); +$row++; + + +// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// CHARS CONFIGURATION +// ---------------------------------------------------------------------- +$disabled_graph_precision = false; +if (enterprise_installed() === false) { + $disabled_graph_precision = true; +} + +if (isset($config['short_module_graph_data']) === false) { + $config['short_module_graph_data'] = true; +} + +$options_full_escale = []; +$options_full_escale[0] = __('None'); +$options_full_escale[1] = __('All'); +$options_full_escale[2] = __('On Boolean graphs'); + +$options_soft_graphs = []; +$options_soft_graphs[0] = __('Show only average by default'); +$options_soft_graphs[1] = __('Show MAX/AVG/MIN by default'); + +$options_zoom_graphs = []; +$options_zoom_graphs[1] = 'x1'; +$options_zoom_graphs[2] = 'x2'; +$options_zoom_graphs[3] = 'x3'; +$options_zoom_graphs[4] = 'x4'; +$options_zoom_graphs[5] = 'x5'; + +$graphColorAmount = 10; +$table_chars = new stdClass(); +$table_chars->width = '100%'; +$table_chars->class = 'filter-table-adv'; +$table_chars->size[0] = '50%'; +$table_chars->size[1] = '50%'; +$table_chars->data = []; + +for ($i = 1; $i <= $graphColorAmount; $i++) { + $table_chars->data[$row][] = html_print_label_input_block( + __('Graph color #'.$i), + html_print_input_color( + 'graph_color'.$i, + $config['graph_color'.$i], + 'graph_color'.$i, + 'w50p', + true + ) + ); + + $row = ($i % 2 === 0) ? ($row + 1) : $row; +} + +$table_chars->data[$row][] = html_print_label_input_block( + __('Data precision'), + html_print_input( + [ + 'type' => 'number', + 'size' => 5, + 'max' => $performance_variables_control['graph_precision']->max, + 'name' => 'graph_precision', + 'value' => $config['graph_precision'], + 'return' => true, + 'min' => $performance_variables_control['graph_precision']->min, + 'style' => 'width:50%', + ($disabled_graph_precision) ? 'readonly' : '' => 'readonly', + 'onchange' => 'change_precision()', + ] + ) +); + +$table_chars->data[$row][] = html_print_label_input_block( + __('Data precision in graphs'), + html_print_input( + [ + 'type' => 'number', + 'size' => 5, + 'max' => $performance_variables_control['short_module_graph_data']->max, + 'name' => 'short_module_graph_data', + 'value' => $config['short_module_graph_data'], + 'return' => true, + 'min' => $performance_variables_control['short_module_graph_data']->min, + 'style' => 'width:50%', + ($disabled_graph_precision) ? 'readonly' : '' => 'readonly', + 'onchange' => 'change_precision()', + ] + ) +); +$row++; + +$table_chars->data[$row][] = html_print_label_input_block( + __('Value to interface graphics'), + html_print_input_text( + 'interface_unit', + $config['interface_unit'], + '', + 20, + 20, + true + ) +); + +$table_chars->data[$row][] = html_print_label_input_block( + __('Default line thickness for the Custom Graph.'), + html_print_input_text( + 'custom_graph_width', + $config['custom_graph_width'], + '', + 5, + 5, + true + ) +); +$row++; + +$table_chars->data[$row][] = html_print_label_input_block( + __('Number of elements in Custom Graph'), + html_print_input_text( + 'items_combined_charts', + $config['items_combined_charts'], + '', + 5, + 5, + true, + false, + false, + '' + ) +); +$table_chars->data[$row][] = html_print_label_input_block( + __('Use round corners'), + html_print_checkbox_switch( + 'round_corner', + 1, + $config['round_corner'], + true + ) +); +$row++; + +$table_chars->data[$row][] = html_print_label_input_block( + __('Chart fit to content'), + html_print_checkbox_switch( + 'maximum_y_axis', + 1, + $config['maximum_y_axis'], + true + ) +); + +$table_chars->data[$row][] = html_print_label_input_block( + __('Type of module charts'), + html_print_div( + [ + 'class' => '', + 'content' => html_print_div( + [ + 'class' => '', + 'content' => __('Area').' '.html_print_radio_button( + 'type_module_charts', + 'area', + '', + $config['type_module_charts'] == 'area', + true + ), + ], + true + ).html_print_div( + [ + 'class' => '', + 'content' => __('Line').' '.html_print_radio_button( + 'type_module_charts', + 'line', + '', + $config['type_module_charts'] != 'area', + true + ), + ], + true + ), + ], + true + ) +); +$row++; + +$table_chars->data[$row][] = html_print_label_input_block( + __('Percentile'), + html_print_input_text( + 'percentil', + $config['percentil'], + '', + 20, + 20, + true + ) +); + +$table_chars->data[$row][] = html_print_label_input_block( + __('Graph TIP view'), + html_print_select( + $options_full_escale, + 'full_scale_option', + (isset($config['full_scale_option']) === true) ? $config['full_scale_option'] : 0, + '', + '', + 0, + true, + false, + false + ) +); +$row++; + +$table_chars->data[$row][] = html_print_label_input_block( + __('Graph mode'), + html_print_select( + $options_soft_graphs, + 'type_mode_graph', + (isset($config['type_mode_graph']) === true) ? $config['type_mode_graph'] : 0, + '', + '', + 0, + true, + false, + false + ) +); + +$table_chars->data[$row][] = html_print_label_input_block( + __('Zoom graphs'), + html_print_select( + $options_zoom_graphs, + 'zoom_graph', + $config['zoom_graph'], + '', + '', + 0, + true, + false, + false + ) +); +$row++; + +// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// Visual Consoles +// ---------------------------------------------------------------------- +$intervals = [ + 10 => '10 '.__('seconds'), + 30 => '30 '.__('seconds'), + 60 => '1 '.__('minutes'), + 300 => '5 '.__('minutes'), + 900 => '15 '.__('minutes'), + 1800 => '30 '.__('minutes'), + 3600 => '1 '.__('hour'), +]; + +$vc_favourite_view_array[0] = __('Classic view'); +$vc_favourite_view_array[1] = __('View of favorites'); + +$table_vc = new stdClass(); +$table_vc->width = '100%'; +$table_vc->class = 'filter-table-adv'; +$table_vc->style[0] = 'font-weight: bold'; +$table_vc->size[0] = '50%'; +$table_vc->data = []; + +// Remove when the new view reaches rock solid stability. +$table_vc->data[$row][] = html_print_label_input_block( + __('Legacy Visual Console View'), + html_print_checkbox_switch( + 'legacy_vc', + 1, + (bool) $config['legacy_vc'], + true + ) +); + +$table_vc->data[$row][] = html_print_label_input_block( + __('Default cache expiration'), + html_print_extended_select_for_time( + 'vc_default_cache_expiration', + $config['vc_default_cache_expiration'], + '', + __('No cache'), + 0, + false, + true, + false, + false, + '', + false, + $intervals + ) +); +$row++; + +$table_vc->data[$row][] = html_print_label_input_block( + __('Default interval for refresh on Visual Console'), + html_print_select( + $values, + 'vc_refr', + (int) $config['vc_refr'], + '', + 'N/A', + 0, + true, + false, + false + ) +); + +$table_vc->data[$row][] = html_print_label_input_block( + __('Type of view of visual consoles'), + html_print_select( + $vc_favourite_view_array, + 'vc_favourite_view', + $config['vc_favourite_view'], + '', + '', + 0, + true + ) +); +$row++; + +$table_vc->data[$row][] = html_print_label_input_block( + __('Number of favorite visual consoles to show in the menu'), + "" +); + +$table_vc->data[$row][] = html_print_label_input_block( + __('Default line thickness for the Visual Console'), + html_print_input_text( + 'vc_line_thickness', + (int) $config['vc_line_thickness'], + '', + 5, + 5, + true + ) +); +$row++; + +$table_vc->data[$row][] = html_print_label_input_block( + __('Mobile view not allow visual console orientation'), + html_print_checkbox_switch( + 'mobile_view_orientation_vc', + 1, + (bool) $config['mobile_view_orientation_vc'], + true + ) +); +$row++; + + +// ---------------------------------------------------------------------- +// Services +// ---------------------------------------------------------------------- +$table_ser = new stdClass(); +$table_ser->width = '100%'; +$table_ser->class = 'filter-table-adv'; +$table_ser->size[0] = '50%'; +$table_ser->data = []; + +$table_ser->data[0][] = html_print_label_input_block( + __('Number of favorite services to show in the menu'), + "" +); + +// ---------------------------------------------------------------------- +// Reports +// ---------------------------------------------------------------------- +$interval_description = [ + 'large' => 'Long', + 'tiny' => 'Short', +]; + +$dirItems = scandir($config['homedir'].'/images/custom_logo'); +$customLogos = []; +foreach ($dirItems as $entryDir) { + if (strstr($entryDir, '.jpg') !== false || strstr($entryDir, '.png') !== false) { + $customLogos['images/custom_logo/'.$entryDir] = $entryDir; + } +} + +if (empty($config['custom_report_front_logo'])) { + $config['custom_report_front_logo'] = 'images/pandora_logo_white.jpg'; +} + +// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection. +if ($config['custom_report_front']) { + $firstpage_content = $config['custom_report_front_firstpage']; +} else { + $firstpage_content = io_safe_output($config['custom_report_front_firstpage']); +} + +$custom_report_front_firstpage = str_replace( + '(_URLIMAGE_)', + ui_get_full_url(false, true, false, false), + io_safe_output($firstpage_content) +); + +$table_report = new stdClass(); +$table_report->width = '100%'; +$table_report->class = 'filter-table-adv'; +$table_report->size[0] = '50%'; + +$table_report->data = []; + +$table_report->data[$row][] = html_print_label_input_block( + __('Show report info with description'), + html_print_checkbox_switch( + 'custom_report_info', + 1, + $config['custom_report_info'], + true + ) +); + +$table_report->data[$row][] = html_print_label_input_block( + __('Custom report front page'), + html_print_checkbox_switch( + 'custom_report_front', + 1, + $config['custom_report_front'], + true + ) +); +$row++; + +$table_report->data[$row][] = html_print_label_input_block( + __('PDF font size (px)'), + "" +); +$table_report->data[$row][] = html_print_label_input_block( + __('HTML font size for SLA (em)'), + "" +); +$row++; + +$table_report->data[$row][] = html_print_label_input_block( + __('Graph image height for HTML reports'), + html_print_input_text('graph_image_height', $config['graph_image_height'], '', 20, 20, true) +); +$table_report->data[$row][] = html_print_label_input_block( + __('Interval description'), + html_print_select( + $interval_description, + 'interval_description', + (isset($config['interval_description']) === true) ? $config['interval_description'] : 'large', + '', + '', + '', + true, + false, + false + ) +); +$row++; + +// Logo. +$table_report->data['custom_report_front-logo'][] = html_print_label_input_block( + __('Custom report front').' - '.__('Custom logo').ui_print_help_tip( + __("The dir of custom logos is in your www Console in 'images/custom_logo'. You can upload more files (ONLY JPEG AND PNG) in upload tool in console."), + true + ), + html_print_select( + $customLogos, + 'custom_report_front_logo', + io_safe_output($config['custom_report_front_logo']), + 'showPreview()', + __('Default'), + '', + true + ) +); +$table_report->data['custom_report_front-preview'][] = html_print_label_input_block( + __('Custom report front').' - '.__('Preview'), + ''.html_print_image($config['custom_report_front_logo'], true).'' +); + +$table_report->colspan['custom_report_front-header'][] = 2; +$table_report->data['custom_report_front-header'][] = html_print_label_input_block( + __('Custom report front').' - '.__('Header'), + html_print_textarea( + 'custom_report_front_header', + 5, + 15, + io_safe_output($config['custom_report_front_header']), + 'class="w90p height_300px"', + true + ) +); + +$table_report->colspan['custom_report_front-first_page'][] = 2; +$table_report->data['custom_report_front-first_page'][] = html_print_label_input_block( + __('Custom report front').' - '.__('First page'), + html_print_textarea( + 'custom_report_front_firstpage', + 15, + 15, + $custom_report_front_firstpage, + 'class="w90p height_300px"', + true + ) +); + +// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection. +$table_report->colspan['custom_report_front-footer'][] = 2; +$table_report->data['custom_report_front-footer'][] = html_print_label_input_block( + __('Custom report front').' - '.__('Footer'), + html_print_textarea( + 'custom_report_front_footer', + 5, + 15, + io_safe_output($config['custom_report_front_footer']), + 'class="w90p height_300px""', + true + ) +); + + +// ---------------------------------------------------------------------- +// OTHER CONFIGURATION +// ---------------------------------------------------------------------- +$decimal_separators = [ + ',' => ',', + '.' => '.', +]; + +$common_dividers = [ + ';' => ';', + ',' => ',', + '|' => '|', +]; + +$switchProminentTime = html_print_radio_button( + 'prominent_time', + 'comparation', + __('Comparation in rollover'), + ($config['prominent_time'] === 'comparation'), + true +); +$switchProminentTime .= html_print_radio_button( + 'prominent_time', + 'timestamp', + __('Timestamp in rollover'), + ($config['prominent_time'] === 'timestamp'), + true +); +$switchProminentTime .= html_print_radio_button( + 'prominent_time', + 'compact', + __('Compact mode'), + ($config['prominent_time'] === 'compact'), + true +); + +if ($config['csv_divider'] !== ';' && $config['csv_divider'] !== ',' && $config['csv_divider'] !== '|') { + $csvDividerInputs = html_print_input_text( + 'csv_divider', + $config['csv_divider'], + '', + 20, + 255, + true + ); + $csvDividerInputs .= ''.html_print_image( + 'images/logs@svg.svg', + true, + [ + 'id' => 'select', + 'class' => 'main_menu_icon invert_filter', + ] + ).''; +} else { + $csvDividerInputs = html_print_select( + $common_dividers, + 'csv_divider', + $config['csv_divider'], + '', + '', + '', + true, + false, + false + ); + $csvDividerInputs .= ''.html_print_image( + 'images/edit.svg', + true, + [ + 'id' => 'pencil', + 'class' => 'main_menu_icon invert_filter', + ] + ).''; +} + +$options_data_multiplier = []; +$options_data_multiplier[0] = __('Use 1024 when module unit are bytes'); +$options_data_multiplier[1] = __('Use always 1000'); +$options_data_multiplier[2] = __('Use always 1024'); + +$table_other = new stdClass(); +$table_other->width = '100%'; +$table_other->class = 'filter-table-adv'; +$table_other->size[0] = '50%'; +$table_other->size[1] = '50%'; +$table_other->data = []; + +$row++; + +$table_other->data[$row][] = html_print_label_input_block( + __('Networkmap max width'), + html_print_input_text( + 'networkmap_max_width', + $config['networkmap_max_width'], + '', + 10, + 20, + true + ) +); + +$table_other->data[$row][] = html_print_label_input_block( + __('Show only the group name'), + html_print_checkbox_switch( + 'show_group_name', + 1, + $config['show_group_name'], + true + ) +); +$row++; + +$table_other->data[$row][] = html_print_label_input_block( + __('Show empty groups in group view'), + html_print_checkbox_switch( + 'show_empty_groups', + 1, + $config['show_empty_groups'], + true + ) +); + +$table_other->data[$row][] = html_print_label_input_block( + __('Date format string'), + html_print_input_text( + 'date_format', + $config['date_format'], + '', + 30, + 100, + true + ).ui_print_input_placeholder( + __('Example').': '.date($config['date_format']), + true + ) +); +$row++; + +$table_other->data[$row][] = html_print_label_input_block( + __('Decimal separator'), + html_print_select( + $decimal_separators, + 'decimal_separator', + $config['decimal_separator'], + '', + '', + '', + true, + false, + false + ) +); + +$table_other->data[$row][] = html_print_label_input_block( + __('Visible time of successful notifiations'), + html_print_input_text( + 'notification_autoclose_time', + $config['notification_autoclose_time'], + '', + 10, + 10, + true + ) +); +$row++; + +$table_other->data[$row][] = html_print_label_input_block( + __('Timestamp, time comparison, or compact mode'), + html_print_div( + [ + 'class' => 'switch_radio_button', + 'content' => $switchProminentTime, + ], + true + ) +); +$row++; +// ---------------------------------------------------------------------- +// CUSTOM VALUES POST PROCESS +// ---------------------------------------------------------------------- +$count_custom_postprocess = post_process_get_custom_values(); +$table_other->data[$row][] = html_print_label_input_block( + __('Custom values post process'), + html_print_div( + [ + 'class' => 'filter-table-adv-manual', + 'content' => html_print_div( + [ + 'class' => '', + 'content' => __('Value').': '.html_print_input_text('custom_value', '', '', 25, 50, true), + ], + true + ).html_print_div( + [ + 'class' => '', + 'content' => __('Text').': '.html_print_input_text('custom_text', '', '', 15, 50, true), + ], + true + ).html_print_button( + __('Add'), + 'custom_value_add_btn', + false, + '', + [ + 'icon' => 'next', + 'mode' => 'link', + 'style' => 'display: flex; justify-content: flex-end; width: 100%;', + ], + true + ).html_print_input_hidden( + 'custom_value_add', + '', + true + ), + ], + true + ).html_print_div( + [ + 'class' => '', + 'content' => html_print_div( + [ + 'class' => '', + 'content' => __('Delete custom values').html_print_select( + post_process_get_custom_values(), + 'custom_values', + '', + '', + '', + '', + true, + false, + true, + '', + false, + 'width: 100%' + ), + ], + true + ).html_print_button( + __('Delete'), + 'custom_values_del_btn', + empty($count_custom_postprocess), + '', + [ + 'icon' => 'delete', + 'mode' => 'link', + 'style' => 'display: flex; justify-content: flex-end; width: 100%;', + ], + true + ).html_print_input_hidden( + 'custom_value_to_delete', + '', + true + ), + ], + true + ) +); + +// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// CUSTOM INTERVAL VALUES +// ---------------------------------------------------------------------- +$units = [ + 1 => __('seconds'), + SECONDS_1MINUTE => __('minutes'), + SECONDS_1HOUR => __('hours'), + SECONDS_1DAY => __('days'), + SECONDS_1MONTH => __('months'), + SECONDS_1YEAR => __('years'), +]; +$table_other->data[$row][] = html_print_label_input_block( + __('Interval values'), + html_print_div( + [ + 'class' => 'filter-table-adv-manual', + 'content' => html_print_div( + [ + 'class' => '', + 'content' => __('Value').html_print_input_text('interval_value', '', '', 5, 5, true), + ], + true + ).html_print_div( + [ + 'class' => '', + 'content' => __('Interval').html_print_select($units, 'interval_unit', 1, '', '', '', true, false, false, '', false, 'width: 100%'), + ], + true + ).html_print_button( + __('Add'), + 'interval_add_btn', + false, + '', + [ + 'mode' => 'link', + 'style' => 'display: flex; justify-content: flex-end; width: 100%;', + ], + true + ).html_print_input_hidden( + 'interval_values', + $config['interval_values'], + true + ), + ], + true + ).html_print_div( + [ + 'class' => empty($config['interval_values']) === true ? 'invisible' : '', + 'content' => html_print_div( + [ + 'class' => '', + 'content' => __('Delete interval values').html_print_select( + get_periods( + false, + false + ), + 'intervals', + '', + '', + '', + '', + true, + false, + true, + '', + false, + 'width: 100%' + ), + ], + true + ).html_print_button( + __('Delete'), + 'interval_del_btn', + empty($config['interval_values']), + '', + [ + 'mode' => 'link', + 'style' => 'display: flex; justify-content: flex-end; width: 100%;', + ], + true + ).html_print_input_hidden( + 'interval_to_delete', + '', + true + ), + ], + true + ) +); +$row++; + + + +$table_other->data[$row][] = html_print_label_input_block( + __('Module units'), + html_print_div( + [ + 'class' => 'filter-table-adv-manual', + 'content' => html_print_div( + [ + 'class' => '', + 'content' => __('Value').html_print_input_text('custom_module_unit', '', '', 15, 50, true), + ], + true + ).html_print_div( + [ + 'class' => '', + 'content' => __('Interval').html_print_select($units, 'interval_unit', 1, '', '', '', true, false, false, '', false, 'width: 100%'), + ], + true + ).html_print_button( + __('Add'), + 'module_unit_add_btn', + false, + '', + [ + 'style' => 'display: flex; justify-content: flex-end; width: 100%;', + 'mode' => 'link', + ], + true + ), + ], + true + ).html_print_div( + [ + 'class' => (empty($count_custom_postprocess) === true ? 'invisible' : ''), + 'content' => html_print_div( + [ + 'class' => '', + 'content' => __('Delete custom values').html_print_select( + get_custom_module_units(), + 'module_units', + '', + '', + '', + '', + true, + false, + true, + '', + false, + 'width: 100%' + ), + ], + true + ).html_print_button( + __('Delete'), + 'custom_module_unit_del_btn', + empty($count_custom_postprocess), + '', + [ + 'style' => 'display: flex; justify-content: flex-end; width: 100%;', + 'mode' => 'link', + ], + true + ).html_print_input_hidden( + 'custom_module_unit_to_delete', + '', + true + ), + ], + true + ) +); +$row++; + +$table_other->data[$row][] = html_print_label_input_block( + __('CSV divider'), + $csvDividerInputs +); + +$table_other->data[$row][] = html_print_label_input_block( + __('CSV decimal separator'), + html_print_select($decimal_separators, 'csv_decimal_separator', $config['csv_decimal_separator'], '', '', '', true, false, false) +); +$row++; + +$table_other->data[$row][] = html_print_label_input_block( + __('Data multiplier to use in graphs/data'), + html_print_select($options_data_multiplier, 'use_data_multiplier', $config['use_data_multiplier'], '', '', 1, true, false, false) +); +$row++; + /* * * PAINT HTML. * */ -echo '
'; +echo '
'; echo ''.__('Behaviour configuration').' '.ui_print_help_icon('behavoir_conf_tab', true).''; html_print_table($table_behaviour); echo '
'; -echo '
'; +echo '
'; echo ''.__('GIS configuration').' '.ui_print_help_icon('gis_conf_tab', true).''; html_print_table($table_gis); echo '
'; -echo '
'; +echo '
'; echo ''.__('Style configuration').' '.ui_print_help_icon('style_conf_tab', true).''; html_print_table($table_styles); echo '
'; -echo '
'; +echo '
'; echo ''.__('Charts configuration').' '.ui_print_help_icon('charts_conf_tab', true).''; html_print_table($table_chars); echo '
'; -echo '
'; +echo '
'; echo ''.__('Font and Text configuration').' '.ui_print_help_icon('front_and_text_conf_tab', true).''; html_print_table($table_font); echo '
'; -echo '
'; +echo '
'; echo ''.__('Visual consoles configuration').' '.ui_print_help_icon('visual_consoles_conf_tab', true).''; html_print_table($table_vc); echo '
'; -echo '
'; +echo '
'; echo ''.__('Reports configuration ').ui_print_help_icon('reports_configuration_tab', true).''; html_print_table($table_report); echo '
'; -echo '
'; +echo '
'; echo ''.__('Services configuration').' '.ui_print_help_icon('services_conf_tab', true).''; html_print_table($table_ser); echo '
'; -echo '
'; +echo '
'; echo ''.__('Other configuration').' '.ui_print_help_icon('other_conf_tab', true).''; html_print_table($table_other); echo '
'; -html_print_div( - [ - 'class' => 'action-buttons w100p', - 'content' => html_print_submit_button( - __('Update'), - 'update_button', - false, - [ 'icon' => 'next' ], - true - ), - ] +html_print_action_buttons( + html_print_submit_button( + __('Update'), + 'update_button', + false, + [ 'icon' => 'next' ], + true + ) ); echo ''; @@ -1871,22 +2171,23 @@ $(document).ready (function () { $("select#vc_default_cache_expiration_select").closest("tr").show(); } }).change(); - + var comfort = 0; - +/* if(comfort == 0){ $(':input,:radio,:checkbox,:file').change(function(){ - $('#submit-update_button').css({'position':'fixed','right':'80px','bottom':'55px'}); + $('#button-update_button').css({'position':'fixed','right':'80px','bottom':'55px'}); var comfort = 1; }); $("*").keydown(function(){ - $('#submit-update_button').css({'position':'fixed','right':'80px','bottom':'55px'}); + $('#button-update_button').css({'position':'fixed','right':'80px','bottom':'55px'}); var comfort = 1; }); $('#form_setup').after('
'); - } + } + $("#form_setup #text-graph_color1").attachColorPicker(); $("#form_setup #text-graph_color2").attachColorPicker(); @@ -1897,8 +2198,10 @@ $(document).ready (function () { $("#form_setup #text-graph_color7").attachColorPicker(); $("#form_setup #text-graph_color8").attachColorPicker(); $("#form_setup #text-graph_color9").attachColorPicker(); + + */ $("#form_setup #text-graph_color10").attachColorPicker(); - + //------------------------------------------------------------------ // CUSTOM VALUES POST PROCESS @@ -1931,7 +2234,7 @@ $(document).ready (function () { }); $("#button-interval_add_btn").click( function() { - $('#submit-update_button').trigger('click'); + $('#button-update_button').trigger('click'); }); //------------------------------------------------------------------ @@ -1941,11 +2244,11 @@ $(document).ready (function () { $("#button-custom_module_unit_del_btn").click( function() { var unit_selected = $('#module_units option:selected').val(); $('#hidden-custom_module_unit_to_delete').val(unit_selected); - $('#submit-update_button').trigger('click'); + $('#button-update_button').trigger('click'); }); $("#button-module_unit_add_btn").click( function() { - $('#submit-update_button').trigger('click'); + $('#button-update_button').trigger('click'); }); //------------------------------------------------------------------ @@ -1982,7 +2285,7 @@ $(".logo_preview").click (function(e) { var homeUrl = ""; var homeUrlEnt = homeUrl + ""; - var elementToCheck = $('#'+e.target.id).parent().attr('id'); + var elementToCheck = e.target.id; // Fill it seing the target has been clicked switch (elementToCheck) { case 'button-custom_logo_preview': @@ -2040,6 +2343,7 @@ $(".logo_preview").click (function(e) { }); $("#button-gis_icon_preview").click (function (e) { + var homeUrl = ""; var icon_prefix = $("select#gis_default_icon option:selected").val(); var icon_path = homeUrl + "images/gis_map/icons/" + icon_prefix; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index b504b76a44..fe4e0aa8f7 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -30,6 +30,7 @@ :root { --primary-color: #14524f; --secondary-color: #ffffff; + --input-border: #c0ccdc; } /* @@ -5822,7 +5823,7 @@ div.label_select_child_left > span { width: 100%; display: flex; overflow: hidden; - height: 42px; + height: 48px; } .switch_radio_button input { @@ -5834,26 +5835,25 @@ div.label_select_child_left > span { overflow: hidden; } -div.switch_radio_button label { - background-color: #fff; +div.switch_radio_button > label { + background-color: var(--secondary-color); color: rgba(0, 0, 0, 0.6); - line-height: 6px !important; - text-align: center; - padding: 14px 10px; - margin-right: -1px; - border: 1px solid #cbcbcb; + text-align: center !important; + padding: 8px 10px; + margin-right: -2px; + border: 2px solid var(--input-border); transition: all 0.1s ease-in-out; background: transparent; } div.switch_radio_button label:first-of-type { - border-top-left-radius: 4px !important; - border-bottom-left-radius: 4px !important; + border-top-left-radius: 6px !important; + border-bottom-left-radius: 6px !important; } div.switch_radio_button label:last-of-type { - border-top-right-radius: 4px !important; - border-bottom-right-radius: 4px !important; + border-top-right-radius: 6px !important; + border-bottom-right-radius: 6px !important; margin-right: 0px; } @@ -5863,9 +5863,9 @@ div.switch_radio_button label:last-of-type { .switch_radio_button input:checked + label, .switch_radio_button input:checked:has(.custom_checkbox) { - background-color: #1d7873; + background-color: var(--primary-color); box-shadow: none; - color: #fff !important; + color: var(--secondary-color) !important; } /* @@ -11668,3 +11668,11 @@ div.ui-dialog-buttonset > button.ui-button.ui-corner-all.ui-widget:active { div#menu_full > div#menu_tabs > ul.tabs_ul { margin-bottom: 0px; } + +.filter-adapted-table-adv { +} + +.filter-adapted-table-adv tr { + display: flex; + flex-direction: column; +} diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css index 39b3368e69..90f9659028 100644 --- a/pandora_console/include/styles/tables.css +++ b/pandora_console/include/styles/tables.css @@ -575,6 +575,10 @@ table.filter-table-adv td input[type="radio"] { height: 20px; } +table.filter-table-adv div.select-with-sibling { + display: flex; + align-items: center; +} table.databox.filter-table-adv { padding: 10px; } From 9a21c40780347aed1302db6b86cd5c1172cd43d6 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Wed, 15 Mar 2023 16:35:49 +0100 Subject: [PATCH 10/13] Background white PDFS --- pandora_console/include/styles/pandoraPDF.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pandora_console/include/styles/pandoraPDF.css b/pandora_console/include/styles/pandoraPDF.css index 05bf20b846..05e6ec9bb9 100644 --- a/pandora_console/include/styles/pandoraPDF.css +++ b/pandora_console/include/styles/pandoraPDF.css @@ -28,6 +28,10 @@ * ============================================================================ */ +body { + background-color: white !important; +} + table.header_table { width: 100%; } @@ -211,3 +215,7 @@ table tbody td.cellBorder1 { table tbody td.cellBig { font-size: 18px; } + +table.info_table > tbody > tr:nth-child(even) { + background-color: #e5e9ed !important; +} From 4d6029ba3fab6b8e9dfcdeb1fb30107d0dd67339 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Wed, 15 Mar 2023 17:02:25 +0100 Subject: [PATCH 11/13] 10408-Manage agents, Agent view --- pandora_console/godmode/agentes/agent_manager.php | 8 ++++---- pandora_console/operation/agentes/alerts_status.php | 6 +++--- .../operation/agentes/estado_generalagente.php | 4 ++-- pandora_console/operation/agentes/status_events.php | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index 9281c04e44..06ec4a5308 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -971,7 +971,7 @@ foreach ($fields as $field) { $data_field[1] .= html_print_textarea( 'customvalue_'.$field['id_field'].'[]', 2, - 65, + 1000, $link_text, 'class="min-height-30px w100p"', true @@ -982,7 +982,7 @@ foreach ($fields as $field) { $data_field[1] .= html_print_textarea( 'customvalue_'.$field['id_field'].'[]', 2, - 65, + 1000, $link_url, 'class="min-height-30px w100p"', true @@ -991,7 +991,7 @@ foreach ($fields as $field) { $customContent = html_print_textarea( 'customvalue_'.$field['id_field'], 2, - 65, + 1000, $custom_value, 'class="min-height-30px w100p"', true @@ -1036,7 +1036,7 @@ if (empty($fields) === false) { '', true, false, - 'white_box white_box_opened white_table_graph_fixed', + 'white_box white_box_opened white_table_graph_fixed no_border', 'no-border custom_fields_elements' ); } diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php index 1378351614..3a6f692399 100755 --- a/pandora_console/operation/agentes/alerts_status.php +++ b/pandora_console/operation/agentes/alerts_status.php @@ -497,9 +497,9 @@ if ($agent_view_page === true) { !$alerts_defined, false, true, - 'box-flat agent_details_col', - 'white-box-content', - 'width_available' + '', + '', + 'box-flat white_table_graph w100p' ), ], ); diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index e0038ee6a3..c770017587 100755 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -710,7 +710,7 @@ if ((bool) $config['agentaccess'] === true && $access_agent > 0) { $agentAccessRate = html_print_div( [ - 'class' => 'box-flat agent_details_col mrgn_lft_20px', + 'class' => 'box-flat agent_details_col mrgn_lft_20px w50p', 'id' => 'table_access_rate', 'content' => $agentAccessRateHeader.$agentAccessRateContent, ], @@ -1038,7 +1038,7 @@ $agentEventsGraph = html_print_div( $agentEvents = html_print_div( [ - 'class' => 'box-flat agent_details_col', + 'class' => 'box-flat agent_details_col w50p', 'content' => $agentEventsHeader.$agentEventsGraph, ], true diff --git a/pandora_console/operation/agentes/status_events.php b/pandora_console/operation/agentes/status_events.php index d4c63a8b2c..478b0771c2 100755 --- a/pandora_console/operation/agentes/status_events.php +++ b/pandora_console/operation/agentes/status_events.php @@ -32,9 +32,9 @@ html_print_div( 'latest_events_agent', false, true, - 'box-flat agent_details_col', - 'white-box-content', - 'width_available' + '', + 'box-flat white-box-content no_border', + 'box-flat white_table_graph w100p' ), ], ); From d2a807636efb497ef2d4b5bb7efe29f58e47f8d4 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Wed, 15 Mar 2023 17:43:35 +0100 Subject: [PATCH 12/13] General Setup view --- .../godmode/setup/setup_general.php | 1086 +++++++++-------- pandora_console/include/functions_config.php | 4 +- pandora_console/include/styles/pandora.css | 4 + 3 files changed, 598 insertions(+), 496 deletions(-) diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php index d19d3587c6..879eef9ab3 100644 --- a/pandora_console/godmode/setup/setup_general.php +++ b/pandora_console/godmode/setup/setup_general.php @@ -14,7 +14,7 @@ * |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______| * * ============================================================================ - * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas + * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas * Please see http://pandorafms.org for full contribution list * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -26,6 +26,8 @@ * ============================================================================ */ +use function PHPSTORM_META\map; + // File begin. global $config; @@ -47,153 +49,17 @@ if (is_ajax()) { exit(); } -$performance_variables_control = (array) json_decode(io_safe_output($config['performance_variables_control'])); - -$table = new StdClass(); -$table->class = 'databox filters'; -$table->id = 'setup_general'; -$table->width = '100%'; -$table->data = []; -$table->size = []; -$table->size[0] = '30%'; -$table->style[0] = 'font-weight:bold'; -$table->size[1] = '70%'; - -$table_mail_conf = new stdClass(); -$table_mail_conf->width = '100%'; -$table_mail_conf->class = 'databox filters'; -$table_mail_conf->data = []; -$table_mail_conf->style[0] = 'font-weight: bold'; - -// Current config["language"] could be set by user, not taken from global setup ! -$current_system_lang = db_get_sql( - 'SELECT `value` FROM tconfig WHERE `token` = "language"' -); - -if ($current_system_lang == '') { - $current_system_lang = 'en'; -} - -$i = 0; - -$table->data[$i][0] = __('Language code'); -$table->data[$i++][1] = html_print_select_from_sql( - 'SELECT id_language, name FROM tlanguage', - 'language', - $current_system_lang, - '', - '', - '', - true -); - -$table->data[$i][0] = __('Remote config directory'); -$table->data[$i++][1] = html_print_input_text( - 'remote_config', - io_safe_output($config['remote_config']), - '', - 30, - 100, - true -); - -$table->data[$i][0] = __('Chromium path'); -$table->data[$i++][1] = html_print_input_text( - 'chromium_path', - io_safe_output( - $config['chromium_path'] - ), - '', - 30, - 100, - true -); - -$table->data[$i][0] = __('Auto login (hash) password'); -$table->data[$i][1] = html_print_input_password( - 'loginhash_pwd', - io_output_password($config['loginhash_pwd']), - '', - 15, - 15, - true -); -$table->data[$i++][1] .= ui_print_reveal_password( - 'loginhash_pwd', - true -); - -$table->data[$i][0] = __('Time source'); -$sources['system'] = __('System'); -$sources['sql'] = __('Database'); -$table->data[$i++][1] = html_print_select( - $sources, - 'timesource', - $config['timesource'], - '', - '', - '', - true -); - -$table->data[$i][0] = __('Automatic check for updates'); -$table->data[$i++][1] = html_print_checkbox_switch( - 'autoupdate', - 1, - $config['autoupdate'], - true -); - echo "'; -$table->data[$i][0] = __('Enforce https'); -$table->data[$i++][1] = html_print_checkbox_switch_extended( - 'https', - 1, - $config['https'], - false, - '', - '', - true -); +$performance_variables_control = (array) json_decode(io_safe_output($config['performance_variables_control'])); +$sources = []; +$sources['system'] = __('System'); +$sources['sql'] = __('Database'); -$table->data[$i][0] = __('Use cert of SSL'); -$table->data[$i++][1] = html_print_checkbox_switch_extended( - 'use_cert', - 1, - $config['use_cert'], - false, - '', - '', - true -); - -$table->rowstyle[$i] = 'display: none;'; -$table->rowid[$i] = 'ssl-path-tr'; -$table->data[$i][0] = __('Path of SSL Cert.'); -$table->data[$i++][1] = html_print_input_text( - 'cert_path', - io_safe_output($config['cert_path']), - '', - 50, - 255, - true -); - -$table->data[$i][0] = __('Attachment store'); -$table->data[$i++][1] = html_print_input_text( - 'attachment_store', - io_safe_output($config['attachment_store']), - '', - 50, - 255, - true -); - -$table->data[$i][0] = __('IP list with API access'); -if (isset($_POST['list_ACL_IPs_for_API'])) { +// ACL Ips for API. +if (isset($_POST['list_ACL_IPs_for_API']) === true) { $list_ACL_IPs_for_API = get_parameter_post('list_ACL_IPs_for_API'); } else { $list_ACL_IPs_for_API = get_parameter_get( @@ -202,51 +68,14 @@ if (isset($_POST['list_ACL_IPs_for_API'])) { ); } -$table->data[$i++][1] = html_print_textarea( - 'list_ACL_IPs_for_API', - 2, - 25, - $list_ACL_IPs_for_API, - 'class="height_130px w300px"', - true -); - -$table->data[$i][0] = __('API password'); -$table->data[$i][1] = html_print_input_password( - 'api_password', - io_output_password($config['api_password']), - '', - 25, - 255, - true -); -$table->data[$i++][1] .= ui_print_reveal_password('api_password', true); - -$table->data[$i][0] = __('Enable GIS features'); -$table->data[$i++][1] = html_print_checkbox_switch( - 'activate_gis', - 1, - $config['activate_gis'], - true -); - -$table->data[$i][0] = __('Enable Netflow'); -$rbt_disabled = false; +// Enable Netflow. if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { $rbt_disabled = true; +} else { + $rbt_disabled = false; } -$table->data[$i++][1] = html_print_checkbox_switch_extended( - 'activate_netflow', - 1, - $config['activate_netflow'], - $rbt_disabled, - '', - '', - true -); - - +// Zone names. $zone_name = [ 'Africa' => __('Africa'), 'America' => __('America'), @@ -278,83 +107,16 @@ foreach ($timezones as $timezone) { } } -$table->data[$i][0] = __('Timezone setup'); -$table->data[$i][1] = html_print_input_text_extended( - 'timezone_text', - $config['timezone'], - 'text-timezone_text', - '', - 25, - 25, - false, - '', - 'readonly', - true -); -$table->data[$i][1] .= ''.html_print_image( - 'images/edit.svg', - true, +// Force Public URL Dialog. +html_print_div( [ - 'title' => __('Change timezone'), - 'class' => 'main_menu_icon invert_filter', - ] -).''; -$table->data[$i][1] .= '  '.html_print_select( - $zone_name, - 'zone', - $zone_selected, - 'show_timezone();', - '', - '', - true -); -$table->data[$i++][1] .= '  '.html_print_select( - $timezone_n, - 'timezone', - $config['timezone'], - '', - '', - '', - true -); - -$table->data[$i][0] = __('Public URL'); -$table->data[$i++][1] = html_print_input_text( - 'public_url', - $config['public_url'], - '', - 40, - 255, - true -); - -$table->data[$i][0] = __('Force use Public URL'); -$table->data[$i++][1] = html_print_switch( - [ - 'name' => 'force_public_url', - 'value' => $config['force_public_url'], + 'id' => 'force_public_url_dialog', + 'class' => 'invisible', + 'content' => __('If public URL is not properly configured you will lose access to ').get_product_name().__(' Console'), ] ); -echo "'; - -$table->data[$i][0] = __('Public URL host exclusions'); -$table->data[$i++][1] = html_print_textarea( - 'public_url_exclusions', - 2, - 25, - $config['public_url_exclusions'], - 'class="height_50px w300px"', - true -); - -// Inventory changes blacklist. -$table->data[$i][0] = __('Inventory changes blacklist'); - +// Inventory blacklist. $inventory_changes_blacklist_id = get_parameter( 'inventory_changes_blacklist', $config['inventory_changes_blacklist'] @@ -431,171 +193,492 @@ $table_ichanges = '
'; -$table->data[$i++][1] = $table_ichanges; - -$table->data[$i][0] = __('Referer security'); -$table->data[$i++][1] = html_print_checkbox_switch( - 'referer_security', - 1, - $config['referer_security'], - true -); - -$table->data[$i][0] = __('Event storm protection'); -$table->data[$i++][1] = html_print_checkbox_switch( - 'event_storm_protection', - 1, - $config['event_storm_protection'], - true -); - - -$table->data[$i][0] = __('Command Snapshot'); -$table->data[$i++][1] = html_print_checkbox_switch( - 'command_snapshot', - 1, - $config['command_snapshot'], - true -); - -$table->data[$i][0] = __('Change remote config encoding'); -$table->data[$i++][1] = html_print_checkbox_switch( - 'use_custom_encoding', - 1, - $config['use_custom_encoding'], - true -); - -$table->data[$i][0] = __('Server logs directory'); -$table->data[$i++][1] = html_print_input_text( - 'server_log_dir', - $config['server_log_dir'], - '', - 50, - 255, - true -); - -$table->data[$i][0] = __('Log size limit in system logs viewer extension'); -$table->data[$i++][1] = html_print_input_text( - 'max_log_size', - $config['max_log_size'], - '', - 10, - 255, - true -).html_print_label(' x1000', 'max_log_size', true); - $modes_tutorial = [ 'full' => __('Full mode'), 'on_demand' => __('On demand'), 'expert' => __('Expert'), ]; -$table->data[$i][0] = __('Tutorial mode'); -$table->data[$i++][1] = html_print_select( - $modes_tutorial, - 'tutorial_mode', - $config['tutorial_mode'], - '', - '', - 0, - true -); $config['past_planned_downtimes'] = isset( $config['past_planned_downtimes'] ) ? $config['past_planned_downtimes'] : 1; -$table->data[$i][0] = __('Allow create scheduled downtimes in the past'); -$table->data[$i++][1] = html_print_checkbox_switch( - 'past_planned_downtimes', - 1, - $config['past_planned_downtimes'], - true + +$table = new stdClass(); +$table->class = 'filter-table-adv'; +$table->id = 'setup_general'; +$table->width = '100%'; +$table->data = []; +$table->size = []; +$table->size[0] = '50%'; +$table->size[1] = '50%'; + +// Current config["language"] could be set by user, not taken from global setup ! +$current_system_lang = db_get_sql( + 'SELECT `value` FROM tconfig WHERE `token` = "language"' ); -$table->data[$i][0] = __('Limit for bulk operations'); -$table->data[$i++][1] = html_print_input( +if ($current_system_lang === '') { + $current_system_lang = 'en'; +} + +$i = 0; + +$table->data[$i][] = html_print_label_input_block( + __('Language code'), + html_print_select_from_sql( + 'SELECT id_language, name FROM tlanguage', + 'language', + $current_system_lang, + '', + '', + '', + true, + false, + true, + false, + 'width:100%' + ) +); + +$table->data[$i++][] = html_print_label_input_block( + __('Remote config directory'), + html_print_input_text( + 'remote_config', + io_safe_output($config['remote_config']), + '', + 30, + 100, + true + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Chromium path'), + html_print_input_text( + 'chromium_path', + io_safe_output( + $config['chromium_path'] + ), + '', + 30, + 100, + true + ) +); + +$table->data[$i++][] = html_print_label_input_block( + __('Auto login (hash) password'), + html_print_input_password( + 'loginhash_pwd', + io_output_password($config['loginhash_pwd']), + '', + 15, + 15, + true + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Time source'), + html_print_select( + $sources, + 'timesource', + $config['timesource'], + '', + '', + '', + true + ) +); + +$table->data[$i++][] = html_print_label_input_block( + __('Attachment store'), + html_print_input_text( + 'attachment_store', + io_safe_output($config['attachment_store']), + '', + 50, + 255, + true + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Enforce https'), + html_print_checkbox_switch_extended( + 'https', + 1, + $config['https'], + false, + '', + '', + true + ) +); + +$table->data[$i++][] = html_print_label_input_block( + __('Automatic check for updates'), + html_print_checkbox_switch( + 'autoupdate', + 1, + $config['autoupdate'], + true + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Use cert of SSL'), + html_print_checkbox_switch_extended( + 'use_cert', + 1, + $config['use_cert'], + false, + '', + '', + true + ) +); + +$table->data[$i++][] = html_print_label_input_block( + __('Path of SSL Cert.'), + html_print_input_text( + 'cert_path', + io_safe_output($config['cert_path']), + '', + 50, + 255, + true + ), [ - 'type' => 'number', - 'size' => 5, - 'max' => $performance_variables_control['limit_parameters_massive']->max, - 'name' => 'limit_parameters_massive', - 'value' => $config['limit_parameters_massive'], - 'return' => true, - 'min' => $performance_variables_control['limit_parameters_massive']->min, - 'style' => 'width:50px', + 'div_id' => 'ssl-path-tr', + 'div_style' => 'display: none', ] ); -$table->data[$i][0] = __('Include agents manually disabled'); -$table->data[$i++][1] = html_print_checkbox_switch( - 'include_agents', - 1, - $config['include_agents'], - true +$table->data[$i][] = html_print_label_input_block( + __('API password'), + html_print_input_password( + 'api_password', + io_output_password($config['api_password']), + '', + 25, + 255, + true + ) ); -$table->data[$i][0] = __('Set alias as name by default in agent creation'); -$table->data[$i++][1] = html_print_checkbox_switch( - 'alias_as_name', - 1, - $config['alias_as_name'], - true +$table->data[$i++][] = html_print_label_input_block( + __('IP list with API access'), + html_print_textarea( + 'list_ACL_IPs_for_API', + 2, + 25, + $list_ACL_IPs_for_API, + 'class="height_130px"', + true + ) ); -$table->data[$i][0] = __('Unique IP'); -$table->data[$i++][1] = html_print_checkbox_switch( - 'unique_ip', - 1, - $config['unique_ip'], - true + +$table->data[$i][] = html_print_label_input_block( + __('Enable GIS features'), + html_print_checkbox_switch( + 'activate_gis', + 1, + $config['activate_gis'], + true + ) ); -$table->data[$i][0] = __('Enable console log').ui_print_help_tip( - __('Log location').': pandora_console/log/console.log', - true -); -$table->data[$i++][1] = html_print_checkbox_switch( - 'console_log_enabled', - 1, - $config['console_log_enabled'], - true +$table->data[$i++][] = html_print_label_input_block( + __('Enable Netflow'), + html_print_checkbox_switch_extended( + 'activate_netflow', + 1, + $config['activate_netflow'], + $rbt_disabled, + '', + '', + true + ) ); -$table->data[$i][0] = __('Enable audit log').ui_print_help_tip( - __('Log location').': pandora_console/log/audit.log', - true -); -$table->data[$i++][1] = html_print_checkbox_switch( - 'audit_log_enabled', - 1, - $config['audit_log_enabled'], - true +$table->colspan[$i][] = 2; +$table->data[$i++][] = html_print_label_input_block( + __('Timezone setup'), + html_print_div( + [ + 'class' => '', + 'content' => html_print_input_text_extended( + 'timezone_text', + $config['timezone'], + 'text-timezone_text', + '', + 25, + 25, + false, + '', + 'readonly', + true + ).html_print_image( + 'images/edit.svg', + true, + [ + 'id' => 'change_timezone', + 'title' => __('Change timezone'), + 'class' => 'main_menu_icon invert_filter', + ] + ).html_print_select( + $zone_name, + 'zone', + $zone_selected, + 'show_timezone();', + '', + '', + true + ).html_print_select( + $timezone_n, + 'timezone', + $config['timezone'], + '', + '', + '', + true + ), + ], + true + ) ); -$table->data[$i][0] = __('Module custom ID readonly').ui_print_help_tip( - __('Useful for integrations'), - true -); -$table->data[$i++][1] = html_print_checkbox_switch( - 'module_custom_id_ro', - 1, - $config['module_custom_id_ro'], - true +$table->data[$i][] = html_print_label_input_block( + __('Public URL'), + html_print_input_text( + 'public_url', + $config['public_url'], + '', + 40, + 255, + true + ) ); -$table->data[$i][0] = __('Enable console report').ui_print_help_tip( +$table->data[$i++][] = html_print_label_input_block( + __('Force use Public URL'), + html_print_switch( + [ + 'name' => 'force_public_url', + 'value' => $config['force_public_url'], + ] + ) +); + +$table->data[$i++][] = html_print_label_input_block( + __('Public URL host exclusions'), + html_print_textarea( + 'public_url_exclusions', + 2, + 25, + $config['public_url_exclusions'], + 'class="height_50px w300px"', + true + ) +); + +// Inventory changes blacklist. +$table->data[$i][] = html_print_label_input_block( + __('Inventory changes blacklist'), + $table_ichanges +); + +$table->data[$i++][] = html_print_label_input_block( + __('Server logs directory'), + html_print_input_text( + 'server_log_dir', + $config['server_log_dir'], + '', + 50, + 255, + true + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Event storm protection'), + html_print_checkbox_switch( + 'event_storm_protection', + 1, + $config['event_storm_protection'], + true + ) +); + +$table->data[$i++][] = html_print_label_input_block( + __('Command Snapshot'), + html_print_checkbox_switch( + 'command_snapshot', + 1, + $config['command_snapshot'], + true + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Change remote config encoding'), + html_print_checkbox_switch( + 'use_custom_encoding', + 1, + $config['use_custom_encoding'], + true + ) +); +$table->data[$i++][] = html_print_label_input_block( + __('Referer security'), + html_print_checkbox_switch( + 'referer_security', + 1, + $config['referer_security'], + true + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Log size limit in system logs viewer extension'), + html_print_div( + [ + 'class' => '', + 'content' => html_print_input_text( + 'max_log_size', + $config['max_log_size'], + '', + 20, + 255, + true + ).html_print_label( + ' x1000', + 'max_log_size', + true + ), + ], + true + ) +); +$table->data[$i++][] = html_print_label_input_block( + __('Tutorial mode'), + html_print_select( + $modes_tutorial, + 'tutorial_mode', + $config['tutorial_mode'], + '', + '', + 0, + true + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Allow create scheduled downtimes in the past'), + html_print_checkbox_switch( + 'past_planned_downtimes', + 1, + $config['past_planned_downtimes'], + true + ) +); +$table->data[$i++][] = html_print_label_input_block( + __('Limit for bulk operations'), + html_print_input( + [ + 'type' => 'number', + 'size' => 5, + 'max' => $performance_variables_control['limit_parameters_massive']->max, + 'name' => 'limit_parameters_massive', + 'value' => $config['limit_parameters_massive'], + 'return' => true, + 'min' => $performance_variables_control['limit_parameters_massive']->min, + 'style' => 'width:50%', + ] + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Include agents manually disabled'), + html_print_checkbox_switch( + 'include_agents', + 1, + $config['include_agents'], + true + ) +); +$table->data[$i++][] = html_print_label_input_block( + __('Set alias as name by default in agent creation'), + html_print_checkbox_switch( + 'alias_as_name', + 1, + $config['alias_as_name'], + true + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Unique IP'), + html_print_checkbox_switch( + 'unique_ip', + 1, + $config['unique_ip'], + true + ) +); + +$table->data[$i++][] = html_print_label_input_block( + __('Module custom ID readonly'), + html_print_checkbox_switch( + 'module_custom_id_ro', + 1, + $config['module_custom_id_ro'], + true + ).ui_print_input_placeholder( + __('Useful for integrations'), + true + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Enable console log'), + html_print_checkbox_switch( + 'console_log_enabled', + 1, + $config['console_log_enabled'], + true + ).ui_print_input_placeholder( + __('Log location').': pandora_console/log/console.log', + true + ) +); + +$table->data[$i++][] = html_print_label_input_block( + __('Enable audit log'), + html_print_checkbox_switch( + 'audit_log_enabled', + 1, + $config['audit_log_enabled'], + true + ).ui_print_input_placeholder( + __('Log location').': pandora_console/log/audit.log', + true + ) +); + +$table->data[$i][] = html_print_label_input_block( __('Enable console report'), - true -); -$table->data[$i++][1] = html_print_checkbox_switch( - 'reporting_console_enable', - 1, - $config['reporting_console_enable'], - true + html_print_checkbox_switch( + 'reporting_console_enable', + 1, + $config['reporting_console_enable'], + true + ) ); -echo '
'; +echo ''; echo '
'; echo ''.__('General options').''; @@ -615,7 +698,7 @@ echo '
'; echo '
'; echo ''.__('Mail configuration').''; - $table_mail_conf->data[0][0] = ui_print_warning_message( + ui_print_warning_message( __( 'Please notice that some providers like Gmail or Office365 need to setup/enable manually external connections using SMTP and you need to use STARTTLS on port 587. @@ -623,114 +706,128 @@ echo ''.__('Mail configuration').''; ) ); - $table_mail_conf->data[1][0] = __('From address'); - $table_mail_conf->data[1][1] = html_print_input_text( - 'email_from_dir', - $config['email_from_dir'], - '', - 30, - 100, - true + $table_mail_conf = new stdClass(); + $table_mail_conf->width = '100%'; + $table_mail_conf->class = 'databox filter-table-adv'; + $table_mail_conf->size = []; + $table_mail_conf->size[0] = '50%'; + $table_mail_conf->size[1] = '50%'; + $table_mail_conf->data = []; + + $table_mail_conf->data[0][] = html_print_label_input_block( + __('From address'), + html_print_input_text( + 'email_from_dir', + $config['email_from_dir'], + '', + 30, + 100, + true + ) ); - $table_mail_conf->data[2][0] = __('From name'); - $table_mail_conf->data[2][1] = html_print_input_text( - 'email_from_name', - $config['email_from_name'], - '', - 30, - 100, - true + $table_mail_conf->data[0][] = html_print_label_input_block( + __('From name'), + html_print_input_text( + 'email_from_name', + $config['email_from_name'], + '', + 30, + 100, + true + ) ); - $table_mail_conf->data[3][0] = __('SMTP Server'); - $table_mail_conf->data[3][1] = html_print_input_text( - 'email_smtpServer', - $config['email_smtpServer'], - '', - 30, - 100, - true + $table_mail_conf->data[1][] = html_print_label_input_block( + __('SMTP Server'), + html_print_input_text( + 'email_smtpServer', + $config['email_smtpServer'], + '', + 30, + 100, + true + ) ); - $table_mail_conf->data[4][0] = __('SMTP Port'); - $table_mail_conf->data[4][1] = html_print_input_text( - 'email_smtpPort', - $config['email_smtpPort'], - '', - 30, - 100, - true + $table_mail_conf->data[1][] = html_print_label_input_block( + __('SMTP Port'), + html_print_input_text( + 'email_smtpPort', + $config['email_smtpPort'], + '', + 30, + 100, + true + ) ); - $table_mail_conf->data[5][0] = __('Encryption'); - $table_mail_conf->data[5][1] = html_print_select( - $encryption, - 'email_encryption', - $config['email_encryption'], - '', - __('none'), - 0, - true + $table_mail_conf->data[2][] = html_print_label_input_block( + __('Email user'), + html_print_input_text( + 'email_username', + $config['email_username'], + '', + 30, + 100, + true + ) + ); + $table_mail_conf->data[2][] = html_print_label_input_block( + __('Email password'), + html_print_input_password( + 'email_password', + io_output_password( + $config['email_password'] + ), + '', + 30, + 100, + true + ) ); - $table_mail_conf->data[6][0] = __('Email user'); - $table_mail_conf->data[6][1] = html_print_input_text( - 'email_username', - $config['email_username'], - '', - 30, - 100, - true - ); - - $table_mail_conf->data[7][0] = __('Email password'); - $table_mail_conf->data[7][1] = html_print_input_password( - 'email_password', - io_output_password( - $config['email_password'] - ), - '', - 30, - 100, - true - ); - $table_mail_conf->data[7][1] .= ui_print_reveal_password( - 'email_password', - true + $table_mail_conf->data[3][] = html_print_label_input_block( + __('Encryption'), + html_print_select( + $encryption, + 'email_encryption', + $config['email_encryption'], + '', + __('none'), + 0, + true + ) ); $uniqid = uniqid(); - $table_mail_conf->data[8][0] = html_print_button( - __('Email test'), - 'email_test_dialog', - false, - "show_email_test('".$uniqid."');", - [ 'icon' => 'next' ], - true - ); - print_email_test_modal_window($uniqid); html_print_input_hidden('update_config', 1); html_print_table($table_mail_conf); - echo '
'; - html_print_div( - [ - 'class' => 'action-buttons w100p', - 'content' => html_print_submit_button( - __('Update'), - 'update_button', - false, - ['icon' => 'update'], - true - ), - ] + html_print_action_buttons( + html_print_submit_button( + __('Update'), + 'update_button', + false, + ['icon' => 'update'], + true + ).html_print_button( + __('Email test'), + 'email_test_dialog', + false, + 'show_email_test("'.$uniqid.'");', + [ + 'icon' => 'mail', + 'mode' => 'secondary', + ], + true + ) ); echo '
'; @@ -748,26 +845,27 @@ echo ''.__('Mail configuration').''; // Email config table. $table_mail_test = new stdClass(); $table_mail_test->width = '100%'; - $table_mail_test->class = 'databox filters'; + $table_mail_test->class = 'filter-table-adv'; $table_mail_test->data = []; - $table_mail_test->style[0] = 'font-weight: bold;'; - $table_mail_test->style[1] = 'font-weight: bold;display: flex;height: 54px;align-items: center;padding-left: 15px;'; - $table_mail_test->data[0][0] = __('Address'); - $table_mail_test->data[0][1] = html_print_input_text( - 'email_test_address', - '', - '', - 35, - 100, - true + $table_mail_test->data[0][] = html_print_label_input_block( + __('Address'), + html_print_input_text( + 'email_test_address', + '', + '', + 35, + 100, + true + ) ); - $table_mail_test->data[1][0] = '  Email could not be sent'; + $table_mail_test->data[1][] = '  Email could not be sent'; - $table_mail_test->data[1][1] = html_print_div( + // $table_mail_test->colspan[2][0] = 2; + $submitButton = html_print_div( [ - 'class' => 'action-buttons w100p', + 'class' => 'action-buttons-right-forced', 'content' => html_print_button( __('Send'), 'email_test', @@ -783,7 +881,7 @@ echo ''.__('Mail configuration').''; true ); - echo ''; + echo ''; } diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 24d2de537d..057572a863 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -3218,7 +3218,7 @@ function config_process_config() // Try to update user table in order to refresh skin inmediatly. $is_user_updating = get_parameter('sec2', ''); - if ($is_user_updating == 'operation/users/user_edit') { + if ($is_user_updating === 'godmode/users/configure_user') { $id = get_parameter_get('id', $config['id_user']); // ID given as parameter. $user_info = get_user_info($id); @@ -3746,7 +3746,7 @@ function config_user_set_custom_config() } } - if (defined('METACONSOLE')) { + if (is_metaconsole() === true) { $config['metaconsole_access'] = $userinfo['metaconsole_access']; } } diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index ff5298844f..dadb98544e 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -10465,6 +10465,10 @@ button div.upd { -webkit-mask: url(../../images/validate.svg) no-repeat center / contain; } +button div.mail { + mask: url(../../images/mail@svg.svg) no-repeat center / contain; + -webkit-mask: url(../../images/mail@svg.svg) no-repeat center / contain; +} button div.sound { mask: url(../../images/sound_console@svg.svg) no-repeat center / contain; -webkit-mask: url(../../images/sound_console@svg.svg) no-repeat center / From 39f342a9826aa754bf3c360f794b50a92e4536d7 Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 15 Mar 2023 21:17:50 +0100 Subject: [PATCH 13/13] fixed styles --- pandora_console/include/styles/pandora.css | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index dadb98544e..56b03ebb1d 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -11260,6 +11260,15 @@ input.main_menu_icon[src$=".svg"] { .main_menu_icon.arrow_down { transform: rotate(270deg); } + +.main_menu_icon.arrow_left { + transform: rotate(0deg); +} + +.main_menu_icon.arrow_right { + transform: rotate(180deg); +} + .after_input_icon { width: 32px; margin-left: 10px; @@ -11521,6 +11530,12 @@ div[role="dialog"] { margin: 0 auto; } +.policy_background_state { + mask: url(../../images/policy@svg.svg) no-repeat center / contain; + -webkit-mask: url(../../images/policy@svg.svg) no-repeat center / contain; + margin: 0 auto; +} + .filter-list-adv .wizard li { display: grid; }