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

2012-05-03 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/reporting/visual_console_builder.php: refixed the add the
	items with modules with entities.
	
	* include/functions_reporting.php, include/functions_networkmap.php,
	include/functions_visual_map.php: cleaned source code style.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6238 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-05-03 09:35:30 +00:00
parent c80c10d0b5
commit fc87947dd9
4 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2012-05-03 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.php: refixed the add the
items with modules with entities.
* include/functions_reporting.php, include/functions_networkmap.php,
include/functions_visual_map.php: cleaned source code style.
MERGED FROM 4.0.2
2012-04-30 Sancho Lerena <slerena@artica.es> 2012-04-30 Sancho Lerena <slerena@artica.es>
All changes (except a small patch on function_groups) are All changes (except a small patch on function_groups) are

7
pandora_console/godmode/reporting/visual_console_builder.php
View File

@ -212,13 +212,18 @@ switch ($activeTab) {
foreach ($id_agents as $ag) { foreach ($id_agents as $ag) {
$id_module = agents_get_modules($ag, $id_module = agents_get_modules($ag,
array('id_agente_modulo'), array('id_agente_modulo'),
array('nombre' => io_safe_input($mod))); array('nombre' => $mod));
if (empty($id_module)) if (empty($id_module))
continue; continue;
else {
$id_module = reset($id_module);
$id_module = $id_module['id_agente_modulo'];
}
$id_modules[] = $id_module; $id_modules[] = $id_module;
} }
} }
$message .= visual_map_process_wizard_add_modules($id_modules, $message .= visual_map_process_wizard_add_modules($id_modules,
$image, $idVisualConsole, $range, $width, $height, $image, $idVisualConsole, $range, $width, $height,
$period, $process_value, $percentileitem_width, $period, $process_value, $percentileitem_width,

3
pandora_console/include/functions_networkmap.php
View File

@ -153,7 +153,8 @@ function networkmap_generate_dot ($pandora_name, $group = 0, $simple = 0, $font_
// Verify that the parent is in the graph // Verify that the parent is in the graph
if (isset ($nodes[$parent_id])) { if (isset ($nodes[$parent_id])) {
$graph .= networkmap_create_edge ($node, $parent_id, $layout, $nooverlap, $pure, $zoom, $ranksep, $simple, $regen, $font_size, $group, 'operation/agentes/networkmap', 'topology', $id_networkmap); $graph .= networkmap_create_edge ($node, $parent_id, $layout, $nooverlap, $pure, $zoom, $ranksep, $simple, $regen, $font_size, $group, 'operation/agentes/networkmap', 'topology', $id_networkmap);
} else { }
else {
$orphans[$node] = 1; $orphans[$node] = 1;
} }
} }

12
pandora_console/include/functions_visual_map.php
View File

@ -1268,7 +1268,8 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
else { else {
echo '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$layout_data["id_agent"].'&amp;tab=data">'; echo '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$layout_data["id_agent"].'&amp;tab=data">';
} }
} else { }
else {
echo '<a href="index.php?sec=visualc&amp;sec2=operation/visual_console/render_view&amp;pure='.$config["pure"].'&amp;id='.$layout_data['id_layout_linked'].'">'; echo '<a href="index.php?sec=visualc&amp;sec2=operation/visual_console/render_view&amp;pure='.$config["pure"].'&amp;id='.$layout_data['id_layout_linked'].'">';
} }
} }
@ -1411,7 +1412,7 @@ function visual_map_get_layout_status ($id_layout = 0, $depth = 0) {
$depth++; // For recursion depth checking $depth++; // For recursion depth checking
// TODO: Implement this limit as a configurable item in setup // TODO: Implement this limit as a configurable item in setup
if ($depth > 10){ if ($depth > 10) {
return 3; // No status data if we need to exit by a excesive recursion return 3; // No status data if we need to exit by a excesive recursion
} }
@ -1428,11 +1429,14 @@ function visual_map_get_layout_status ($id_layout = 0, $depth = 0) {
// Other Layout (Recursive!) // Other Layout (Recursive!)
if (($data["id_layout_linked"] != 0) && ($data["id_agente_modulo"] == 0)) { if (($data["id_layout_linked"] != 0) && ($data["id_agente_modulo"] == 0)) {
$status = visual_map_get_layout_status ($data["id_layout_linked"], $depth); $status = visual_map_get_layout_status ($data["id_layout_linked"], $depth);
}
// Module // Module
} elseif ($data["id_agente_modulo"] != 0) { elseif ($data["id_agente_modulo"] != 0) {
$status = modules_get_agentmodule_status ($data["id_agente_modulo"]); $status = modules_get_agentmodule_status ($data["id_agente_modulo"]);
}
// Agent // Agent
} else { else {
$status = agents_get_status ($data["id_agent"]); $status = agents_get_status ($data["id_agent"]);
} }
if ($status == 1) if ($status == 1)