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

2012-07-24 Dario Rodriguez <dario.rodriguez@artica.es> 

* include/functions_networkmap.php
	operation/agentes/networkmap_list.php: Fixed several problems with
	network maps

	MERGED FROM 4.0.2


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6800 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
darode 2012-07-24 10:09:25 +00:00
parent 79e34957cc
commit 77486d5c64
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2012-07-24 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_networkmap.php
operation/agentes/networkmap_list.php: Fixed several problems with
network maps
MERGED FROM 4.0.2
2012-07-24 Miguel de Dios <miguel.dedios@artica.es>
* godmode/servers/manage_recontask_form.php,

11
pandora_console/include/functions_networkmap.php
View File

@ -90,7 +90,7 @@ function networkmap_generate_dot ($pandora_name, $group = 0, $simple = 0,
foreach ($agents as $agent) {
// Save node parent information to define edges later
if ($agent['id_parent'] != "0") {
if ($agent['id_parent'] != "0" && array_key_exists($agent['id_parent'], $node_ref)) {
$parents[$node_count] = $node_ref[$agent['id_parent']];
}
else {
@ -683,9 +683,14 @@ function networkmap_get_networkmap ($id_networkmap, $filter = false, $fields = f
$filter['id_networkmap'] = $id_networkmap;
if($check_user) {
$filter['id_user'] = $config['id_user'];
}
//If hte user has admin flag don't filter by user
$user_info = users_get_user_by_id($config['id_user']);
if (!$user_info['is_admin']) {
$filter['id_user'] = $config['id_user'];
}
}
$networkmap = db_get_row_filter ('tnetwork_map', $filter, $fields);
return $networkmap;

8
pandora_console/operation/agentes/networkmap_list.php
View File

@ -110,6 +110,14 @@ if ($group_search != '0')
if ($type_search != '0')
$where['type'] = $type_search;
//Check for maps only visible for this user
$user_info = users_get_user_by_id($config['id_user']);
//If the user is not admin only user map are shown.
if (!$user_info['is_admin']) {
$where['id_user'] = $config['id_user'];
}
$network_maps = db_get_all_rows_filter('tnetwork_map',
$where);