fix characters breaking html

This commit is contained in:
alejandro-campos 2020-02-03 16:17:46 +01:00
parent 73f3dfac85
commit d05551f85a
2 changed files with 19 additions and 13 deletions

View File

@ -801,17 +801,23 @@ function mainAgentsModules()
$link = "winopeng('".'operation/agentes/stat_win.php?'."type=$graph_type&".'period='.SECONDS_1DAY.'&'.'id='.$module_id.'&'.'refresh='.SECONDS_10MINUTES."', 'day_".$win_handle."')"; $link = "winopeng('".'operation/agentes/stat_win.php?'."type=$graph_type&".'period='.SECONDS_1DAY.'&'.'id='.$module_id.'&'.'refresh='.SECONDS_10MINUTES."', 'day_".$win_handle."')";
echo '<a href="javascript:'.$link.'">'; echo '<a href="javascript:'.$link.'">';
$module_last_value = modules_get_last_value($module_id);
if (!is_numeric($module_last_value)) {
$module_last_value = htmlspecialchars($module_last_value);
}
switch ($status) { switch ($status) {
case AGENT_MODULE_STATUS_NORMAL: case AGENT_MODULE_STATUS_NORMAL:
ui_print_status_image('module_ok.png', modules_get_last_value($module_id), false); ui_print_status_image('module_ok.png', $module_last_value, false);
break; break;
case AGENT_MODULE_STATUS_CRITICAL_BAD: case AGENT_MODULE_STATUS_CRITICAL_BAD:
ui_print_status_image('module_critical.png', modules_get_last_value($module_id), false); ui_print_status_image('module_critical.png', $module_last_value, false);
break; break;
case AGENT_MODULE_STATUS_WARNING: case AGENT_MODULE_STATUS_WARNING:
ui_print_status_image('module_warning.png', modules_get_last_value($module_id), false); ui_print_status_image('module_warning.png', $module_last_value, false);
break; break;
case AGENT_MODULE_STATUS_UNKNOWN: case AGENT_MODULE_STATUS_UNKNOWN:
@ -821,11 +827,11 @@ function mainAgentsModules()
case AGENT_MODULE_STATUS_NORMAL_ALERT: case AGENT_MODULE_STATUS_NORMAL_ALERT:
case AGENT_MODULE_STATUS_WARNING_ALERT: case AGENT_MODULE_STATUS_WARNING_ALERT:
case AGENT_MODULE_STATUS_CRITICAL_ALERT: case AGENT_MODULE_STATUS_CRITICAL_ALERT:
ui_print_status_image('module_alertsfired.png', modules_get_last_value($module_id), false); ui_print_status_image('module_alertsfired.png', $module_last_value, false);
break; break;
case 4: case 4:
ui_print_status_image('module_no_data.png', modules_get_last_value($module_id), false); ui_print_status_image('module_no_data.png', $module_last_value, false);
break; break;
} }

View File

@ -1362,7 +1362,7 @@ if (!empty($result)) {
} else { } else {
$data[6] = ui_print_status_image( $data[6] = ui_print_status_image(
STATUS_MODULE_OK, STATUS_MODULE_OK,
__('NORMAL').': '.$row['datos'], __('NORMAL').': '.htmlspecialchars($row['datos']),
true true
); );
} }
@ -1376,7 +1376,7 @@ if (!empty($result)) {
} else { } else {
$data[6] = ui_print_status_image( $data[6] = ui_print_status_image(
STATUS_MODULE_CRITICAL, STATUS_MODULE_CRITICAL,
__('CRITICAL').': '.$row['datos'], __('CRITICAL').': '.htmlspecialchars($row['datos']),
true true
); );
} }
@ -1390,7 +1390,7 @@ if (!empty($result)) {
} else { } else {
$data[6] = ui_print_status_image( $data[6] = ui_print_status_image(
STATUS_MODULE_WARNING, STATUS_MODULE_WARNING,
__('WARNING').': '.$row['datos'], __('WARNING').': '.htmlspecialchars($row['datos']),
true true
); );
} }
@ -1404,7 +1404,7 @@ if (!empty($result)) {
} else { } else {
$data[6] = ui_print_status_image( $data[6] = ui_print_status_image(
STATUS_MODULE_UNKNOWN, STATUS_MODULE_UNKNOWN,
__('UNKNOWN').': '.$row['datos'], __('UNKNOWN').': '.htmlspecialchars($row['datos']),
true true
); );
} }
@ -1418,7 +1418,7 @@ if (!empty($result)) {
} else { } else {
$data[6] = ui_print_status_image( $data[6] = ui_print_status_image(
STATUS_MODULE_NO_DATA, STATUS_MODULE_NO_DATA,
__('NO DATA').': '.$row['datos'], __('NO DATA').': '.htmlspecialchars($row['datos']),
true true
); );
} }
@ -1437,7 +1437,7 @@ if (!empty($result)) {
} else { } else {
$data[6] = ui_print_status_image( $data[6] = ui_print_status_image(
STATUS_MODULE_UNKNOWN, STATUS_MODULE_UNKNOWN,
__('UNKNOWN').' - '.__('Last status').' '.__('NORMAL').': '.$row['datos'], __('UNKNOWN').' - '.__('Last status').' '.__('NORMAL').': '.htmlspecialchars($row['datos']),
true true
); );
} }
@ -1453,7 +1453,7 @@ if (!empty($result)) {
} else { } else {
$data[6] = ui_print_status_image( $data[6] = ui_print_status_image(
STATUS_MODULE_UNKNOWN, STATUS_MODULE_UNKNOWN,
__('UNKNOWN').' - '.__('Last status').' '.__('CRITICAL').': '.$row['datos'], __('UNKNOWN').' - '.__('Last status').' '.__('CRITICAL').': '.htmlspecialchars($row['datos']),
true true
); );
} }
@ -1469,7 +1469,7 @@ if (!empty($result)) {
} else { } else {
$data[6] = ui_print_status_image( $data[6] = ui_print_status_image(
STATUS_MODULE_UNKNOWN, STATUS_MODULE_UNKNOWN,
__('UNKNOWN').' - '.__('Last status').' '.__('WARNING').': '.$row['datos'], __('UNKNOWN').' - '.__('Last status').' '.__('WARNING').': '.htmlspecialchars($row['datos']),
true true
); );
} }