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

Fixed snapshots view in string data

This commit is contained in:
fermin831 2018-05-07 19:40:38 +02:00
parent e0cf024990
commit 57fb63bd91
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/include/functions.php
View File

@ -2162,6 +2162,18 @@ function is_snapshot_data ($data) {
return is_image_data($data); return is_image_data($data);
} }
/**
* Check if text is too long to put it into a black screen
*
* @param string Data value
* @return bool True if black window should be displayed
*/
function is_text_to_black_string ($data) {
if (is_image_data($data)) return false;
// Consider large text if data is greater than 200 characters
return ((int)strlen($data)) > 200;
}
/** /**
* Create an invisible div with a provided ID and value to * Create an invisible div with a provided ID and value to
* can retrieve it from javascript with function get_php_value(name) * can retrieve it from javascript with function get_php_value(name)

11
pandora_console/include/functions_ui.php
View File

@ -3814,12 +3814,11 @@ function ui_print_module_string_value($value, $id_agente_module,
if ($is_web_content_string) { if ($is_web_content_string) {
$value = io_safe_input($value); $value = io_safe_input($value);
} }
$is_snapshot = is_snapshot_data($value); $is_snapshot = is_snapshot_data($value);
$is_large_image = is_text_to_black_string ($value);
if (($config['command_snapshot']) && ($is_snapshot)) {
if (($config['command_snapshot']) && ($is_snapshot || $is_large_image)) {
$handle = "snapshot" . "_" . $id_agente_module; $handle = "snapshot" . "_" . $id_agente_module;
$url = 'include/procesos.php?agente=' . $id_agente_module; $url = 'include/procesos.php?agente=' . $id_agente_module;
$win_handle = dechex(crc32($handle)); $win_handle = dechex(crc32($handle));
@ -3828,7 +3827,7 @@ function ui_print_module_string_value($value, $id_agente_module,
"id=" . $id_agente_module . "id=" . $id_agente_module .
"&refr=" . $current_interval . "&refr=" . $current_interval .
"&label=" . rawurlencode(urlencode(io_safe_output($module_name))) . "','" . $win_handle . "', 700,480)"; "&label=" . rawurlencode(urlencode(io_safe_output($module_name))) . "','" . $win_handle . "', 700,480)";
if (is_image_data($value)) { if ($is_snapshot) {
$salida = '<a href="javascript:' . $link . '">' . $salida = '<a href="javascript:' . $link . '">' .
html_print_image("images/photo.png", true, html_print_image("images/photo.png", true,
array("border" => '0', array("border" => '0',

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

@ -1370,10 +1370,11 @@ if (!empty($result)) {
else { else {
$module_value = io_safe_output($row['datos']); $module_value = io_safe_output($row['datos']);
} }
$is_snapshot = is_snapshot_data ( $module_value ); $is_snapshot = is_snapshot_data ( $module_value );
$is_large_image = is_text_to_black_string ( $module_value );
if (($config['command_snapshot']) && ($is_snapshot)) {
if (($config['command_snapshot']) && ($is_snapshot || $is_large_image)) {
$link = ui_get_snapshot_link( array( $link = ui_get_snapshot_link( array(
'id_module' => $row['id_agente_modulo'], 'id_module' => $row['id_agente_modulo'],
'last_data' => $row['datos'], 'last_data' => $row['datos'],
@ -1382,7 +1383,7 @@ if (!empty($result)) {
'module_name' => $row['module_name'] 'module_name' => $row['module_name']
)); ));
if(!is_image_data($row['datos'])){ if($is_large_image){
$salida = '<a href="javascript:' . $link . '">' . $salida = '<a href="javascript:' . $link . '">' .
html_print_image('images/default_list.png', true, html_print_image('images/default_list.png', true,
array('border' => '0', array('border' => '0',