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

2014-06-30 Koichiro KIKUCHI <koichiro@rworks.jp> 

* extensions/agents_modules.php,
	  include/functions_events.php,
	  operation/agentes/estado_monitores.php,
	  operation/agentes/status_monitor.php,
	  operation/search_modules.php,
	  operation/tree.php: Fixed garbled title issue in the module graph.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10309 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
koichirok 2014-06-30 07:54:11 +00:00
parent 7d8bfca646
commit 42712adb41
7 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2014-06-30 Koichiro KIKUCHI <koichiro@rworks.jp>
* extensions/agents_modules.php,
include/functions_events.php,
operation/agentes/estado_monitores.php,
operation/agentes/status_monitor.php,
operation/search_modules.php,
operation/tree.php: Fixed the garbled title issue in the module graph.
2014-06-27 Miguel de Dios <miguel.dedios@artica.es>
* godmode/update_manager/update_manager.online.php: set to 500mb the

2
pandora_console/extensions/agents_modules.php
View File

@ -262,7 +262,7 @@ function mainAgentsModules() {
echo "<td style='text-align: center;'>";
$win_handle = dechex(crc32($module_id.$module["name"]));
$graph_type = return_graphtype (modules_get_agentmodule_type($module_id));
$link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$module_id."&label=".base64_encode($module["name"])."&refresh=600','day_".$win_handle."')";
$link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$module_id."&label=".rawurlencode(urlencode(base64_encode($module["name"])))."&refresh=600','day_".$win_handle."')";
echo '<a href="javascript:'.$link.'">';
switch ($status) {

2
pandora_console/include/functions_events.php
View File

@ -1920,7 +1920,7 @@ function events_page_details ($event, $server = "") {
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=" . base64_encode($module_module_name) . $hashstring . "&refresh=600','day_".$win_handle."')";
$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] = '<a href="javascript:'.$link.'">';
$data[1] .= html_print_image('images/chart_curve.png',true);

4
pandora_console/operation/agentes/estado_monitores.php
View File

@ -572,7 +572,7 @@ foreach ($modules as $module) {
$link ="winopeng_var('operation/agentes/snapshot_view.php?" .
"id=" . $module["id_agente_modulo"] .
"&refr=" . $module["current_interval"] .
"&label=" . $module["nombre"] . "','".$win_handle."', 700,480)";
"&label=" . rawurlencode($module["nombre"]) . "','".$win_handle."', 700,480)";
$salida = '<a href="javascript:'.$link.'">' .
html_print_image("images/default_list.png", true,
@ -633,7 +633,7 @@ foreach ($modules as $module) {
$url = 'include/procesos.php?agente='.$module["id_agente_modulo"];
$win_handle=dechex(crc32($module["id_agente_modulo"].$module["nombre"]));
$link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&amp;period=86400&amp;id=".$module["id_agente_modulo"]."&amp;label=".base64_encode($module["nombre"])."&amp;refresh=600','day_".$win_handle."')";
$link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&amp;period=86400&amp;id=".$module["id_agente_modulo"]."&amp;label=".rawurlencode(urlencode(base64_encode($module["nombre"])))."&amp;refresh=600','day_".$win_handle."')";
$data[8] .= '<a href="javascript:'.$link.'">' . html_print_image("images/chart_curve.png", true, array("border" => '0', "alt" => "")) . '</a> &nbsp;&nbsp;';
$server_name = '';

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

@ -1121,9 +1121,9 @@ foreach ($result as $row) {
$win_handle=dechex(crc32($row["id_agente_modulo"].$row["module_name"]));
if (defined('METACONSOLE'))
$link ="winopeng('" . $row['server_url'] . "operation/agentes/stat_win.php?type=$graph_type&period=86400&loginhash=auto&loginhash_data=" . $row["hashdata"] . "&loginhash_user=" . $row["user"] . "&id=".$row["id_agente_modulo"]."&label=".base64_encode($row["module_name"])."&refresh=600','day_".$win_handle."')";
$link ="winopeng('" . $row['server_url'] . "operation/agentes/stat_win.php?type=$graph_type&period=86400&loginhash=auto&loginhash_data=" . $row["hashdata"] . "&loginhash_user=" . $row["user"] . "&id=".$row["id_agente_modulo"]."&label=".rawurlencode(urlencode(base64_encode($row["module_name"])))."&refresh=600','day_".$win_handle."')";
else
$link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$row["id_agente_modulo"]."&label=".base64_encode($row["module_name"])."&refresh=600','day_".$win_handle."')";
$link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$row["id_agente_modulo"]."&label=".rawurlencode(urlencode(base64_encode($row["module_name"])))."&refresh=600','day_".$win_handle."')";
$data[7] = '<a href="javascript:'.$link.'">' . html_print_image("images/chart_curve.png", true, array("border" => '0', "alt" => "")) . '</a>';
if (defined('METACONSOLE'))

2
pandora_console/operation/search_modules.php
View File

@ -148,7 +148,7 @@ else {
$url = 'include/procesos.php?agente=' . $module["id_agente_modulo"];
$win_handle = dechex(crc32($module["id_agente_modulo"] . $module["module_name"]));
$link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$module["id_agente_modulo"]."&label=".base64_encode($module["module_name"])."&refresh=600','day_".$win_handle."')";
$link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$module["id_agente_modulo"]."&label=".rawurlencode(urlencode(base64_encode($module["module_name"])))."&refresh=600','day_".$win_handle."')";
$graphCell = '<a href="javascript:'.$link.'">' . html_print_image("images/chart_curve.png", true, array("border" => 0, "alt" => "")) . '</a>';
$graphCell .= "&nbsp;<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=".$module["id_agente"]."&amp;tab=data_view&period=86400&amp;id=".$module["id_agente_modulo"]."'>" . html_print_image('images/binary.png', true, array("border" => "0", "alt" => "")) . "</a>";

4
pandora_console/operation/tree.php
View File

@ -396,7 +396,7 @@ if (is_ajax ())
"type=$graph_type&" .
"period=86400&" .
"id=" . $row["id_agente_modulo"] . "&" .
"label=" . base64_encode($row["nombre"]) . "&" .
"label=" . rawurlencode(urlencode(base64_encode($row["nombre"]))) . "&" .
"refresh=600");
}
else {
@ -405,7 +405,7 @@ if (is_ajax ())
"type=$graph_type&" .
"period=86400&" .
"id=" . $row["id_agente_modulo"] . "&" .
"label=" . base64_encode($row["nombre"]) . "&" .
"label=" . rawurlencode(urlencode(base64_encode($row["nombre"]))) . "&" .
"refresh=600";
}
$link ="winopeng('" . $url_module_graph . "','day_".$win_handle."')";