diff --git a/pandora_console/extensions/files_repo.php b/pandora_console/extensions/files_repo.php index 656c3377c7..26e21750bb 100644 --- a/pandora_console/extensions/files_repo.php +++ b/pandora_console/extensions/files_repo.php @@ -240,7 +240,28 @@ function pandora_files_repo_operation() } // Header. - ui_print_page_header(__('Files repository'), 'images/extensions.png', false, '', false, $onheader); + ui_print_standard_header( + __('Files repository'), + 'images/extensions.png', + false, + '', + false, + $onheader, + [ + [ + 'link' => '', + 'label' => __('Admin tools'), + ], + [ + 'link' => '', + 'label' => __('Extension manager'), + ], + [ + 'link' => '', + 'label' => __('Files repository'), + ], + ] + ); $full_extensions_dir = $config['homedir'].'/'.EXTENSIONS_DIR.'/'; include_once $full_extensions_dir.'files_repo/functions_files_repo.php'; diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index 0231245274..b30f3d4c2c 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -445,79 +445,75 @@ $tableBasicThresholds->rowclass['caption_warning_threshold'] = 'field_half_width $tableBasicThresholds->rowclass['warning_threshold'] = 'field_half_width'; $tableBasicThresholds->data['caption_warning_threshold'][0] .= __('Warning threshold').' '; -if ((isset($stringTypeModule) === false || $stringTypeModule === false)) { - $tableBasicThresholds->data['caption_warning_threshold'][0] .= '('.__('Min / Max').')'; - $tableBasicThresholds->data['warning_threshold'][0] .= html_print_input_text( - 'min_warning', - $min_warning, - '', - 10, - 255, - true, - $disabledBecauseInPolicy || $edit === true, - false, - '', - $classdisabledBecauseInPolicy - ); - $tableBasicThresholds->data['warning_threshold'][1] .= html_print_input_text( - 'max_warning', - $max_warning, - '', - 10, - 255, - true, - $disabledBecauseInPolicy || $edit === true, - false, - '', - $classdisabledBecauseInPolicy - ).''; +$tableBasicThresholds->data['caption_warning_threshold'][0] .= '('.__('Min / Max').')'; +$tableBasicThresholds->data['warning_threshold'][0] .= html_print_input_text( + 'min_warning', + $min_warning, + '', + 10, + 255, + true, + $disabledBecauseInPolicy || $edit === true, + false, + '', + $classdisabledBecauseInPolicy +); +$tableBasicThresholds->data['warning_threshold'][1] .= html_print_input_text( + 'max_warning', + $max_warning, + '', + 10, + 255, + true, + $disabledBecauseInPolicy || $edit === true, + false, + '', + $classdisabledBecauseInPolicy +).''; - $tableBasicThresholds->data['switch_warning_threshold'][0] .= html_print_switch_radio_button( - [ - html_print_radio_button_extended('warning_thresholds_checks', 'normal_warning', __('Normal'), ($percentage_warning && $warning_inverse) === false, false, '', '', true, false, '', 'radius-normal_warning'), - html_print_radio_button_extended('warning_thresholds_checks', 'warning_inverse', __('Inverse interval'), $warning_inverse, $disabledBecauseInPolicy, '', '', true, false, '', 'radius-warning_inverse'), - html_print_radio_button_extended('warning_thresholds_checks', 'percentage_warning', __('Percentage'), $percentage_warning, $disabledBecauseInPolicy, '', '', true, false, '', 'radius-percentage_warning'), - ], - [ 'class' => 'margin-top-10' ], - true - ); -} +$tableBasicThresholds->data['switch_warning_threshold'][0] .= html_print_switch_radio_button( + [ + html_print_radio_button_extended('warning_thresholds_checks', 'normal_warning', __('Normal'), ($percentage_warning && $warning_inverse) === false, false, '', '', true, false, '', 'radius-normal_warning'), + html_print_radio_button_extended('warning_thresholds_checks', 'warning_inverse', __('Inverse interval'), $warning_inverse, $disabledBecauseInPolicy, '', '', true, false, '', 'radius-warning_inverse'), + html_print_radio_button_extended('warning_thresholds_checks', 'percentage_warning', __('Percentage'), $percentage_warning, $disabledBecauseInPolicy, '', '', true, false, '', 'radius-percentage_warning'), + ], + [ 'class' => 'margin-top-10' ], + true +); -if (isset($stringTypeModule) === true && $stringTypeModule === true) { - $basicThresholdsIntervalWarning = []; - $basicThresholdsIntervalWarning[] = ''.__('Inverse interval').''; - $basicThresholdsIntervalWarning[] = html_print_checkbox_switch( - 'warning_inverse_string', - 1, - $warning_inverse, - true, - $disabledBecauseInPolicy - ); +$basicThresholdsIntervalWarning = []; +$basicThresholdsIntervalWarning[] = ''.__('Inverse interval').''; +$basicThresholdsIntervalWarning[] = html_print_checkbox_switch( + 'warning_inverse_string', + 1, + $warning_inverse, + true, + $disabledBecauseInPolicy +); - $tableBasicThresholds->rowclass['caption_switch_warning_inverse_string'] = 'field_half_width'; - $tableBasicThresholds->data['caption_switch_warning_inverse_string'][0] = html_print_div( - [ - 'class' => 'margin-top-10', - 'style' => 'display: flex; flex-direction: row-reverse; align-items: center;', - 'content' => implode('', $basicThresholdsIntervalWarning), - ], - true - ); +$tableBasicThresholds->rowclass['caption_switch_warning_inverse_string'] = 'field_half_width'; +$tableBasicThresholds->data['caption_switch_warning_inverse_string'][0] = html_print_div( + [ + 'class' => 'margin-top-10', + 'style' => 'display: flex; flex-direction: row-reverse; align-items: center;', + 'content' => implode('', $basicThresholdsIntervalWarning), + ], + true +); - $tableBasicThresholds->data['caption_warning_threshold'][0] .= '('.__('Str.').')'; - $tableBasicThresholds->data['warning_threshold'][0] .= html_print_input_text( - 'str_warning', - str_replace('"', '', $str_warning), - '', - 10, - 1024, - true, - $disabledBecauseInPolicy || $edit === false, - false, - '', - $classdisabledBecauseInPolicy - ).''; -} +$tableBasicThresholds->data['caption_warning_threshold'][0] .= '('.__('Str.').')'; +$tableBasicThresholds->data['warning_threshold'][0] .= html_print_input_text( + 'str_warning', + str_replace('"', '', $str_warning), + '', + 10, + 1024, + true, + $disabledBecauseInPolicy || $edit === false, + false, + '', + $classdisabledBecauseInPolicy +).''; $tableBasicThresholds->data['switch_warning_threshold'][0] .= html_print_div( @@ -532,87 +528,84 @@ $tableBasicThresholds->data['switch_warning_threshold'][0] .= html_print_div( $tableBasicThresholds->rowclass['caption_critical_threshold'] = 'field_half_width pdd_t_10px'; $tableBasicThresholds->rowclass['critical_threshold'] = 'field_half_width'; $tableBasicThresholds->data['caption_critical_threshold'][0] .= __('Critical threshold').' '; -if ((isset($stringTypeModule) === false || $stringTypeModule === false)) { - $tableBasicThresholds->data['caption_critical_threshold'][0] .= '('.__('Min / Max').')'; - $tableBasicThresholds->data['critical_threshold'][0] .= html_print_input_text( - 'min_critical', - $min_critical, - '', - 10, - 255, - true, - $disabledBecauseInPolicy || $edit === false, - false, - '', - $classdisabledBecauseInPolicy - ); - $tableBasicThresholds->data['critical_threshold'][1] .= html_print_input_text( - 'max_critical', - $max_critical, - '', - 10, - 255, - true, - $disabledBecauseInPolicy || $edit === false, - false, - '', - $classdisabledBecauseInPolicy - ).''; +$tableBasicThresholds->data['caption_critical_threshold'][0] .= '('.__('Min / Max').')'; +$tableBasicThresholds->data['critical_threshold'][0] .= html_print_input_text( + 'min_critical', + $min_critical, + '', + 10, + 255, + true, + $disabledBecauseInPolicy || $edit === false, + false, + '', + $classdisabledBecauseInPolicy +); +$tableBasicThresholds->data['critical_threshold'][1] .= html_print_input_text( + 'max_critical', + $max_critical, + '', + 10, + 255, + true, + $disabledBecauseInPolicy || $edit === false, + false, + '', + $classdisabledBecauseInPolicy +).''; - $tableBasicThresholds->data['switch_critical_threshold'][0] .= html_print_switch_radio_button( - [ - html_print_radio_button_extended('critical_thresholds_checks', 'normal_critical', __('Normal'), ($percentage_critical && $critical_inverse) === false, false, '', '', true, false, '', 'radius-normal_critical'), - html_print_radio_button_extended('critical_thresholds_checks', 'critical_inverse', __('Inverse interval'), $critical_inverse, $disabledBecauseInPolicy, '', '', true, false, '', 'radius-critical_inverse'), - html_print_radio_button_extended('critical_thresholds_checks', 'percentage_critical', __('Percentage'), $percentage_critical, $disabledBecauseInPolicy, '', '', true, false, '', 'radius-percentage_critical'), - ], - [ 'class' => 'margin-top-10' ], - true - ); -} +$tableBasicThresholds->data['switch_critical_threshold'][0] .= html_print_switch_radio_button( + [ + html_print_radio_button_extended('critical_thresholds_checks', 'normal_critical', __('Normal'), ($percentage_critical && $critical_inverse) === false, false, '', '', true, false, '', 'radius-normal_critical'), + html_print_radio_button_extended('critical_thresholds_checks', 'critical_inverse', __('Inverse interval'), $critical_inverse, $disabledBecauseInPolicy, '', '', true, false, '', 'radius-critical_inverse'), + html_print_radio_button_extended('critical_thresholds_checks', 'percentage_critical', __('Percentage'), $percentage_critical, $disabledBecauseInPolicy, '', '', true, false, '', 'radius-percentage_critical'), + ], + [ 'class' => 'margin-top-10' ], + true +); -if (isset($stringTypeModule) === true && $stringTypeModule === true) { - $basicThresholdsIntervalCritical = []; - $basicThresholdsIntervalCritical[] = ''.__('Inverse interval').''; - $basicThresholdsIntervalCritical[] = html_print_checkbox_switch( - 'critical_inverse_string', - 1, - $critical_inverse, - true, - $disabledBecauseInPolicy - ); - $tableBasicThresholds->rowclass['caption_switch_critical_inverse_string'] = 'field_half_width'; - $tableBasicThresholds->data['caption_switch_critical_inverse_string'][0] = html_print_div( - [ - 'class' => 'margin-top-10', - 'style' => 'display: flex; flex-direction: row-reverse; align-items: center;', - 'content' => implode('', $basicThresholdsIntervalCritical), - ], - true - ); +$basicThresholdsIntervalCritical = []; +$basicThresholdsIntervalCritical[] = ''.__('Inverse interval').''; +$basicThresholdsIntervalCritical[] = html_print_checkbox_switch( + 'critical_inverse_string', + 1, + $critical_inverse, + true, + $disabledBecauseInPolicy +); - $tableBasicThresholds->data['switch_critical_threshold'][0] .= html_print_div( - [ - 'id' => 'percentage_critical', - 'content' => $divPercentageContent, - ], - true - ); +$tableBasicThresholds->rowclass['caption_switch_critical_inverse_string'] = 'field_half_width'; +$tableBasicThresholds->data['caption_switch_critical_inverse_string'][0] = html_print_div( + [ + 'class' => 'margin-top-10', + 'style' => 'display: flex; flex-direction: row-reverse; align-items: center;', + 'content' => implode('', $basicThresholdsIntervalCritical), + ], + true +); - $tableBasicThresholds->data['caption_critical_threshold'][0] .= '('.__('Str.').')'; - $tableBasicThresholds->data['critical_threshold'][0] .= html_print_input_text( - 'str_critical', - str_replace('"', '', $str_critical), - '', - 10, - 1024, - true, - $disabledBecauseInPolicy, - false, - '', - $classdisabledBecauseInPolicy - ); -} +$tableBasicThresholds->data['switch_critical_threshold'][0] .= html_print_div( + [ + 'id' => 'percentage_critical', + 'content' => $divPercentageContent, + ], + true +); + +$tableBasicThresholds->data['caption_critical_threshold'][0] .= '('.__('Str.').')'; +$tableBasicThresholds->data['critical_threshold'][0] .= html_print_input_text( + 'str_critical', + str_replace('"', '', $str_critical), + '', + 10, + 1024, + true, + $disabledBecauseInPolicy, + false, + '', + $classdisabledBecauseInPolicy +); $table_simple->rowstyle['thresholds_table'] = 'margin-top: 15px;height: 340px;width: 100%'; $table_simple->cellclass['thresholds_table'][0] = 'table_section half_section_left'; @@ -1623,6 +1616,11 @@ ui_require_jquery_file('json'); /* ; + var idModuleType = ''; + if (idModuleType != '') { + setModuleType(idModuleType); + } + $("#right").click (function () { jQuery.each($("select[name='id_tag_available[]'] option:selected"), function (key, value) { tag_name = $(value).html(); diff --git a/pandora_console/godmode/setup/os.list.php b/pandora_console/godmode/setup/os.list.php index 96223e8d09..7ec091e04b 100644 --- a/pandora_console/godmode/setup/os.list.php +++ b/pandora_console/godmode/setup/os.list.php @@ -69,7 +69,6 @@ if ($is_management_allowed === true) { $table->head[4] = ''; } -$table->align[1] = 'center'; if ($is_management_allowed === true) { $table->align[4] = 'center'; } @@ -100,7 +99,7 @@ $table->data = []; foreach ($osList as $os) { $data = []; $data[] = $os['id_os']; - $data[] = html_print_div(['class' => 'invert_filter main_menu_icon', 'content' => ui_print_os_icon($os['id_os'], false, true)], true); + $data[] = ui_print_os_icon($os['id_os'], false, true); if ($is_management_allowed === true) { if (is_metaconsole() === true) { $osNameUrl = 'index.php?sec=advanced&sec2=advanced/component_management&tab=os_manage&action=edit&tab2=builder&id_os='.$os['id_os']; diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index 13fab04eab..c475a44207 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -6097,6 +6097,8 @@ function html_print_autocomplete_users_from_integria( $attrs['class'] = $class; } + ui_print_help_tip(__('Type at least two characters to search the user.'), false); + html_print_input_text_extended( $name, $default, @@ -6110,8 +6112,6 @@ function html_print_autocomplete_users_from_integria( ); html_print_input_hidden($name.'_hidden', $id_agent_module); - ui_print_help_tip(__('Type at least two characters to search the user.'), false); - $javascript_ajax_page = ui_get_full_url('ajax.php', false, false, false, false); ?> \ No newline at end of file diff --git a/pandora_console/operation/incidents/incident_statistics.php b/pandora_console/operation/incidents/incident_statistics.php index 333c0206db..c2e428f188 100755 --- a/pandora_console/operation/incidents/incident_statistics.php +++ b/pandora_console/operation/incidents/incident_statistics.php @@ -18,13 +18,31 @@ require_once $config['homedir'].'/include/functions_graph.php'; check_login(); -ui_print_page_header(__('Incidents').' » '.__('Statistics'), 'images/book_edit.png', false, '', false, ''); +ui_print_standard_header( + __('Statistics'), + 'images/book_edit.png', + false, + '', + false, + [], + [ + [ + 'link' => '', + 'label' => __('Issues'), + ], + [ + 'link' => '', + 'label' => __('Statistics'), + ], + ] +); if (!$config['integria_enabled']) { ui_print_error_message(__('In order to access ticket management system, integration with Integria IMS must be enabled and properly configured')); exit; } +echo '
'.__('Incidents by status').''; echo graph_incidents_status(); @@ -39,3 +57,4 @@ echo ' | '.__('Incidents by user').''; echo graphic_incident_user(); echo ' |