diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index fa05d5d435..974753c5c0 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -1935,27 +1935,41 @@ function events_page_details ($event, $server = "") { } $table_details->data[] = $data; - $data = array(); - $data[0] = '
'.__('Graph').'
'; - $module_module_type = -1; - if (isset($module["module_type"])) { - $module_module_type = $module["module_type"]; + if (check_acl($config['id_user'], $agent['id_grupo'], "RR")) { + $data = array(); + $data[0] = '
'.__('Graph').'
'; + + $module_type = -1; + if (isset($module["module_type"])) { + $module_type = $module["module_type"]; + } + $graph_type = return_graphtype ($module_type); + $url = ui_get_full_url("operation/agentes/stat_win.php", false, false, false); + $handle = dechex(crc32($module["id_agente_modulo"].$module["nombre"])); + $win_handle = "day_$handle"; + + $graph_params = array( + "type" => $graph_type, + "period" => SECONDS_1DAY, + "id" => $module["id_agente_modulo"], + "label" => rawurlencode(urlencode(base64_encode($module["nombre"]))), + "refresh" => SECONDS_10MINUTES + ); + + if (defined('METACONSOLE')) { + // Set the server id + $graph_params["server"] = $server["id"]; + } + + $graph_params_str = http_build_query($graph_params); + + $link = "winopeng('$url?$graph_params_str','$win_handle')"; + + $data[1] = ''; + $data[1] .= html_print_image('images/chart_curve.png',true); + $data[1] .= ''; + $table_details->data[] = $data; } - $graph_type = return_graphtype ($module_module_type); - - $win_handle=dechex(crc32($module["id_agente_modulo"] . - $module["nombre"])); - - $module_module_name = ''; - if (isset($module["module_name"])) { - $module_module_name = $module["module_name"]; - } - $link ="winopeng('" . $serverstring . "operation/agentes/stat_win.php?type=" . $graph_type."&period=86400&id=" . $module["id_agente_modulo"] . "&label=" . rawurlencode(urlencode(base64_encode($module_module_name))) . $hashstring . "&refresh=600','day_".$win_handle."')"; - - $data[1] = ''; - $data[1] .= html_print_image('images/chart_curve.png',true); - $data[1] .= ''; - $table_details->data[] = $data; } $data = array(); diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index 1882a1ab6c..68cb718cc6 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -1183,11 +1183,11 @@ foreach ($result as $row) { $data[7] = ""; - if ($row['history_data'] == 1) { + if ($row['history_data'] == 1 && check_acl($config['id_user'], $row['id_group'], "RR")) { $graph_type = return_graphtype ($row["module_type"]); $nombre_tipo_modulo = modules_get_moduletype_name ($row["module_type"]); - $url = "operation/agentes/stat_win.php"; + $url = ui_get_full_url("operation/agentes/stat_win.php", false, false, false); $handle = dechex(crc32($row["id_agente_modulo"].$row["module_name"])); $win_handle = "day_$handle"; @@ -1200,8 +1200,6 @@ foreach ($result as $row) { ); if (defined('METACONSOLE') && isset($row["server_id"])) { - // Force the search of this url from the pandora_console's root homeurl - $url = "../../$url"; // Set the server id $graph_params["server"] = $row["server_id"]; } diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php index 955d88ee81..2b9e25efb1 100755 --- a/pandora_console/operation/tree.php +++ b/pandora_console/operation/tree.php @@ -384,68 +384,62 @@ if (is_ajax ()) { echo " "; echo str_replace('img', 'img style="vertical-align: middle;"', servers_show_type ($row['id_modulo'])); echo " "; - $graph_type = return_graphtype ($row["id_tipo_modulo"]); - $win_handle=dechex(crc32($row["id_agente_modulo"] . $row["nombre"])); - if (defined ('METACONSOLE')) { - $console_url = $server['server_url'] . '/'; - } - else { - $console_url = ''; - } + $id_group = (int) db_get_value("id_grupo", "tagente", "id_agente", $row["id_agente"]); - - //Icon and link to the Module graph. - if (defined('METACONSOLE')) { - $url_module_graph = ui_meta_get_url_console_child( - $server, null, null, null, null, - "operation/agentes/stat_win.php?" . - "type=$graph_type&" . - "period=86400&" . - "id=" . $row["id_agente_modulo"] . "&" . - "label=" . rawurlencode(urlencode(base64_encode($row["nombre"]))) . "&" . - "refresh=600"); - } - else { - $url_module_graph = $console_url . - "operation/agentes/stat_win.php?" . - "type=$graph_type&" . - "period=86400&" . - "id=" . $row["id_agente_modulo"] . "&" . - "label=" . rawurlencode(urlencode(base64_encode($row["nombre"]))) . "&" . - "refresh=600"; - } - $link ="winopeng('" . $url_module_graph . "','day_".$win_handle."')"; - echo '' . html_print_image ("images/chart_curve.png", true, array ("style" => 'vertical-align: middle;', "border" => "0" )) . ''; - - - echo " "; - - - //Icon and link to the Module data. - if (defined('METACONSOLE')) { + if (check_acl($config['id_user'], $id_group, "RR")) { + $graph_type = return_graphtype ($row["id_tipo_modulo"]); + $url = ui_get_full_url("operation/agentes/stat_win.php", false, false, false); + $handle = dechex(crc32($row["id_agente_modulo"].$row["nombre"])); + $win_handle = "day_$handle"; - $url_module_data = ui_meta_get_url_console_child( - $server, - "estado", "operation/agentes/ver_agente", - "id_agente=" . $row['id_agente'] . "&" . - "tab=data_view&" . - "period=86400&" . - "id=" . $row["id_agente_modulo"]); + $graph_params = array( + "type" => $graph_type, + "period" => SECONDS_1DAY, + "id" => $row["id_agente_modulo"], + "label" => rawurlencode(urlencode(base64_encode($row["nombre"]))), + "refresh" => SECONDS_10MINUTES + ); + + if (defined('METACONSOLE')) { + // Set the server id + $graph_params["server"] = $server["id"]; + } + + $graph_params_str = http_build_query($graph_params); + + $link = "winopeng('$url?$graph_params_str','$win_handle')"; + echo '' . html_print_image ("images/chart_curve.png", true, array ("style" => 'vertical-align: middle;', "border" => "0" )) . ''; + + + echo " "; + + + //Icon and link to the Module data. + if (defined('METACONSOLE')) { + + $url_module_data = ui_meta_get_url_console_child( + $server, + "estado", "operation/agentes/ver_agente", + "id_agente=" . $row['id_agente'] . "&" . + "tab=data_view&" . + "period=86400&" . + "id=" . $row["id_agente_modulo"]); + } + else { + $url_module_data = $console_url . + "index.php?" . + "sec=estado&" . + "sec2=operation/agentes/ver_agente&" . + "id_agente=" . $row['id_agente'] . "&" . + "tab=data_view&" . + "period=86400&" . + "id=" . $row["id_agente_modulo"]; + } + echo "". html_print_image ("images/binary.png", true, array ("style" => 'vertical-align: middle;', "border" => "0" )) . ""; + + echo " "; } - else { - $url_module_data = $console_url . - "index.php?" . - "sec=estado&" . - "sec2=operation/agentes/ver_agente&" . - "id_agente=" . $row['id_agente'] . "&" . - "tab=data_view&" . - "period=86400&" . - "id=" . $row["id_agente_modulo"]; - } - echo "". html_print_image ("images/binary.png", true, array ("style" => 'vertical-align: middle;', "border" => "0" )) . ""; - - echo " "; $nmodule_alerts = db_get_value_sql(sprintf("SELECT count(*) FROM talert_template_modules WHERE id_agent_module = %s", $row["id_agente_modulo"]));