tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed merge conflict

Browse Source
This commit is contained in:
marcos 2021-06-14 11:02:57 +02:00
parent ee4a3dc450
commit 0cfb7c994f
1 changed files with 373 additions and 371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1512,7 +1512,7 @@ if ($not_condition !== '') {
if (in_array('server_type', $show_fields) || is_metaconsole()) { if (in_array('server_type', $show_fields) || is_metaconsole()) {
$data[4] = servers_show_type($row['id_modulo']); $data[4] = servers_show_type($row['id_modulo']);
} }
}
if (in_array('module_name', $show_fields) || is_metaconsole()) { if (in_array('module_name', $show_fields) || is_metaconsole()) {
$data[3] = ui_print_truncate_text($row['module_name'], 'module_small', false, true, true); $data[3] = ui_print_truncate_text($row['module_name'], 'module_small', false, true, true);
@ -1537,7 +1537,6 @@ if ($not_condition !== '') {
} }
if (in_array('interval', $show_fields) || is_metaconsole()) { if (in_array('interval', $show_fields) || is_metaconsole()) {
$data[5] = ($row['module_interval'] == 0) ? human_time_description_raw($row['agent_interval']) : human_time_description_raw($row['module_interval']); $data[5] = ($row['module_interval'] == 0) ? human_time_description_raw($row['agent_interval']) : human_time_description_raw($row['module_interval']);
} }
@ -1909,13 +1908,17 @@ if ($not_condition !== '') {
} }
$data[11] = ui_print_timestamp($row['utimestamp'], true, $option); $data[11] = ui_print_timestamp($row['utimestamp'], true, $option);
}
array_push($table->data, $data); array_push($table->data, $data);
} }
}
html_print_table($table);
if ($count_modules > $config['block_size']) { if ($count_modules > $config['block_size']) {
ui_pagination($count_modules, false, $offset, 0, false, 'offset', true, 'pagination-bottom'); ui_pagination($count_modules, false, $offset, 0, false, 'offset', true, 'pagination-bottom');
}
} else { } else {
if ($first_interaction) { if ($first_interaction) {
ui_print_info_message(['no_close' => true, 'message' => __('This group doesn\'t have any monitor')]); ui_print_info_message(['no_close' => true, 'message' => __('This group doesn\'t have any monitor')]);
@ -1924,7 +1927,6 @@ if ($not_condition !== '') {
} }
} }
html_print_table($table);
// End Build List Result. // End Build List Result.
echo "<div id='monitor_details_window'></div>"; echo "<div id='monitor_details_window'></div>";