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

fixed errors in custom fields view

This commit is contained in:
daniel 2018-11-16 11:58:49 +01:00
parent e6cd8c5471
commit 0a097d185d
4 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pandora_console/include/ajax/custom_fields.php
View File

@ -21,6 +21,7 @@ global $config;
include_once($config['homedir'] . "/include/functions_agents.php");
include_once($config['homedir'] . "/include/functions_modules.php");
include_once($config['homedir'] . "/include/functions_ui.php");
include_once($config['homedir'] . '/include/functions_custom_fields.php');
enterprise_include_once ('include/functions_metaconsole.php');
$get_custom_fields_data = (bool) get_parameter('get_custom_fields_data', 0);
@ -260,6 +261,7 @@ if($build_table_child_custom_fields){
$query = sprintf("SELECT tam.nombre,
tam.min_warning, tam.max_warning,
tam.min_critical, tam.max_critical,
tam.str_warning, tam.str_critical,
tae.estado, tae.current_interval,
tae.utimestamp, tae.datos
FROM tagente_modulo tam
@ -280,29 +282,30 @@ if($build_table_child_custom_fields){
$table_modules->head = array();
$table_modules->head[0] = __('Module name');
$table_modules->head[1] = __('Data');
$table_modules->head[2] = __('Min Warning');
$table_modules->head[3] = __('Max Warning');
$table_modules->head[4] = __('Min Critical');
$table_modules->head[5] = __('Max Critical');
$table_modules->head[6] = __('Current interval');
$table_modules->head[7] = __('Timestamp');
$table_modules->head[8] = __('Status');
$table_modules->head[2] = __('Treshold');
$table_modules->head[3] = __('Current interval');
$table_modules->head[4] = __('Timestamp');
$table_modules->head[5] = __('Status');
$table_modules->data = array();
if(isset($modules) && is_array($modules)){
foreach ($modules as $key => $value) {
$table_modules->data[$key][0] = $value['nombre'];
$table_modules->data[$key][1] = $value['datos'];
$table_modules->data[$key][2] = $value['min_warning'];
$table_modules->data[$key][3] = $value['max_warning'];
$table_modules->data[$key][4] = $value['min_critical'];
$table_modules->data[$key][5] = $value['max_critical'];
$table_modules->data[$key][6] = $value['current_interval'];
$table_modules->data[$key][7] = date('d/m/Y h:i:s', $value['utimestamp']);
$table_modules->data[$key][2] = ui_print_module_warn_value (
$value["max_warning"],
$value["min_warning"],
$value["str_warning"],
$value["max_critical"],
$value["min_critical"],
$value["str_critical"]
);
$table_modules->data[$key][3] = $value['current_interval'];
$table_modules->data[$key][4] = ui_print_timestamp($value['utimestamp'], true);
switch ($value['estado']) {
case 0:
case 300:
$table_modules->data[$key][8] = html_print_image(
$table_modules->data[$key][5] = html_print_image(
'images/status_sets/default/severity_normal.png',
true,
array(
@ -312,7 +315,7 @@ if($build_table_child_custom_fields){
break;
case 1:
case 100:
$table_modules->data[$key][8] = html_print_image(
$table_modules->data[$key][5] = html_print_image(
'images/status_sets/default/severity_critical.png',
true,
array(
@ -322,7 +325,7 @@ if($build_table_child_custom_fields){
break;
case 2:
case 200:
$table_modules->data[$key][8] = html_print_image(
$table_modules->data[$key][5] = html_print_image(
'images/status_sets/default/severity_warning.png',
true,
array(
@ -331,7 +334,7 @@ if($build_table_child_custom_fields){
);
break;
case 3:
$table_modules->data[$key][8] = html_print_image(
$table_modules->data[$key][5] = html_print_image(
'images/status_sets/default/severity_maintenance.png',
true,
array(
@ -341,7 +344,7 @@ if($build_table_child_custom_fields){
break;
case 4:
case 5:
$table_modules->data[$key][8] = html_print_image(
$table_modules->data[$key][5] = html_print_image(
'images/status_sets/default/severity_informational.png',
true,
array(
@ -350,7 +353,7 @@ if($build_table_child_custom_fields){
);
break;
default:
$table_modules->data[$key][8] = html_print_image(
$table_modules->data[$key][5] = html_print_image(
'images/status_sets/default/severity_normal.png',
true,
array(

2
pandora_console/include/functions_io.php
View File

@ -194,7 +194,7 @@ function io_html_to_ascii($hex) {
*
* @return void
*/
function io_safe_output_array(&$item, $key, $utf8 = true) {
function io_safe_output_array(&$item, $key=false, $utf8=true) {
$item = io_safe_output($item, $utf8);
}

2
pandora_console/include/javascript/jquery.contextMenu.js
View File

@ -1124,7 +1124,7 @@ var // currently active contextMenu trigger
// reset and apply changes in the end because nested
// elements' widths wouldn't be calculatable otherwise
if (!nested) {
$menu.find('ul').andSelf().css({
$menu.find('ul').addBack().css({
position: '',
display: '',
minWidth: '',

15
pandora_console/operation/agentes/pandora_networkmap.php
View File

@ -457,16 +457,17 @@ switch ($tab) {
$ent_maps_to_migrate[] = $old_map_ent['id'];
}
}
$open_maps_to_migrate = array();
foreach ($old_networkmaps_open as $old_map_open) {
$text_filter = $old_map_open['text_filter'];
if ($text_filter != "migrated") {
$open_maps_to_migrate[] = $old_map_open['id_networkmap'];
if(isset($old_networkmaps_open) && is_array($old_networkmaps_open)){
foreach ($old_networkmaps_open as $old_map_open) {
$text_filter = $old_map_open['text_filter'];
if ($text_filter != "migrated") {
$open_maps_to_migrate[] = $old_map_open['id_networkmap'];
}
}
}
if (!empty($ent_maps_to_migrate) || !empty($open_maps_to_migrate)) {
?>
<div id="migration_dialog" style="text-align: center;">