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 10:52:50 +02:00
parent 5162864b28
commit ee4a3dc450
1 changed files with 372 additions and 372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1513,7 +1513,6 @@ if ($not_condition !== '') {
$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);
@ -1912,10 +1911,9 @@ 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 {
@ -1926,6 +1924,8 @@ 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>";