tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-9662-second-round' into 'develop' 

Ent 9662 second round

See merge request artica/pandorafms!5639
This commit is contained in:
daniel 2023-03-30 15:38:19 +00:00
parent 3e51586738 24e5fca884
commit 48d72e2fbb
38 changed files with 940 additions and 826 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pandora_console/extensions/agents_modules.php
View File

@ -259,6 +259,15 @@ function agents_modules_load_js()
return results[1];
}
}
function select_selected () {
$('#id_agents2 option').each(function(){
if($(this).attr('selected') === 'selected'){
$(this).prop('selected', true);
}
});
}
</script>
<?php
}
@ -645,7 +654,7 @@ function mainAgentsModules()
}
if ($config['pure'] != 1) {
$show_filters = '<form method="post" action="'.ui_get_url_refresh(['offset' => $offset, 'hor_offset' => $offset, 'group_id' => $group_id, 'modulegroup' => $modulegroup]).'" class="w100p">';
$show_filters = '<form method="post" action="index.php?sec=view&sec2=extensions/agents_modules" class="w100p">';
$show_filters .= '<table class="filter-table-adv w100p no-border" cellpadding="4" cellspacing="4">';
$show_filters .= '<tr>';
$show_filters .= '<td width="33%">'.$filter_type.'</td>';
@ -666,8 +675,9 @@ function mainAgentsModules()
'srcbutton',
false,
[
'icon' => 'search',
'mode' => 'mini',
'icon' => 'search',
'mode' => 'mini',
'onclick' => 'select_selected()',
],
true
),
@ -729,7 +739,7 @@ function mainAgentsModules()
if (isset($modules_selected[0]) === true && $modules_selected[0]) {
$all_modules = [];
foreach ($modules_selected as $key => $value) {
if (is_int($value)) {
if ((int) $value > 0) {
$name = modules_get_agentmodule_name($value);
$sql = "SELECT id_agente_modulo
FROM tagente_modulo

2
pandora_console/godmode/agentes/inventory_manager.php
View File

@ -267,7 +267,7 @@ if (db_get_num_rows($sql) == 0) {
$data[5] .= '</b></a>&nbsp;&nbsp;';
// Force refresh module
$data[5] .= '<a href="index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=inventory&id_agente='.$id_agente.'&force_inventory_module='.$row['id_agent_module_inventory'].'">';
$data[5] .= html_print_image('images/change-active.svg', true, ['border' => '0', 'title' => __('Force'), 'class' => 'main_menu_icon invert_filter']).'</b></a>';
$data[5] .= html_print_image('images/force@svg.svg', true, ['border' => '0', 'title' => __('Force'), 'class' => 'main_menu_icon invert_filter']).'</b></a>';
array_push($table->data, $data);
}

8
pandora_console/godmode/agentes/modificar_agente.php
View File

@ -776,7 +776,7 @@ if ($agents !== false) {
}
if ((bool) $agent['disabled'] === true) {
$additionalDataAgentName[] = ui_print_help_tip(__('Disabled'));
$additionalDataAgentName[] = ui_print_help_tip(__('Disabled'), true);
}
if ((bool) $agent['quiet'] === true) {
@ -903,12 +903,12 @@ if ($agents !== false) {
if ((bool) $agent['disabled'] === true) {
$agentDisableEnableTitle = __('Enable agent');
$agentDisableEnableAction = 'enable_agent';
$agentDisableEnableAction = 'enable';
$agentDisableEnableCaption = __('You are going to enable a cluster agent. Are you sure?');
$agentDisableEnableIcon = 'change-active.svg';
} else {
$agentDisableEnableTitle = __('Disable agent');
$agentDisableEnableAction = 'disable_agent';
$agentDisableEnableAction = 'disable';
$agentDisableEnableCaption = __('You are going to disable a cluster agent. Are you sure?');
$agentDisableEnableIcon = 'change-pause.svg';
}
@ -1001,7 +1001,7 @@ if ($agents !== false) {
true,
'offset',
false,
'dataTables_paginate paging_simple_numbers'
'paging_simple_numbers'
);
/*

28
pandora_console/godmode/agentes/status_monitor_custom_fields.php
View File

@ -30,6 +30,26 @@ if (! check_acl($config['id_user'], 0, 'AR')
$update = get_parameter('upd_button', '');
$default = (int) get_parameter('default', 0);
// Header.
ui_print_standard_header(
__('Monitor detail').$subpage,
'images/agent.png',
false,
'',
true,
$buttons,
[
[
'link' => '',
'label' => __('Monitoring'),
],
[
'link' => '',
'label' => __('Views'),
],
],
(empty($fav_menu) === true) ? [] : $fav_menu
);
if ($default != 0) {
$fields_selected = explode(',', $config['status_monitor_fields']);
@ -161,11 +181,11 @@ foreach ($fields_available as $key => $available) {
// General title.
$generalTitleContent = [];
$generalTitleContent[] = html_print_div([ 'style' => 'width: 10px; flex: 0 0 auto; margin-right: 5px;}', 'class' => 'section_table_title_line' ], true);
// $generalTitleContent[] = html_print_div([ 'style' => 'width: 10px; flex: 0 0 auto; margin-right: 5px;}', 'class' => 'section_table_title_line' ], true);
$generalTitleContent[] = html_print_div([ 'class' => 'section_table_title', 'content' => __('Show monitor detail fields')], true);
$titledata[0] = html_print_div(['class' => 'flex-row-center', 'content' => implode('', $generalTitleContent) ], true);
$table->data['general_title'] = $titledata;
$table->data[0][0] = '<b>'.__('Fields available').'</b>';
$table->data[0][0] = '<span class="font-title-font">'.__('Fields available').'</span>';
$table->data[1][0] = html_print_select($fields_available, 'fields_available[]', true, '', '', 0, true, true, false, '', false, 'width: 300px');
$table->data[1][1] = '<a href="javascript:">'.html_print_image(
'images/darrowright.png',
@ -187,7 +207,7 @@ $table->data[1][1] .= '<br><br><br><br><a href="javascript:">'.html_print_image(
).'</a>';
$table->data[0][1] = '';
$table->data[0][2] = '<b>'.__('Fields selected').'</b>';
$table->data[0][2] = '<span class="font-title-font">'.__('Fields selected').'</span>';
$table->data[1][2] = html_print_select(
$result_selected,
'fields_selected[]',
@ -203,7 +223,7 @@ $table->data[1][2] = html_print_select(
'width: 300px'
);
echo '<form id="custom_status_monitor" method="post" action="index.php?sec=view&sec2=operation/agentes/status_monitor&section=fields&amp;pure='.$config['pure'].'">';
echo '<form id="custom_status_monitor" method="post" action="index.php?sec=view&sec2=operation/agentes/status_monitor&section=fields&amp;pure='.$config['pure'].'" class="max_floating_element_size">';
html_print_table($table);
html_print_action_buttons(

12
pandora_console/godmode/consoles/consoles.php
View File

@ -54,12 +54,6 @@ $results = db_get_all_rows_in_table('tconsole');
$message = '';
if ($results === false) {
$message = ui_print_info_message(
__('If you want to have your consoles registered, you must define them by editing config.php in each individual console and wait for cron to run in order to be registered.')
);
}
View::render(
'consoles/list',
[
@ -67,3 +61,9 @@ View::render(
'message' => $message,
]
);
if ($results === false) {
$message = ui_print_info_message(
__('If you want to have your consoles registered, you must define them by editing config.php in each individual console and wait for cron to run in order to be registered.')
);
}

4
pandora_console/godmode/servers/servers.build_table.php
View File

@ -208,7 +208,7 @@ foreach ($servers as $server) {
if ($server['type'] === 'data') {
$data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_counts='.$server['id_server']).'">';
$data[8] .= html_print_image(
'images/change-active.svg',
'images/force@svg.svg',
true,
[
'title' => __('Reset module status and fired alert counts'),
@ -219,7 +219,7 @@ foreach ($servers as $server) {
} else if ($server['type'] === 'enterprise snmp') {
$data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_snmp_enterprise='.$server['id_server']).'">';
$data[8] .= html_print_image(
'images/change-active.svg',
'images/force@svg.svg',
true,
[
'title' => __('Claim back SNMP modules'),

7
pandora_console/godmode/users/user_management.php
View File

@ -764,10 +764,9 @@ html_print_table($userManagementTable);
$vcard_data = [];
$vcard_data['version'] = '3.0';
$vcard_data['firstName'] = $user_info['firstname'];
$vcard_data['lastName'] = $user_info['lastname'];
$vcard_data['middleName'] = ($user_info['middlename'] === '1') ? '' : $user_info['middlename'];
$vcard_data['nickname'] = $user_info['fullname'];
$vcard_data['firstName'] = $user_info['fullname'];
$vcard_data['lastName'] = '';
$vcard_data['middleName'] = '';
$vcard_data['workPhone'] = $user_info['phone'];
$vcard_data['email'] = $user_info['email'];
$vcard_data['organization'] = io_safe_output(get_product_name());

2
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
View File

@ -673,7 +673,7 @@ class DiscoveryTaskList extends HTML
$data[0] .= ');" >';
$data[0] .= html_print_image(
'images/change-active.svg',
'images/force@svg.svg',
true,
[
'title' => __('Force'),

5
pandora_console/godmode/wizards/HostDevices.class.php
View File

@ -810,10 +810,7 @@ class HostDevices extends Wizard
'name' => 'interval_manual_defined',
'return' => true,
],
'extra' => '<div id="interval_manual_container"><div class="time_selection_container mrgn_top_20px">'.ui_print_help_tip(
__('The minimum recomended interval for Recon Task is 5 minutes'),
true
).html_print_extended_select_for_time(
'extra' => '<div id="interval_manual_container"><div class="time_selection_container mrgn_top_20px">'.html_print_extended_select_for_time(
'interval',
$this->task['interval_sweep'],
'',

19
pandora_console/include/ajax/audit_log.php
View File

@ -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

161
pandora_console/include/ajax/heatmap.ajax.php
View File

@ -45,73 +45,101 @@ if (is_ajax() === true) {
$group = get_parameter('group', true);
echo '<form id="form_dialog" method="post">';
echo '<div class="div-dialog">';
echo '<p class="label-dialog">'.__('Refresh').'</p>';
echo html_print_select(
echo html_print_label_input_block(
__('Refresh'),
html_print_select(
[
'30' => __('30 seconds'),
(string) SECONDS_1MINUTE => __('1 minute'),
'180' => __('3 minutes'),
(string) SECONDS_5MINUTES => __('5 minutes'),
],
'refresh',
$refresh,
'',
'',
0,
true,
false,
false,
'',
false,
'width: 100%; margin-top: 10px;'
),
[
'30' => __('30 seconds'),
(string) SECONDS_1MINUTE => __('1 minute'),
'180' => __('3 minutes'),
(string) SECONDS_5MINUTES => __('5 minutes'),
],
'refresh',
$refresh,
'',
'',
0,
true,
false,
false,
'',
false,
'margin-top: 3px;'
'label_class' => 'font-title-font',
'div_class' => 'mrgn_top_10px',
]
);
echo '</div>';
echo '<div class="div-dialog">';
echo '<p class="label-dialog">'.__('Search').'</p>';
echo html_print_input_text('search', $search, '', 30, 255, true);
echo '</div>';
echo '<div class="div-dialog">';
echo '<p class="label-dialog">'.__('Type').'</p>';
echo html_print_select(
echo html_print_label_input_block(
__('Search'),
html_print_input_text(
'search',
$search,
'',
30,
255,
true,
false,
false,
'',
'w100p'
),
[
0 => __('Group agents'),
1 => __('Group modules by tag'),
2 => __('Group modules by module group'),
3 => __('Group modules by agents'),
],
'type',
$type,
'',
'',
0,
true,
false,
false,
'',
false,
'margin-top: 3px;width:70%'
'label_class' => 'font-title-font',
'div_class' => 'mrgn_top_10px',
]
);
echo '</div>';
echo '<div class="div-dialog">';
echo '<p class="label-dialog">'.__('Show groups').'</p>';
echo html_print_checkbox('group', 1, $group, true);
echo '</div>';
echo html_print_label_input_block(
__('Type'),
html_print_select(
[
0 => __('Group agents'),
1 => __('Group modules by tag'),
2 => __('Group modules by module group'),
3 => __('Group modules by agents'),
],
'type',
$type,
'',
'',
0,
true,
false,
false,
'',
false,
'width: 100%; margin-top: 10px;'
),
[
'label_class' => 'font-title-font',
'div_class' => 'mrgn_top_10px',
]
);
echo html_print_label_input_block(
__('Show groups'),
'<div class="w100p">'.html_print_checkbox('group', 1, $group, true).'</div>',
[
'label_class' => 'font-title-font',
'div_class' => 'mrgn_top_10px',
]
);
echo '</form>';
}
if ($getFilterType === true) {
$filter = get_parameter('filter', 0);
echo '<div id="filter_type" class="div-dialog">';
$label = ' ';
switch ($type) {
case 0:
default:
echo '<p style="width:42%;font-weight: bold;">'.__('Group').'</p>';
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 '<p class="label-dialog">'.__('Tag').'</p>';
$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 '<p class="label-dialog">'.__('Module group').'</p>';
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 '</div>';
echo html_print_label_input_block(
$label,
$input,
[
'label_class' => 'font-title-font',
'div_class' => 'mrgn_top_10px',
]
);
}
if ($getInfo === true) {

2
pandora_console/include/ajax/module.php
View File

@ -1279,7 +1279,7 @@ if (check_login()) {
if ((int) $module['flag'] === 0) {
$additionalLinkAction = '&amp;flag=1';
$linkCaption = __('Force checks');
$imgaction = 'images/target.png';
$imgaction = 'images/force@svg.svg';
} else {
$additionalLinkAction = '';
$linkCaption = __('Refresh');

22
pandora_console/include/class/AgentWizard.class.php
View File

@ -4132,10 +4132,10 @@ class AgentWizard extends HTML
$table->width = '100%';
$table->class = 'info_table';
// Subheaders for Warning and Critical columns.
$subheaders = '<span class=\'wizard-colum-levels font_w300 mrgn_lft_0.8em\'>Min.</span>';
$subheaders .= '<span class=\'wizard-colum-levels font_w300 mrgn_lft_1.6em\'>Max.</span>';
$subheaders .= '<span class=\'wizard-colum-levels font_w300 mrgn_lft_2em\'>Inv.</span>';
$subheaders .= '<span class=\'wizard-colum-levels font_w300 mrgn_lft_2em\'>%.</span>';
$subheaders = '<span class=\'wizard-colum-levels font_w300 margin-left-1\'>Min.</span>';
$subheaders .= '<span class=\'wizard-colum-levels font_w300 margin-left-1\'>Max.</span>';
$subheaders .= '<span class=\'wizard-colum-levels font_w300 margin-left-1\'>Inv.</span>';
$subheaders .= '<span class=\'wizard-colum-levels font_w300 margin-left-05\'>%.</span>';
// 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.

5
pandora_console/include/class/AgentsAlerts.class.php
View File

@ -771,7 +771,7 @@ class AgentsAlerts extends HTML
$headerInputs = [];
$headerInputs[] = [
'label' => __('Group'),
'label' => '<span class="font-title-font">'.__('Group').'</span>',
'id' => 'select-group-id',
'arguments' => [
'name' => 'group-id',
@ -788,8 +788,9 @@ class AgentsAlerts extends HTML
];
$headerInputs[] = [
'label' => __('Show modules without alerts'),
'label' => '<span class="font-title-font label-alert-agent">'.__('Show modules without alerts').'</span>',
'id' => 'txt-use-agent-ip',
'class' => 'display-grid mrgn_lft_15px mrgn_btn_5px',
'arguments' => [
'name' => 'show-modules-without-alerts',
'checked' => $this->showWithoutAlertModules,

5
pandora_console/include/class/CustomNetScan.class.php
View File

@ -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
).'</span>',
];

16
pandora_console/include/functions_cron.php
View File

@ -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'),

4
pandora_console/include/functions_events.php
View File

@ -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',
]
);

4
pandora_console/include/functions_inventory.php
View File

@ -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%%" )',

2
pandora_console/include/functions_menu.php
View File

@ -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') {

2
pandora_console/include/functions_snmp_browser.php
View File

@ -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 .= '<li id="li_'.$sub_id.'" class="'.$class.' mrgn_0px pdd_0px">';
$output .= '<li id="li_'.$sub_id.'" class="'.$class.' mrgn_0px pdd_0px flex_center">';
// Indent sub branches.
for ($i = 1; $i <= $depth; $i++) {

522
pandora_console/include/functions_ui.php
View File

@ -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 .= '</tr></thead>';
if (isset($parameters['data_element']) === true) {
$table .= '<tbody>';
foreach ($parameters['data_element'] as $row) {
$table .= '<tr>';
foreach ($row as $td_data) {
$table .= '<td>'.$td_data.'</td>';
}
$table .= '</tr>';
}
$table .= '</tbody>';
$js = '<script>
$.fn.dataTable.ext.classes.sPageButton = "pandora_pagination mini-pandora-pagination"
var table = $("#'.$table_id.'").DataTable({
"dom": "'.$parameters['dom_elements'].'"
});
$("div.spinner-fixed").hide();
$("table#'.$table_id.'").removeClass("invisible");
$("#'.$table_id.'_filter > label > input").addClass("mini-search-input");
if (table.page.info().pages == 1) {
$("#'.$table_id.'_paginate").hide();
}
</script>';
}
$table .= '</table>';
$pagination_class = 'pandora_pagination';
@ -3813,279 +3846,276 @@ function ui_print_datatable(array $parameters)
$export_columns = ',columns: \'th:not(:last-child)\'';
}
if (isset($parameters['ajax_url'])) {
$type_data = 'ajax: {
url: "'.ui_get_full_url('ajax.php', false, false, false).'",
type: "POST",
dataSrc: function (json) {
if($("#'.$form_id.'_search_bt") != undefined) {
$("#'.$form_id.'_loading").remove();
}
if (isset($parameters['data_element']) === false) {
if (isset($parameters['ajax_url'])) {
$type_data = 'ajax: {
url: "'.ui_get_full_url('ajax.php', false, false, false).'",
type: "POST",
dataSrc: function (json) {
if($("#'.$form_id.'_search_bt") != undefined) {
$("#'.$form_id.'_loading").remove();
}
if (json.error) {
console.error(json.error);
$("#error-'.$table_id.'").html(json.error);
$("#error-'.$table_id.'").dialog({
title: "Filter failed",
width: 630,
resizable: true,
draggable: true,
modal: false,
closeOnEscape: true,
buttons: {
"Ok" : function () {
$(this).dialog("close");
if (json.error) {
console.error(json.error);
$("#error-'.$table_id.'").html(json.error);
$("#error-'.$table_id.'").dialog({
title: "Filter failed",
width: 630,
resizable: true,
draggable: true,
modal: false,
closeOnEscape: true,
buttons: {
"Ok" : function () {
$(this).dialog("close");
}
}
}
}).parent().addClass("ui-state-error");
} else {';
}).parent().addClass("ui-state-error");
} else {';
if (isset($parameters['ajax_return_operation']) === true
&& empty($parameters['ajax_return_operation']) === false
&& isset($parameters['ajax_return_operation_function']) === true
&& empty($parameters['ajax_return_operation_function']) === false
) {
$type_data .= '
if (json.'.$parameters['ajax_return_operation'].' !== undefined) {
'.$parameters['ajax_return_operation_function'].'(json.'.$parameters['ajax_return_operation'].');
}
';
}
if (isset($parameters['ajax_return_operation']) === true
&& empty($parameters['ajax_return_operation']) === false
&& isset($parameters['ajax_return_operation_function']) === true
&& empty($parameters['ajax_return_operation_function']) === false
) {
$type_data .= '
if (json.'.$parameters['ajax_return_operation'].' !== undefined) {
'.$parameters['ajax_return_operation_function'].'(json.'.$parameters['ajax_return_operation'].');
}
';
}
if (isset($parameters['ajax_postprocess'])) {
$type_data .= '
if (json.data) {
json.data.forEach(function(item) {
'.$parameters['ajax_postprocess'].'
});
} else {
json.data = {};
}';
}
if (isset($parameters['ajax_postprocess'])) {
$type_data .= '
if (json.data) {
json.data.forEach(function(item) {
'.$parameters['ajax_postprocess'].'
return json.data;
}
},
data: function (data) {
if($("#button-'.$form_id.'_search_bt") != undefined) {
var loading = \''.html_print_image(
'images/spinner.gif',
true,
[
'id' => $form_id.'_loading',
'class' => 'loading-search-datatables-button',
]
).'\';
$("#button-'.$form_id.'_search_bt").parent().append(loading);
}
inputs = $("#'.$form_id.' :input");
values = {};
inputs.each(function() {
values[this.name] = $(this).val();
})
$.extend(data, {
filter: values,'."\n";
if (is_array($parameters['ajax_data'])) {
foreach ($parameters['ajax_data'] as $k => $v) {
$type_data .= $k.':'.json_encode($v).",\n";
}
}
$type_data .= 'page: "'.$parameters['ajax_url'].'"
});
} else {
json.data = {};
}';
return data;
}
},';
} else {
$type_data = 'data: '.json_encode($parameters['data_element']).',';
}
$type_data .= '
return json.data;
}
},
data: function (data) {
if($("#button-'.$form_id.'_search_bt") != undefined) {
var loading = \''.html_print_image(
'images/spinner.gif',
true,
[
'id' => $form_id.'_loading',
'class' => 'loading-search-datatables-button',
]
).'\';
$("#button-'.$form_id.'_search_bt").parent().append(loading);
}
$serverside = 'true';
if (isset($parameters['data_element'])) {
$serverside = 'false';
}
inputs = $("#'.$form_id.' :input");
// Javascript controller.
$js = '<script type="text/javascript">
$(document).ready(function(){
$.fn.dataTable.ext.errMode = "none";
$.fn.dataTable.ext.classes.sPageButton = "'.$pagination_class.'";
values = {};
inputs.each(function() {
values[this.name] = $(this).val();
})
var settings_datatable = {
drawCallback: function(settings) {';
$.extend(data, {
filter: values,'."\n";
if (!isset($parameters['data_element'])) {
$js .= 'if (dt_'.$table_id.'.page.info().pages > 1) {
$("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers").show()
} else {
$("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers").hide()
}';
}
if (is_array($parameters['ajax_data'])) {
foreach ($parameters['ajax_data'] as $k => $v) {
$type_data .= $k.':'.json_encode($v).",\n";
$js .= 'if ($("#'.$table_id.' tr td").length == 1) {
$(".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();
$("div.dataTables_length").hide();
$("div.dt-buttons").hide();
if (dt_'.$table_id.'.page.info().pages > 1) {
$(".dataTables_paginate.paging_simple_numbers").show()
}
} else {
$(".datatable-msg-info-'.$table_id.'").hide();
$("table#'.$table_id.'").show();
$("div.dataTables_paginate").show();
$("div.dataTables_info").show();
$("div.dataTables_length").show();
$("div.dt-buttons").show();
if (dt_'.$table_id.'.page.info().pages == 1) {
$(".dataTables_paginate.paging_simple_numbers").hide()
}
}';
if (isset($parameters['drawCallback'])) {
$js .= $parameters['drawCallback'];
}
$searching = 'false';
if (isset($parameters['searching']) && $parameters['searching'] === true) {
$searching = 'true';
}
$ordering = 'true';
if (isset($parameters['ordering']) && $parameters['ordering'] === false) {
$ordering = 'false';
}
$js .= '},';
$languaje = substr(get_user_language(), 0, 2);
$js .= '
processing: true,
serverSide: '.$serverside.',
paging: '.$parameters['paging'].',
pageLength: '.$parameters['default_pagination'].',
searching: '.$searching.',
responsive: true,
dom: '.$dom_elements.',
language: {
url: "/pandora_console/include/javascript/i18n/dataTables.'.$languaje.'.json",
processing:"'.$processing.'",
zeroRecords:"'.$zeroRecords.'",
emptyTable:"'.$emptyTable.'",
},
buttons: '.$parameters['csv'].'== 1 ? [
{
extend: "csv",
text : "'.__('Export current page to CSV').'",
titleAttr: "'.__('Export current page to CSV').'",
title: "export_'.$parameters['id'].'_current_page_'.date('Y-m-d').'",
fieldSeparator: "'.$config['csv_divider'].'",
action: function ( e, dt, node, config ) {
blockResubmit(node);
// Call the default csvHtml5 action method to create the CSV file
$.fn.dataTable.ext.buttons.csvHtml5.action.call(this, e, dt, node, config);
},
exportOptions : {
modifier : {
// DataTables core
order : "current",
page : "All",
search : "applied"
}'.$export_columns.'
},
}
] : [],
lengthMenu: '.json_encode($pagination_options).',
columnDefs: [
{ className: "no-class", targets: "_all" },
{ bSortable: false, targets: '.$no_sortable_columns.' }
],
ordering: '.$ordering.',
initComplete: function(settings, json) {
// Move elements to table_action_buttons bar.
$(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
$(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
$(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
$(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
$(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers"));
$(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dataTables_length"));
$(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dt-buttons"));
$(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dataTables_filter"));
$("div.spinner-fixed").hide();
},
columns: [';
foreach ($parameters['datacolumns'] as $data) {
if (is_array($data)) {
$js .= '{data : "'.$data['text'].'",className: "'.$data['class'].'"},';
} else {
$js .= '{data : "'.$data.'",className: "no-class"},';
}
}
$type_data .= 'page: "'.$parameters['ajax_url'].'"
});
$js .= '
],
order: [[ '.$order.' ]],';
$js .= $type_data;
$js .= '
};
return data;
}
},';
} else {
$type_data = 'data: '.json_encode($parameters['data_element']).',';
}
dt_'.$table_id.' = $("#'.$table_id.'").DataTable(settings_datatable);
$serverside = 'true';
if (isset($parameters['data_element'])) {
$serverside = 'false';
}
$("#button-'.$form_id.'_search_bt").click(function (){
dt_'.$table_id.'.draw().page(0)
});
';
// Javascript controller.
$js = '<script type="text/javascript">
$(document).ready(function(){
$.fn.dataTable.ext.errMode = "none";
$.fn.dataTable.ext.classes.sPageButton = "'.$pagination_class.'";
if (isset($parameters['caption']) === true
&& empty($parameters['caption']) === false
) {
$js .= '$("#'.$table_id.'").append("<caption>'.$parameters['caption'].'</caption>");';
$js .= '$(".datatables_thead_tr").css("height", 0);';
}
var settings_datatable = {
drawCallback: function(settings) {';
if (isset($parameters['csv']) === true) {
$js."'$('#".$table_id."').on( 'buttons-processing', function ( e, indicator ) {
if ( indicator ) {
console.log('a');
}
else {
console.log('b');
}";
}
if (!isset($parameters['data_element'])) {
$js .= 'if (dt_'.$table_id.'.page.info().pages > 1) {
$("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers").show()
} else {
$("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers").hide()
}';
}
$js .= 'if ($("#'.$table_id.' tr td").length == 1) {
$(".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();
$js .= '$("table#'.$table_id.'").removeClass("invisible");
});';
$js .= '
$(function() {
$(document).on("preInit.dt", function (ev, settings) {
$("div.dataTables_length").hide();
$("div.dt-buttons").hide();
if (dt_'.$table_id.'.page.info().pages > 1) {
$(".dataTables_paginate.paging_simple_numbers").show()
}
} else {
$(".datatable-msg-info-'.$table_id.'").hide();
$("table#'.$table_id.'").show();
$("div.dataTables_paginate").show();
$("div.dataTables_info").show();
$("div.dataTables_length").show();
$("div.dt-buttons").show();
if (dt_'.$table_id.'.page.info().pages == 1) {
$(".dataTables_paginate.paging_simple_numbers").hide()
}
}';
if (isset($parameters['drawCallback'])) {
$js .= $parameters['drawCallback'];
}
$dom_elements = '"plfrtiB"';
if (isset($parameters['dom_elements'])) {
$dom_elements = '"'.$parameters['dom_elements'].'"';
}
$searching = 'false';
if (isset($parameters['searching']) && $parameters['searching'] === true) {
$searching = 'true';
}
$ordering = 'true';
if (isset($parameters['ordering']) && $parameters['ordering'] === false) {
$ordering = 'false';
}
$js .= '},';
$languaje = substr(get_user_language(), 0, 2);
$js .= '
processing: true,
serverSide: '.$serverside.',
paging: '.$parameters['paging'].',
pageLength: '.$parameters['default_pagination'].',
searching: '.$searching.',
responsive: true,
dom: '.$dom_elements.',
language: {
url: "/pandora_console/include/javascript/i18n/dataTables.'.$languaje.'.json",
processing:"'.$processing.'",
zeroRecords:"'.$zeroRecords.'",
emptyTable:"'.$emptyTable.'",
},
buttons: '.$parameters['csv'].'== 1 ? [
{
extend: "csv",
text : "'.__('Export current page to CSV').'",
titleAttr: "'.__('Export current page to CSV').'",
title: "export_'.$parameters['id'].'_current_page_'.date('Y-m-d').'",
fieldSeparator: "'.$config['csv_divider'].'",
action: function ( e, dt, node, config ) {
blockResubmit(node);
// Call the default csvHtml5 action method to create the CSV file
$.fn.dataTable.ext.buttons.csvHtml5.action.call(this, e, dt, node, config);
},
exportOptions : {
modifier : {
// DataTables core
order : "current",
page : "All",
search : "applied"
}'.$export_columns.'
},
}
] : [],
lengthMenu: '.json_encode($pagination_options).',
columnDefs: [
{ className: "no-class", targets: "_all" },
{ bSortable: false, targets: '.$no_sortable_columns.' }
],
ordering: '.$ordering.',
initComplete: function(settings, json) {
// Move elements to table_action_buttons bar.
$(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
$(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
$(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
$(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
$(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers"));
$(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dataTables_length"));
$(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dt-buttons"));
$(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dataTables_filter"));
$("div.spinner-fixed").hide();
},
columns: [';
foreach ($parameters['datacolumns'] as $data) {
if (is_array($data)) {
$js .= '{data : "'.$data['text'].'",className: "'.$data['class'].'"},';
} else {
$js .= '{data : "'.$data.'",className: "no-class"},';
}
}
$js .= '
],
order: [[ '.$order.' ]],';
$js .= $type_data;
$js .= '
};
dt_'.$table_id.' = $("#'.$table_id.'").DataTable(settings_datatable);
$("#button-'.$form_id.'_search_bt").click(function (){
dt_'.$table_id.'.draw().page(0)
});
});
';
if (isset($parameters['caption']) === true
&& empty($parameters['caption']) === false
) {
$js .= '$("#'.$table_id.'").append("<caption>'.$parameters['caption'].'</caption>");';
$js .= '$(".datatables_thead_tr").css("height", 0);';
$js .= '</script>';
}
if (isset($parameters['csv']) === true) {
$js."'$('#".$table_id."').on( 'buttons-processing', function ( e, indicator ) {
if ( indicator ) {
console.log('a');
}
else {
console.log('b');
}";
}
$js .= '$("table#'.$table_id.'").removeClass("invisible");
});';
$js .= '
$(function() {
$(document).on("preInit.dt", function (ev, settings) {
$("div.dataTables_length").hide();
$("div.dt-buttons").hide();
});
});
';
$js .= '</script>';
// Order.
$info_msg_arr = [];
$info_msg_arr['message'] = $emptyTable;

2
pandora_console/include/lib/Dashboard/Manager.php
View File

@ -287,7 +287,7 @@ class Manager implements PublicLogin
$this->dashboardId = (int) \get_parameter('dashboardId', 0);
if ($this->slides === 1) {
$this->slidesIds = (array) \get_parameter('slidesIds');
$this->slidesIds = (array) \get_parameter('slidesIds', [get_user_dashboards($config['id_user'])[0]['id']]);
$this->cellModeSlides = (int) \get_parameter(
'cellModeSlides',
0

1
pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
View File

@ -453,6 +453,7 @@ class ModulesByStatus extends Widget
1000,
],
],
'dom_elements' => 'frtilp',
]
);
} catch (\Exception $e) {

32
pandora_console/include/styles/dashboards.css
View File

@ -22,7 +22,7 @@
}
#menu_tab {
margin: 0px;
margin: 0;
}
#menu_tab li.nomn.tab_operation img,
@ -426,12 +426,21 @@ li#search_input_widget {
top: 2px;
}
div#dashboard-controls {
.select2-search--dropdown .select2-search__field {
width: auto;
}
div#dashboard-controls-slides {
width: 720px !important;
}
div#dashboard-controls,
div#dashboard-controls-slides {
position: fixed;
z-index: 1;
top: 10px;
right: 10px;
width: 800px;
width: 450px;
height: 70px;
display: flex;
flex-direction: row;
@ -443,27 +452,32 @@ div#dashboard-controls {
padding: 0px 10px;
}
div#dashboard-controls div {
flex: 0.5;
div#dashboard-controls div,
div#dashboard-controls-slides div {
margin-left: 10px;
text-align: center;
}
div#dashboard-controls div#dashboard-slides-form-countdown {
div#dashboard-controls div#dashboard-slides-form-countdown,
div#dashboard-controls-slides div#dashboard-slides-form-countdown {
flex: 7;
}
div#dashboard-controls div#dashboard-slides-name {
div#dashboard-controls div#dashboard-slides-name,
div#dashboard-controls-slides div#dashboard-slides-name {
flex: 3;
}
div#dashboard-controls div.dashboard-mode {
div#dashboard-controls div.dashboard-mode,
div#dashboard-controls-slides div.dashboard-mode {
flex: 1;
display: flex;
flex-direction: row;
justify-content: center;
}
div#dashboard-controls div.dashboard-mode a {
div#dashboard-controls div.dashboard-mode a,
div#dashboard-controls-slides div.dashboard-mode a {
margin: 0px;
}

17
pandora_console/include/styles/pandora.css
View File

@ -805,6 +805,11 @@ select:-internal-list-box {
max-height: 400px;
}
.mx_height85 {
height: 85px !important;
max-height: 85px !important;
}
.no-text-imp {
font-size: 0 !important;
}
@ -7002,6 +7007,10 @@ div.graph div.legend table {
margin-top: -2px !important;
}
.mrgn_top-8px {
margin-top: -8px !important;
}
.mrgn_top-10px {
margin-top: -10px;
}
@ -10120,10 +10129,6 @@ select:focus {
border-color: #8a96a6;
}
.dataTables_length > label > select {
min-height: 42px;
}
.dataTables_length > label {
font-size: 0px;
}
@ -11859,3 +11864,7 @@ li.input-interval .extra-container-input .select2 {
.scale-0-8 {
transform: scale(0.8);
}
label:has(span.label-alert-agent) {
margin-bottom: 10px;
}

4
pandora_console/include/styles/pandora_black.css
View File

@ -1600,3 +1600,7 @@ a.pandora_pagination,
.info_table > tbody > tr > td {
border-bottom: 1px solid #3f3f3f;
}
.font-title-font {
color: #fff;
}

22
pandora_console/include/styles/tables.css
View File

@ -313,7 +313,7 @@ table.dataTable.info_table.no-footer {
a.pandora_pagination {
background-color: #f6f7fb;
padding: 11px;
padding: 9px;
color: #000;
border: 1px solid #cacaca;
border-left: none;
@ -362,7 +362,7 @@ a.pandora_pagination.current:hover {
background-color: transparent;
color: var(--primary-color);
font-size: 20px;
height: 42px;
height: 38px;
/* height: 32px; */
width: 80px;
margin-left: 10px;
@ -816,14 +816,6 @@ div[id^="auto-os-"] > img {
height: 20px;
}
.dataTables_paginate {
margin-right: 10px;
}
.dataTables_paginate.paging_simple_numbers {
margin-right: 0;
}
.w22px {
width: 22px;
}
@ -842,3 +834,13 @@ td.FF-thresholds-pdd {
padding: 0px !important;
padding-left: 13px !important;
}
div.grid-stack-item-content a.pandora_pagination,
a.mini-pandora-pagination {
padding: 7px;
font-size: 9pt;
}
input.mini-search-input {
height: 30px;
}

109
pandora_console/operation/agentes/agent_inventory.php
View File

@ -109,44 +109,93 @@ $utimestampSelectValues = array_reduce(
// Inventory module select.
$table = new stdClass();
$table->width = '100%';
$table->class = 'databox filters';
$table->size = [];
$table->data = [];
$table->size[0] = '33%';
$table->size[1] = '33%';
$table->size[2] = '33%';
$table->class = 'filter-table-adv';
$table->data[0][0] = __('Module');
$table->data[0][1] = html_print_select_from_sql(
$sqlModuleInventoryAgentView,
'module_inventory_agent_view',
$module,
'javascript:this.form.submit();',
__('All'),
0,
$table->data[0][0] = html_print_label_input_block(
__('Module'),
html_print_select_from_sql(
$sqlModuleInventoryAgentView,
'module_inventory_agent_view',
$module,
'javascript:this.form.submit();',
__('All'),
0,
true,
false,
true,
false,
'width:100%;'
)
);
$table->data[0][1] = html_print_label_input_block(
__('Date'),
html_print_select(
$utimestampSelectValues,
'utimestamp',
$utimestamp,
'javascript:this.form.submit();',
__('Now'),
0,
true,
false,
true,
'',
false,
'width:100%;'
)
);
$table->data[0][2] = html_print_label_input_block(
__('Search'),
html_print_input_text(
'search_string',
$search_string,
'',
25,
0,
true
)
);
$buttons = html_print_submit_button(
__('Filter'),
'search_button',
false,
[
'icon' => 'search',
'mode' => 'mini',
],
true
);
$table->data[0][2] = __('Date');
$table->data[0][3] = html_print_select(
$utimestampSelectValues,
'utimestamp',
$utimestamp,
'javascript:this.form.submit();',
__('Now'),
0,
$searchForm = '<form method="post" action="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=inventory&id_agente='.$id_agente.'">';
$searchForm .= html_print_table($table, true);
$searchForm .= html_print_div(
[
'class' => 'action-buttons',
'content' => $buttons,
],
true
);
$searchForm .= '</form>';
$table->data[0][4] = __('Search');
$table->data[0][5] = html_print_input_text('search_string', $search_string, '', 25, 0, true);
$table->data[0][6] = html_print_submit_button(__('Search'), 'search_button', false, 'class="sub wand"', true);
// Show filters table.
echo sprintf(
'<form method="post" action="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=inventory&id_agente=%s">%s</form>',
$id_agente,
html_print_table($table, true)
ui_toggle(
$searchForm,
'<span class="subsection_header_title">'.__('Filters').'</span>',
'filter_form',
'',
true,
false,
'',
'white-box-content',
'box-flat white_table_graph fixed_filter_bar'
);
unset($table);
$idModuleInventory = null;
$rowTable = 1;
@ -181,7 +230,7 @@ foreach ($rows as $row) {
$table->align = [];
$table->cellpadding = 4;
$table->cellspacing = 4;
$table->class = 'databox filters';
$table->class = 'info_table';
$table->head = [];
$table->head[0] = $row['name'].' - ('.date($config['date_format'], $row['utimestamp']).')';
@ -210,7 +259,7 @@ foreach ($rows as $row) {
foreach ($subHeadTitles as $titleData) {
$table->data[0][$iterator] = $titleData;
$table->cellstyle[0][$iterator] = 'background: #373737; color: #FFF;';
$table->cellstyle[0][$iterator] = 'background: var(--primary-color); color: #FFF;';
$iterator++;
}

50
pandora_console/operation/agentes/alerts_status.php
View File

@ -434,35 +434,39 @@ if ($agent_view_page === true) {
);
}
if (((bool) check_acl($config['id_user'], $id_group, 'AW') === true || (bool) check_acl($config['id_user'], $id_group, 'LM') === true)) {
if ($agent_view_page === true) {
html_print_div(
[
'class' => 'action-buttons pdd_b_10px pdd_r_5px w100p',
'content' => html_print_submit_button(
if (is_metaconsole() === false) {
if (((bool) check_acl($config['id_user'], $id_group, 'AW') === true || (bool) check_acl($config['id_user'], $id_group, 'LM') === true)) {
if ($agent_view_page === true) {
html_print_div(
[
'class' => 'action-buttons pdd_b_10px pdd_r_5px w100p',
'content' => html_print_submit_button(
__('Validate'),
'alert_validate',
false,
[
'icon' => 'wand',
'mode' => 'secondary mini',
],
true
),
]
);
} else {
html_print_action_buttons(
html_print_submit_button(
__('Validate'),
'alert_validate',
false,
[
'icon' => 'wand',
'mode' => 'secondary mini',
],
[ 'icon' => 'wand' ],
true
),
]
);
} else {
html_print_action_buttons(
html_print_submit_button(
__('Validate'),
'alert_validate',
false,
[ 'icon' => 'wand' ],
true
),
['type' => 'form_action']
);
['type' => 'form_action']
);
}
}
} else {
html_print_action_buttons('');
}
$html_content = ob_get_clean();

2
pandora_console/operation/agentes/estado_agente.php
View File

@ -1301,7 +1301,7 @@ if (empty($tableAgents->data) === false) {
true,
'offset',
false,
'dataTables_paginate paging_simple_numbers'
'paging_simple_numbers'
);
unset($table);

3
pandora_console/operation/agentes/status_monitor.php
View File

@ -907,6 +907,9 @@ $tableFilter->data['second_line'][1] = html_print_label_input_block(
true,
'',
[],
true,
0,
'30',
true
)
);

8
pandora_console/operation/heatmap.php
View File

@ -149,13 +149,13 @@ if ($is_ajax === false && $pure === false) {
if ($is_ajax === false && $pure === true) {
// Floating menu - Start.
echo '<div id="heatmap-controls" class="zindex999">';
echo '<div id="heatmap-controls" class="zindex999" style="max-height: 85px">';
echo '<div id="menu_tab" method="post">';
echo '<ul class="mn white-box-content box-shadow flex-row">';
// Name.
echo '<li class="nomn">';
echo '<li class="nomn mx_height85">';
html_print_div(
[
@ -167,7 +167,7 @@ if ($is_ajax === false && $pure === true) {
echo '</li>';
// Countdown.
echo '<li class="nomn">';
echo '<li class="nomn mx_height85">';
echo '<div class="heatmap-refr">';
echo '<div id="heatmap-refr-form">';
@ -282,7 +282,7 @@ if ($is_ajax === true) {
draggable: false,
modal: true,
closeOnEscape: true,
height: 410,
height: 500,
width: 330,
title: '<?php echo __('Config'); ?>',
position: {

637
pandora_console/operation/inventory/inventory.php
View File

@ -119,6 +119,7 @@ if (is_ajax() === true) {
$length = (int) get_parameter('length', $config['block_size']);
$order = get_datatable_order();
$id_agent = (int) get_parameter('id_agent', 0);
$id_group = (int) get_parameter('id_group', 0);
$params = [
'search' => $filter['value'],
@ -126,6 +127,7 @@ if (is_ajax() === true) {
'length' => $length,
'order' => $order,
'id_agent' => $id_agent,
'id_group' => $id_group,
];
$data = get_data_basic_info_sql($params);
@ -753,295 +755,8 @@ if (is_metaconsole() === true) {
$filteringFunction = '';
}
if ($is_metaconsole === false) {
// Single agent selected.
if ($inventory_id_agent > 0 && isset($agents[$inventory_id_agent]) === true) {
$agents = [$inventory_id_agent => $agents[$inventory_id_agent]];
}
$agents_ids = array_keys($agents);
if (count($agents_ids) > 0) {
$rows = inventory_get_datatable(
$agents_ids,
$inventory_module,
$utimestamp,
$inventory_search_string,
$export,
false,
$order_by_agent
);
}
if (count($agents_ids) === 0 || (int) $rows === ERR_NODATA) {
ui_print_info_message(['no_close' => true, 'message' => __('No data found.') ]);
echo '&nbsp;</td></tr><tr><td>';
return;
}
echo "<div id='loading_url' style='display: none; width: ".$table->width."; text-align: right;'>".html_print_image('images/spinner.gif', true).'</div>';
?>
<script type="text/javascript">
function get_csv_url(module, id_group, search_string, utimestamp, agent, order_by_agent) {
$("#url_csv").hide();
$("#loading_url").show();
$.ajax ({
method:'GET',
url:'ajax.php',
datatype:'html',
data:{
"page" : "operation/inventory/inventory",
"get_csv_url" : 1,
"module" : module,
"id_group" : id_group,
"search_string" : search_string,
"utimestamp" : utimestamp,
"agent" : agent,
"export": true,
"order_by_agent": order_by_agent
},
success: function (data, status) {
$("#url_csv").html(data);
$("#loading_url").hide();
$("#url_csv").show();
}
});
}
</script>
<?php
if ($inventory_module !== 'basic') {
if ($order_by_agent === true) {
foreach ($rows as $agent_rows) {
$data = [];
$modules = '';
foreach ($agent_rows['row'] as $key_row => $row) {
$columns = explode(';', io_safe_output($row['data_format']));
array_push($columns, 'Timestamp');
$data_rows = explode(PHP_EOL, $row['data']);
foreach ($data_rows as $data_row) {
// Exclude results don't match filter.
if ($inventory_search_string && preg_match('/'.io_safe_output($inventory_search_string).'/', ($data_row)) == 0) {
continue;
}
$column_data = explode(';', io_safe_output($data_row));
if ($column_data[0] !== '') {
$row_tmp = [];
foreach ($column_data as $key => $value) {
$row_tmp[$columns[$key]] = $value;
}
$row_tmp['Timestamp'] = $row['timestamp'];
array_push($data, (object) $row_tmp);
}
}
$id_table = 'id_'.$key_row.'_'.$row['id_module_inventory'].'_'.$row['id_agente'];
$table = ui_print_datatable(
[
'id' => $id_table,
'class' => 'info_table w100p',
'style' => 'width: 99%',
'columns' => $columns,
'column_names' => $columns,
'no_sortable_columns' => [],
'data_element' => $data,
'searching' => true,
'dom_elements' => 'ftip',
'order' => [
'field' => $columns[0],
'direction' => 'asc',
],
'zeroRecords' => __('No inventory found'),
'emptyTable' => __('No inventory found'),
'return' => true,
'default_pagination' => 10,
'no_sortable_columns' => [-1],
]
);
$modules .= ui_toggle(
$table,
'<span class="title-blue">'.$row['name'].'</span>',
'',
'',
true,
true,
'',
'white-box-content w100p',
'box-shadow white_table_graph w100p',
'images/arrow_down_green.png',
'images/arrow_right_green.png',
false,
false,
false,
'',
'',
null,
null,
false,
$id_table
);
}
ui_toggle(
$modules,
$agent_rows['agent'],
'',
'',
false,
false
);
}
} else {
$count_rows = count($rows);
foreach ($rows as $module_rows) {
$agent = '';
$data = [];
foreach ($module_rows as $row) {
$columns = explode(';', io_safe_output($row['data_format']));
array_push($columns, 'Timestamp');
array_push($columns, 'Agent');
// Exclude results don't match filter.
if ($inventory_search_string && preg_match('/'.io_safe_output($inventory_search_string).'/', ($row['data'])) == 0) {
continue;
}
$data_tmp = [];
if ($row['data'] !== '') {
$values_explode = explode(';', io_safe_output($row['data']));
foreach ($values_explode as $key => $value) {
$data_tmp[$columns[$key]] = $value;
}
$data_tmp['Timestamp'] = $row['timestamp'];
$data_tmp['Agent'] = $row['name_agent'];
array_push($data, $data_tmp);
}
$id_table = 'id_'.$row['id_module_inventory'];
}
$table = ui_print_datatable(
[
'id' => $id_table,
'class' => 'info_table w100p',
'style' => 'width: 99%',
'columns' => $columns,
'column_names' => $columns,
'no_sortable_columns' => [],
'data_element' => $data,
'searching' => true,
'dom_elements' => 'ftip',
'order' => [
'field' => $columns[0],
'direction' => 'asc',
],
'zeroRecords' => __('No inventory found'),
'emptyTable' => __('No inventory found'),
'return' => true,
'no_sortable_columns' => [],
]
);
if ($count_rows > 1) {
ui_toggle(
$table,
array_shift($module_rows)['name'],
'',
'',
false,
false
);
} else {
echo $table;
html_print_action_buttons(
'',
['type' => 'form_action']
);
}
}
}
} else {
$id_agente = $inventory_id_agent;
$agentes = [];
$data = [];
$class = 'info_table';
$style = 'width: 99%';
$ordering = true;
$searching = false;
$columns = [
'alias',
'ip',
'secondoaryIp',
'group',
'secondaryGroups',
'description',
'os',
'interval',
'lastContact',
'lastStatusChange',
'customFields',
'valuesCustomFields',
];
$columns_names = [
__('Alias'),
__('IP'),
__('Secondary IP'),
__('Group'),
__('Secondary groups'),
__('Description'),
__('OS'),
__('Interval'),
__('Last contact'),
__('Last status change'),
__('Custom fields'),
__('Values Custom Fields'),
];
ui_print_datatable(
[
'id' => 'basic_info',
'class' => $class,
'style' => $style,
'columns' => $columns,
'column_names' => $columns_names,
'ordering' => $ordering,
'searching' => $searching,
'order' => [
'field' => $columns[0],
'direction' => 'asc',
],
'ajax_url' => 'operation/inventory/inventory',
'ajax_data' => [
'get_data_basic_info' => 1,
'id_agent' => $id_agente,
],
'zeroRecords' => __('Agent info not found'),
'emptyTable' => __('Agent info not found'),
'return' => false,
]
);
html_print_action_buttons(
'',
['type' => 'form_action']
);
}
} else {
// Metaconsole.
if ($inventory_module !== 'basic') {
if ($inventory_module !== 'basic') {
if (is_metaconsole() === true) {
if ($order_by_agent === true) {
$count_nodos_tmp = [];
foreach ($nodos as $count_value) {
@ -1266,73 +981,293 @@ if ($is_metaconsole === false) {
}
}
} else {
$id_agente = $inventory_id_agent;
$agentes = [];
$data = [];
$class = 'info_table';
$style = 'width: 99%';
$ordering = true;
$searching = false;
// Single agent selected.
if ($inventory_id_agent > 0 && isset($agents[$inventory_id_agent]) === true) {
$agents = [$inventory_id_agent => $agents[$inventory_id_agent]];
}
$columns = [
'alias',
'ip',
'secondoaryIp',
'group',
'secondaryGroups',
'description',
'os',
'interval',
'lastContact',
'lastStatusChange',
'customFields',
'valuesCustomFields',
];
$agents_ids = array_keys($agents);
if (count($agents_ids) > 0) {
$rows = inventory_get_datatable(
$agents_ids,
$inventory_module,
$utimestamp,
$inventory_search_string,
$export,
false,
$order_by_agent
);
}
$columns_names = [
__('Alias'),
__('IP'),
__('Secondary IP'),
__('Group'),
__('Secondary groups'),
__('Description'),
__('OS'),
__('Interval'),
__('Last contact'),
__('Last status change'),
__('Custom fields'),
__('Values Custom Fields'),
];
if (count($agents_ids) === 0 || (int) $rows === ERR_NODATA) {
ui_print_info_message(
[
'no_close' => true,
'message' => __('No data found.'),
]
);
return;
}
ui_print_datatable(
[
'id' => 'basic_info',
'class' => $class,
'style' => $style,
'columns' => $columns,
'column_names' => $columns_names,
'ordering' => $ordering,
'searching' => $searching,
'order' => [
'field' => $columns[0],
'direction' => 'asc',
],
'ajax_url' => 'operation/inventory/inventory',
'ajax_data' => [
'get_data_basic_info' => 1,
'id_agent' => $id_agente,
],
'zeroRecords' => __('Agent info not found'),
'emptyTable' => __('Agent info not found'),
'return' => false,
]
);
echo "<div id='loading_url' style='display: none; width: ".$table->width."; text-align: right;'>".html_print_image('images/spinner.gif', true).'</div>';
?>
<script type="text/javascript">
function get_csv_url(module, id_group, search_string, utimestamp, agent, order_by_agent) {
$("#url_csv").hide();
$("#loading_url").show();
$.ajax ({
method:'GET',
url:'ajax.php',
datatype:'html',
data:{
"page" : "operation/inventory/inventory",
"get_csv_url" : 1,
"module" : module,
"id_group" : id_group,
"search_string" : search_string,
"utimestamp" : utimestamp,
"agent" : agent,
"export": true,
"order_by_agent": order_by_agent
},
success: function (data, status) {
$("#url_csv").html(data);
$("#loading_url").hide();
$("#url_csv").show();
}
});
}
</script>
<?php
if ($order_by_agent === true) {
foreach ($rows as $agent_rows) {
$data = [];
$modules = '';
foreach ($agent_rows['row'] as $key_row => $row) {
$columns = explode(';', io_safe_output($row['data_format']));
array_push($columns, 'Timestamp');
html_print_action_buttons(
'',
['type' => 'form_action']
);
$data_rows = explode(PHP_EOL, $row['data']);
foreach ($data_rows as $data_row) {
// Exclude results don't match filter.
if ($inventory_search_string && preg_match('/'.io_safe_output($inventory_search_string).'/', ($data_row)) == 0) {
continue;
}
$column_data = explode(';', io_safe_output($data_row));
if ($column_data[0] !== '') {
$row_tmp = [];
foreach ($column_data as $key => $value) {
$row_tmp[$columns[$key]] = $value;
}
$row_tmp['Timestamp'] = $row['timestamp'];
array_push($data, (object) $row_tmp);
}
}
$id_table = 'id_'.$key_row.'_'.$row['id_module_inventory'].'_'.$row['id_agente'];
$table = ui_print_datatable(
[
'id' => $id_table,
'class' => 'info_table w100p',
'style' => 'width: 99%',
'columns' => $columns,
'column_names' => $columns,
'no_sortable_columns' => [],
'data_element' => $data,
'searching' => true,
'dom_elements' => 'ftip',
'order' => [
'field' => $columns[0],
'direction' => 'asc',
],
'zeroRecords' => __('No inventory found'),
'emptyTable' => __('No inventory found'),
'return' => true,
'default_pagination' => 10,
'no_sortable_columns' => [-1],
]
);
$modules .= ui_toggle(
$table,
'<span class="title-blue">'.$row['name'].'</span>',
'',
'',
true,
true,
'',
'white-box-content w100p',
'box-shadow white_table_graph w100p',
'images/arrow_down_green.png',
'images/arrow_right_green.png',
false,
false,
false,
'',
'',
null,
null,
false,
$id_table
);
}
ui_toggle(
$modules,
$agent_rows['agent'],
'',
'',
false,
false
);
}
} else {
$count_rows = count($rows);
foreach ($rows as $module_rows) {
$agent = '';
$data = [];
foreach ($module_rows as $row) {
$columns = explode(';', io_safe_output($row['data_format']));
array_push($columns, 'Timestamp');
array_push($columns, 'Agent');
// Exclude results don't match filter.
if ($inventory_search_string && preg_match('/'.io_safe_output($inventory_search_string).'/', ($row['data'])) == 0) {
continue;
}
$data_tmp = [];
if ($row['data'] !== '') {
$values_explode = explode(';', io_safe_output($row['data']));
foreach ($values_explode as $key => $value) {
$data_tmp[$columns[$key]] = $value;
}
$data_tmp['Timestamp'] = $row['timestamp'];
$data_tmp['Agent'] = $row['name_agent'];
array_push($data, $data_tmp);
}
$id_table = 'id_'.$row['id_module_inventory'];
}
$table = ui_print_datatable(
[
'id' => $id_table,
'class' => 'info_table w100p',
'style' => 'width: 99%',
'columns' => $columns,
'column_names' => $columns,
'no_sortable_columns' => [],
'data_element' => $data,
'searching' => true,
'dom_elements' => 'ftip',
'order' => [
'field' => $columns[0],
'direction' => 'asc',
],
'zeroRecords' => __('No inventory found'),
'emptyTable' => __('No inventory found'),
'return' => true,
'no_sortable_columns' => [],
]
);
if ($count_rows > 1) {
ui_toggle(
$table,
array_shift($module_rows)['name'],
'',
'',
false,
false
);
} else {
echo $table;
html_print_action_buttons(
'',
['type' => 'form_action']
);
}
}
}
}
} else {
$id_agente = $inventory_id_agent;
$agentes = [];
$data = [];
$class = 'info_table';
$style = 'width: 99%';
$ordering = true;
$searching = false;
$columns = [
'alias',
'ip',
'secondoaryIp',
'group',
'secondaryGroups',
'description',
'os',
'interval',
'lastContact',
'lastStatusChange',
'customFields',
'valuesCustomFields',
];
$columns_names = [
__('Alias'),
__('IP'),
__('Secondary IP'),
__('Group'),
__('Secondary groups'),
__('Description'),
__('OS'),
__('Interval'),
__('Last contact'),
__('Last status change'),
__('Custom fields'),
__('Values Custom Fields'),
];
ui_print_datatable(
[
'id' => 'basic_info',
'class' => $class,
'style' => $style,
'columns' => $columns,
'column_names' => $columns_names,
'ordering' => $ordering,
'searching' => $searching,
'order' => [
'field' => $columns[0],
'direction' => 'asc',
],
'ajax_url' => 'operation/inventory/inventory',
'ajax_data' => [
'get_data_basic_info' => 1,
'id_agent' => $id_agente,
'id_group' => $inventory_id_group,
],
'zeroRecords' => __('Agent info not found'),
'emptyTable' => __('Agent info not found'),
'return' => false,
]
);
html_print_action_buttons(
'',
['type' => 'form_action']
);
}
ui_require_jquery_file('pandora.controls');

4
pandora_console/pandoradb_data.sql
View File

@ -118,10 +118,10 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
('custom_report_front_logo', 'images/pandora_logo_white.jpg'),
('custom_report_front_header', ''),
('custom_report_front_footer', ''),
('MR', 61),
('MR', 62),
('identification_reminder', 1),
('identification_reminder_timestamp', 0),
('current_package', 769),
('current_package', 770),
('post_process_custom_values', '{"0.00000038580247":"Seconds&#x20;to&#x20;months","0.00000165343915":"Seconds&#x20;to&#x20;weeks","0.00001157407407":"Seconds&#x20;to&#x20;days","0.01666666666667":"Seconds&#x20;to&#x20;minutes","0.00000000093132":"Bytes&#x20;to&#x20;Gigabytes","0.00000095367432":"Bytes&#x20;to&#x20;Megabytes","0.00097656250000":"Bytes&#x20;to&#x20;Kilobytes","0.00000001653439":"Timeticks&#x20;to&#x20;weeks","0.00000011574074":"Timeticks&#x20;to&#x20;days"}'),
('custom_docs_logo', 'default_docs.png'),
('custom_support_logo', 'default_support.png'),

2
pandora_console/views/cluster/view.php
View File

@ -216,7 +216,7 @@ $table_agent_header .= '<div class="icono_right">'.$status_img.'</div>';
$table_agent_header .= '&nbsp;&nbsp;';
$table_agent_header .= '<a href="'.$model->url.'&op=force&id='.$cluster->id();
$table_agent_header .= '">'.html_print_image(
'images/change-active.svg',
'images/force@svg.svg',
true,
[
'title' => __('Force cluster status calculation'),

17
pandora_console/views/consoles/list.php
View File

@ -27,21 +27,22 @@
*/
// Header.
\ui_print_page_header(
// Title.
ui_print_standard_header(
__('%s registered consoles', $config['rb_product_name']),
// Icon.
'',
// Return.
false,
// Help.
'',
// Godmode.
true,
// Options.
''
[],
[
[
'link' => '',
'label' => __('Servers'),
],
]
);
if (empty($message) === false) {
echo $message;
}

4
pandora_console/views/dashboard/header.php
View File

@ -159,7 +159,7 @@ if ($public_dashboard_hash !== false) {
}
$comboRefreshCountdown['text'] = '<div class="dashboard-countdown display_in"></div>';
$comboRefresh['text'] = '<form id="refr-form" method="post" class="mrgn_top_13px" action="'.$urlRefresh.'">';
$comboRefresh['text'] = '<form id="refr-form" method="post" class="mrgn_top_13px" action="'.$urlRefresh.'">';
$comboRefresh['text'] .= __('Refresh').':';
$comboRefresh['text'] .= html_print_select(
\get_refresh_time_array(),
@ -284,7 +284,7 @@ if (isset($config['public_dashboard']) === true
}
}
if ($publicLink === false) {
if ($config['pure'] === false) {
ui_print_standard_header(
$dashboardName,
'',

2
pandora_console/views/dashboard/slides.php
View File

@ -28,7 +28,7 @@
global $config;
$output = '<div id="dashboard-controls">';
$output = '<div id="dashboard-controls-slides">';
// Normal view button.
$output .= '<div>';