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

New function pandora ux with metaconsole #90

Browse Source
This commit is contained in:
enriquecd 2016-11-04 16:10:46 +01:00
parent 7fc30b3275
commit 74fe9a0228
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,7 @@
<?php <?php
if(check_login()){
//Pandora FMS- http://pandorafms.com //Pandora FMS- http://pandorafms.com
// ================================================== // ==================================================
// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas // Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
@ -292,7 +294,7 @@ if ($get_module_detail) {
$data[] = 'No data'; $data[] = 'No data';
} }
else { else {
$data[] = io_safe_input($row[$attr[0]]); $data[] = "<a target='_blank' href='".io_safe_input($row[$attr[0]])."'><img style='width:300px' src='".io_safe_input($row[$attr[0]])."'></a>";
} }
} }
} }
@ -960,8 +962,8 @@ if ($list_modules) {
"refresh=" . SECONDS_10MINUTES . "&amp;" . "refresh=" . SECONDS_10MINUTES . "&amp;" .
"draw_events=$draw_events', 'day_".$win_handle."')"; "draw_events=$draw_events', 'day_".$win_handle."')";
if(!is_snapshot_data($module['datos'])){ if(!is_snapshot_data($module['datos'])){
$data[8] .= '<a href="javascript:'.$link.'">' . html_print_image("images/chart_curve.png", true, array("border" => '0', "alt" => "")) . '</a> &nbsp;&nbsp;'; $data[8] .= '<a href="javascript:'.$link.'">' . html_print_image("images/chart_curve.png", true, array("border" => '0', "alt" => "")) . '</a> &nbsp;&nbsp;';
} }
$server_name = ''; $server_name = '';
$data[8] .= "<a href='javascript: " . $data[8] .= "<a href='javascript: " .
@ -1063,5 +1065,6 @@ if ($get_type) {
echo $graph_type; echo $graph_type;
return; return;
} }
}
?> ?>

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

@ -1315,11 +1315,16 @@ if (!empty($result)) {
$handle = 'snapshot_' . $row['id_agente_modulo']; $handle = 'snapshot_' . $row['id_agente_modulo'];
$url = 'include/procesos.php?agente=' . $row['id_agente_modulo']; $url = 'include/procesos.php?agente=' . $row['id_agente_modulo'];
$win_handle = dechex(crc32($handle)); $win_handle = dechex(crc32($handle));
if (! defined ('METACONSOLE')) {
$link = "winopeng_var('operation/agentes/snapshot_view.php?" . $link = "winopeng_var('operation/agentes/snapshot_view.php?" .
"id=" . $row['id_agente_modulo'] . "id=" . $row['id_agente_modulo'] .
"&refr=" . $row['current_interval'] . "&refr=" . $row['current_interval'] .
"&label=" . rawurlencode(urlencode(io_safe_output($row['module_name']))) . "','" . $win_handle . "', 700,480)"; "&label=" . rawurlencode(urlencode(io_safe_output($row['module_name']))) . "','" . $win_handle . "', 700,480)";
}
else{
$link = "winopeng_var('$row[datos]','',700,480)";
}
if(!is_snapshot_data($row['datos'])){ if(!is_snapshot_data($row['datos'])){
$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,
@ -1479,27 +1484,24 @@ $('#moduletype').click(function(){
period = <?php echo SECONDS_1DAY; ?>; period = <?php echo SECONDS_1DAY; ?>;
} }
} }
var server_name = '';
var extra_parameters = '';
if ($('input[name=selection_mode]:checked').val()) { if ($('input[name=selection_mode]:checked').val()) {
period = $('#period').val();
var selection_mode = $('input[name=selection_mode]:checked').val(); var selection_mode = $('input[name=selection_mode]:checked').val();
var date_from = $('#text-date_from').val(); var date_from = $('#text-date_from').val();
var time_from = $('#text-time_from').val(); var time_from = $('#text-time_from').val();
var date_to = $('#text-date_to').val(); var date_to = $('#text-date_to').val();
var time_to = $('#text-time_to').val(); var time_to = $('#text-time_to').val();
extra_parameters = '&selection_mode=' + selection_mode + '&date_from=' + date_from + '&date_to=' + date_to + '&time_from=' + time_from + '&time_to=' + time_to; var extra_parameters = '&selection_mode=' + selection_mode + '&date_from=' + date_from + '&date_to=' + date_to + '&time_from=' + time_from + '&time_to=' + time_to;
} }
title = <?php echo "\"" . __("Module: ") . "\"" ?>; title = <?php echo "\"" . __("Module: ") . "\"" ?>;
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>", url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
data: "page=include/ajax/module&get_module_detail=1&server_name="+server_name+"&id_agent="+id_agent+"&id_module=" + module_id+"&offset="+offset+"&period="+period + extra_parameters, data: "page=include/ajax/module&get_module_detail=1&server_name="+server_name+"&id_agent="+id_agent+"&id_module=" + module_id+"&offset="+offset+"&period="+period+extra_parameters,
dataType: "html", dataType: "html",
success: function(data) { success: function(data) {
$("#monitor_details_window").hide () $("#monitor_details_window").hide ()
@ -1540,4 +1542,4 @@ $('#moduletype').click(function(){
return false; return false;
}); });
} }
</script> </script>