'.html_print_extended_select_for_time(
'interval',
$this->task['interval_sweep'],
'',
diff --git a/pandora_console/include/ajax/audit_log.php b/pandora_console/include/ajax/audit_log.php
index 4d92704852..dbb842047c 100644
--- a/pandora_console/include/ajax/audit_log.php
+++ b/pandora_console/include/ajax/audit_log.php
@@ -160,7 +160,7 @@ if ($load_filter_modal) {
true,
'',
false,
- 'margin-left:5px; width:'.$filter_id_width.';'
+ 'width:'.$filter_id_width.';'
);
$table->rowclass[] = 'display-grid';
@@ -169,8 +169,9 @@ if ($load_filter_modal) {
'load_filter',
false,
[
- 'class' => 'mini w25p',
- 'style' => 'margin-left: 73%',
+ 'class' => 'mini w30p',
+ 'icon' => 'load',
+ 'style' => 'margin-left: 208px; width: 130px;',
'onclick' => 'load_filter_values();',
],
true
@@ -189,7 +190,7 @@ function show_filter() {
draggable: true,
modal: false,
closeOnEscape: true,
- width: 500
+ width: 380
});
}
@@ -293,8 +294,9 @@ if ($save_filter_modal) {
'save_filter',
false,
[
- 'class' => 'mini w25p',
- 'style' => 'margin-left: 56%',
+ 'class' => 'mini ',
+ 'icon' => 'save',
+ 'style' => 'margin-left: 175px; width: 125px;',
'onclick' => 'save_new_filter();',
],
true
@@ -330,8 +332,9 @@ if ($save_filter_modal) {
'update_filter',
false,
[
- 'class' => 'mini w25p',
- 'style' => 'margin-left: 56%',
+ 'class' => 'mini ',
+ 'icon' => 'save',
+ 'style' => 'margin-left: 155px; width: 145px;',
'onclick' => 'save_update_filter();',
],
true
diff --git a/pandora_console/include/ajax/heatmap.ajax.php b/pandora_console/include/ajax/heatmap.ajax.php
index dd22fcdfef..37806fb4a4 100644
--- a/pandora_console/include/ajax/heatmap.ajax.php
+++ b/pandora_console/include/ajax/heatmap.ajax.php
@@ -45,73 +45,101 @@ if (is_ajax() === true) {
$group = get_parameter('group', true);
echo '
';
}
if ($getFilterType === true) {
$filter = get_parameter('filter', 0);
- echo '
';
+ $label = ' ';
+
switch ($type) {
case 0:
default:
- echo '
'.__('Group').'
';
- echo html_print_input(
+ $label = __('Group');
+ $input = html_print_input(
[
'type' => 'select_groups',
'returnAllGroup' => true,
@@ -126,9 +154,9 @@ if (is_ajax() === true) {
break;
case 1:
- echo '
'.__('Tag').'
';
+ $label = __('Tag');
if (tags_has_user_acl_tags($config['id_user']) === false) {
- echo html_print_select_from_sql(
+ $input = html_print_select_from_sql(
'SELECT id_tag, name
FROM ttag
WHERE id_tag
@@ -142,7 +170,7 @@ if (is_ajax() === true) {
true,
false,
false,
- 'width: 200px',
+ 'width: 100%',
'5'
);
} else {
@@ -150,7 +178,7 @@ if (is_ajax() === true) {
if (!empty($user_tags)) {
$id_user_tags = array_keys($user_tags);
- echo html_print_select_from_sql(
+ $input = html_print_select_from_sql(
'SELECT id_tag, name
FROM ttag
WHERE id_tag IN ('.implode(',', $id_user_tags).')
@@ -164,11 +192,11 @@ if (is_ajax() === true) {
true,
false,
false,
- 'width: 200px',
+ 'width: 100%',
'5'
);
} else {
- echo html_print_select_from_sql(
+ $input = html_print_select_from_sql(
'SELECT id_tag, name
FROM ttag
WHERE id_tag
@@ -182,7 +210,7 @@ if (is_ajax() === true) {
true,
false,
false,
- 'width: 200px',
+ 'width: 100%',
'5'
);
}
@@ -190,8 +218,8 @@ if (is_ajax() === true) {
break;
case 2:
- echo '
'.__('Module group').'
';
- echo html_print_select_from_sql(
+ $label = __('Module group');
+ $input = html_print_select_from_sql(
'SELECT id_mg, name FROM tmodule_group ORDER BY name',
'filter[]',
$filter,
@@ -202,7 +230,7 @@ if (is_ajax() === true) {
true,
true,
false,
- 'width: 200px',
+ 'width: 100%',
'5'
);
break;
@@ -212,7 +240,14 @@ if (is_ajax() === true) {
break;
}
- echo '
';
+ echo html_print_label_input_block(
+ $label,
+ $input,
+ [
+ 'label_class' => 'font-title-font',
+ 'div_class' => 'mrgn_top_10px',
+ ]
+ );
}
if ($getInfo === true) {
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 296971bfc5..450faa0e9a 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -1279,7 +1279,7 @@ if (check_login()) {
if ((int) $module['flag'] === 0) {
$additionalLinkAction = '&flag=1';
$linkCaption = __('Force checks');
- $imgaction = 'images/target.png';
+ $imgaction = 'images/force@svg.svg';
} else {
$additionalLinkAction = '';
$linkCaption = __('Refresh');
diff --git a/pandora_console/include/class/AgentWizard.class.php b/pandora_console/include/class/AgentWizard.class.php
index 2580d17371..00b9de46f0 100644
--- a/pandora_console/include/class/AgentWizard.class.php
+++ b/pandora_console/include/class/AgentWizard.class.php
@@ -4132,10 +4132,10 @@ class AgentWizard extends HTML
$table->width = '100%';
$table->class = 'info_table';
// Subheaders for Warning and Critical columns.
- $subheaders = '
Min.';
- $subheaders .= '
Max.';
- $subheaders .= '
Inv.';
- $subheaders .= '
%.';
+ $subheaders = '
Min.';
+ $subheaders .= '
Max.';
+ $subheaders .= '
Inv.';
+ $subheaders .= '
%.';
// Warning header.
$warning_header = html_print_div(
@@ -4352,8 +4352,7 @@ class AgentWizard extends HTML
);
$data_warning .= html_print_div(
[
- 'class' => 'wizard-column-levels-check',
- 'style' => 'margin-top: 0.3em;',
+ 'class' => 'wizard-column-levels-check mrgn_top_10px',
'content' => html_print_checkbox(
'module-warning-inv-'.$uniqueId,
$module['inv_warning'],
@@ -4369,8 +4368,7 @@ class AgentWizard extends HTML
);
$data_warning .= html_print_div(
[
- 'class' => 'wizard-column-levels-check',
- 'style' => 'margin-top: 0.3em;',
+ 'class' => 'wizard-column-levels-check mrgn_top_10px',
'content' => html_print_checkbox(
'module-warning-perc-'.$uniqueId,
$module['perc_warning'],
@@ -4436,8 +4434,7 @@ class AgentWizard extends HTML
$data[4] .= html_print_div(
[
- 'class' => 'wizard-column-levels-check',
- 'style' => 'margin-top: 0.3em;',
+ 'class' => 'wizard-column-levels-check mrgn_top_10px',
'content' => html_print_checkbox(
'module-critical-inv-'.$uniqueId,
$module['inv_critical'],
@@ -4454,8 +4451,7 @@ class AgentWizard extends HTML
$data[4] .= html_print_div(
[
- 'class' => 'wizard-column-levels-check',
- 'style' => 'margin-top: 0.3em;',
+ 'class' => 'wizard-column-levels-check mrgn_top_10px',
'content' => html_print_checkbox(
'module-critical-perc-'.$uniqueId,
$module['perc_critical'],
@@ -4490,7 +4486,7 @@ class AgentWizard extends HTML
'',
true,
'',
- 'pdd_0px'
+ 'pdd_0px mrgn_top-8px'
);
} else {
// WIP. Current value of this module.
diff --git a/pandora_console/include/class/AgentsAlerts.class.php b/pandora_console/include/class/AgentsAlerts.class.php
index 379b595d5a..1e3dc705b8 100644
--- a/pandora_console/include/class/AgentsAlerts.class.php
+++ b/pandora_console/include/class/AgentsAlerts.class.php
@@ -771,7 +771,7 @@ class AgentsAlerts extends HTML
$headerInputs = [];
$headerInputs[] = [
- 'label' => __('Group'),
+ 'label' => '
'.__('Group').'',
'id' => 'select-group-id',
'arguments' => [
'name' => 'group-id',
@@ -788,8 +788,9 @@ class AgentsAlerts extends HTML
];
$headerInputs[] = [
- 'label' => __('Show modules without alerts'),
+ 'label' => '
'.__('Show modules without alerts').'',
'id' => 'txt-use-agent-ip',
+ 'class' => 'display-grid mrgn_lft_15px mrgn_btn_5px',
'arguments' => [
'name' => 'show-modules-without-alerts',
'checked' => $this->showWithoutAlertModules,
diff --git a/pandora_console/include/class/CustomNetScan.class.php b/pandora_console/include/class/CustomNetScan.class.php
index e0fd3708ac..2fec9d8b9a 100644
--- a/pandora_console/include/class/CustomNetScan.class.php
+++ b/pandora_console/include/class/CustomNetScan.class.php
@@ -524,7 +524,7 @@ class CustomNetScan extends Wizard
// Schedule.
$form['inputs'][] = [
'label' => __('Interval').ui_print_help_tip(
- __('Manual interval means that it will be executed only On-demand'),
+ __('Manual interval means that it will be executed only On-demand').', '.__('The minimum recomended interval for Recon Task is 5 minutes'),
true
),
'class' => 'input-interval',
@@ -549,9 +549,6 @@ class CustomNetScan extends Wizard
true,
false,
false
- ).ui_print_help_tip(
- __('The minimum recomended interval for Recon Task is 5 minutes'),
- true
).'',
];
diff --git a/pandora_console/include/functions_cron.php b/pandora_console/include/functions_cron.php
index 3467ff9184..5e47040449 100644
--- a/pandora_console/include/functions_cron.php
+++ b/pandora_console/include/functions_cron.php
@@ -530,7 +530,7 @@ function cron_list_table()
$task['id']
),
'content' => html_print_image(
- 'images/change-active.svg',
+ 'images/force@svg.svg',
true,
[
'title' => __('Force run'),
@@ -568,7 +568,7 @@ function cron_list_table()
$task['id']
),
'content' => html_print_image(
- 'images/change-active.svg',
+ 'images/force@svg.svg',
true,
[
'title' => __('Force run'),
@@ -623,7 +623,7 @@ function cron_list_table()
$task['id']
),
'content' => html_print_image(
- 'images/change-active.svg',
+ 'images/force@svg.svg',
true,
[
'title' => __('Force run'),
@@ -715,7 +715,7 @@ function cron_list_table()
$task['id']
),
'content' => html_print_image(
- 'images/change-active.svg',
+ 'images/force@svg.svg',
true,
[
'title' => __('Force run'),
@@ -751,7 +751,7 @@ function cron_list_table()
$task['id']
),
'content' => html_print_image(
- 'images/change-active.svg',
+ 'images/force@svg.svg',
true,
[
'title' => __('Force run'),
@@ -797,7 +797,7 @@ function cron_list_table()
$task['id']
),
'content' => html_print_image(
- 'images/change-active.svg',
+ 'images/force@svg.svg',
true,
[
'title' => __('Force run'),
@@ -839,7 +839,7 @@ function cron_list_table()
$task['id']
),
'content' => html_print_image(
- 'images/change-active.svg',
+ 'images/force@svg.svg',
true,
[
'title' => __('Force run'),
@@ -873,7 +873,7 @@ function cron_list_table()
$task['id']
),
'content' => html_print_image(
- 'images/change-active.svg',
+ 'images/force@svg.svg',
true,
[
'title' => __('Force run'),
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 8afc257399..9616634adb 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -4560,7 +4560,7 @@ function events_page_details($event, $server_id=0)
true,
[
'title' => __('Go to data overview'),
- 'class' => 'invert_filter',
+ 'class' => 'invert_filter main_menu_icon',
]
);
} else {
@@ -4569,7 +4569,7 @@ function events_page_details($event, $server_id=0)
true,
[
'title' => __('Go to data overview'),
- 'class' => 'invert_filter',
+ 'class' => 'invert_filter main_menu_icon',
'style' => 'opacity: .5',
]
);
diff --git a/pandora_console/include/functions_inventory.php b/pandora_console/include/functions_inventory.php
index f15f888bf6..dc0c23a31c 100644
--- a/pandora_console/include/functions_inventory.php
+++ b/pandora_console/include/functions_inventory.php
@@ -814,6 +814,10 @@ function get_data_basic_info_sql($params, $count=false)
$where .= sprintf(' AND id_agente = %d', $params['id_agent']);
}
+ if ($params['id_group'] > 0) {
+ $where .= sprintf(' AND id_grupo = %d', $params['id_group']);
+ }
+
if ($params['search'] > 0) {
$where .= sprintf(
' AND ( alias LIKE "%%%s%%" )',
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index 3bf0799599..7a04cbf30a 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -57,7 +57,7 @@ function menu_print_menu(&$menu)
$sec = (string) get_parameter('sec');
$sec2 = (string) get_parameter('sec2');
if ($sec2 === 'operation/agentes/ver_agente') {
- $sec2 = 'godmode/agentes/configurar_agente';
+ $sec2 = 'operation/agentes/estado_agente';
} else if ($sec2 === 'godmode/alerts/configure_alert_template') {
$sec2 = 'godmode/alerts/alert_templates';
} else if ($sec2 === 'godmode/events/events') {
diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php
index 0e51faa66c..1d7fffd922 100644
--- a/pandora_console/include/functions_snmp_browser.php
+++ b/pandora_console/include/functions_snmp_browser.php
@@ -97,7 +97,7 @@ function snmp_browser_get_html_tree(
// Id used to expand leafs.
$sub_id = time().rand(0, getrandmax());
// Display the branch.
- $output .= '
';
+ $output .= '';
// Indent sub branches.
for ($i = 1; $i <= $depth; $i++) {
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 3c05eb613a..42ad5f4e36 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -3628,6 +3628,11 @@ function ui_print_datatable(array $parameters)
$parameters['csv'] = 1;
}
+ $dom_elements = '"plfrtiB"';
+ if (isset($parameters['dom_elements'])) {
+ $dom_elements = '"'.$parameters['dom_elements'].'"';
+ }
+
$filter = '';
// Datatable filter.
if (isset($parameters['form']) && is_array($parameters['form'])) {
@@ -3790,6 +3795,34 @@ function ui_print_datatable(array $parameters)
}
$table .= '