tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-5362-9464-Fallo-en-vista-de-agente-con-modulos-generic_string' into 'develop'

Browse Source 
fix module string data with html special chars breaking html in page

See merge request artica/pandorafms!3042
This commit is contained in:
Daniel Rodriguez 2020-02-04 10:10:07 +01:00
commit 8b60daa9ba
5 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pandora_console/extensions/agents_modules.php
View File

@ -801,31 +801,37 @@ 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:
ui_print_status_image('module_unknown.png', modules_get_last_value($module_id), false); ui_print_status_image('module_unknown.png', $module_last_value, false);
break; break;
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;
} }

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

@ -832,7 +832,7 @@ foreach ($modules as $module) {
$data[5] = ui_print_truncate_text($module['descripcion'], 'description', false); $data[5] = ui_print_truncate_text($module['descripcion'], 'description', false);
$data[6] = ui_print_status_image($status, $title, true); $data[6] = ui_print_status_image($status, htmlspecialchars($title), true);
// MAX / MIN values // MAX / MIN values
if ($module['id_tipo_modulo'] != 25) { if ($module['id_tipo_modulo'] != 25) {

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

@ -1022,7 +1022,7 @@ if (check_login()) {
$title $title
); );
$data[5] = ui_print_status_image($status, $title, true); $data[5] = ui_print_status_image($status, htmlspecialchars($title), true);
if (!$show_context_help_first_time) { if (!$show_context_help_first_time) {
$show_context_help_first_time = true; $show_context_help_first_time = true;

2
pandora_console/include/class/Tree.class.php
View File

@ -623,7 +623,7 @@ class Tree
} }
} }
$module['statusImageHTML'] = ui_print_status_image($statusType, $statusTitle, true); $module['statusImageHTML'] = ui_print_status_image($statusType, htmlspecialchars($statusTitle), true);
// HTML of the server type image // HTML of the server type image
$module['serverTypeHTML'] = servers_show_type($module['server_type']); $module['serverTypeHTML'] = servers_show_type($module['server_type']);

16
pandora_console/operation/agentes/status_monitor.php
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
); );
} }