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

Merge branch 'ent-3050-fallo-php-7-en-networks-maps' into 'develop' 

Fixed php errors on radial networkmap

See merge request artica/pandorafms!1960
This commit is contained in:
vgilc 2018-11-12 16:49:58 +01:00
parent 6d0d7fd410 a201262737
commit 9d896de41a
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_graph.php
View File

@ -4387,7 +4387,7 @@ function graph_monitor_wheel ($width = 550, $height = 600, $filter = false) {
$data_agents[$agent_id]['children'][$module_group_id]['children'][] = $data_module; $data_agents[$agent_id]['children'][$module_group_id]['children'][] = $data_module;
unset($modules[$module_id]); unset($modules[$module_id]);
} }
function order_module_group_keys ($value, $key) { function order_module_group_keys ($value) {
$value['children'] = array_merge($value['children']); $value['children'] = array_merge($value['children']);
return $value; return $value;
} }

4
pandora_console/include/functions_groups.php
View File

@ -1701,7 +1701,7 @@ function groups_get_tree_good (&$groups, $parent = false, &$childs) {
if ($parent === false && (!isset($group['parent']) || $group['parent'] == 0 || !in_array($group['parent'], $groups))) { if ($parent === false && (!isset($group['parent']) || $group['parent'] == 0 || !in_array($group['parent'], $groups))) {
$return[$id] = $group; $return[$id] = $group;
//unset($groups[$id]); //unset($groups[$id]);
$children = groups_get_tree_good($groups, $id); $children = groups_get_tree_good($groups, $id, $noUse);
if (!empty($children)) { if (!empty($children)) {
$return[$id]['children'] = $children; $return[$id]['children'] = $children;
@ -1713,7 +1713,7 @@ function groups_get_tree_good (&$groups, $parent = false, &$childs) {
else if ($parent && isset($group['parent']) && $group['parent'] == $parent) { else if ($parent && isset($group['parent']) && $group['parent'] == $parent) {
$return[$id] = $group; $return[$id] = $group;
//unset($groups[$id]); //unset($groups[$id]);
$children = groups_get_tree_good($groups, $id); $children = groups_get_tree_good($groups, $id, $noUse);
if (!empty($children)) { if (!empty($children)) {
$return[$id]['children'] = $children; $return[$id]['children'] = $children;

6
pandora_console/operation/agentes/networkmap.dinamic.php
View File

@ -18,10 +18,11 @@
global $config; global $config;
check_login (); check_login ();
if (_id_ != "_id_") { if (defined('_id_') && _id_ != "_id_") {
$id = _id_; $id = _id_;
} }
else { else {
define("_id_", "_id_");
$id = get_parameter('id_networkmap', true); $id = get_parameter('id_networkmap', true);
} }
@ -36,8 +37,7 @@ if (enterprise_installed()) {
$activeTab = $tab; $activeTab = $tab;
} }
} }
if (defined("_activeTab_") && _activeTab_ != "_activeTab_") {
if (_activeTab_ != "_activeTab_") {
$activeTab = _activeTab_; $activeTab = _activeTab_;
$tab = $activeTab; $tab = $activeTab;
} }

1
pandora_console/operation/agentes/pandora_networkmap.php
View File

@ -445,6 +445,7 @@ switch ($tab) {
if (enterprise_installed()) { if (enterprise_installed()) {
$old_networkmaps_enterprise = db_get_all_rows_sql("SELECT * FROM tnetworkmap_enterprise"); $old_networkmaps_enterprise = db_get_all_rows_sql("SELECT * FROM tnetworkmap_enterprise");
if ($old_networkmaps_enterprise === false) $old_networkmaps_enterprise = array();
} }
$old_networkmaps_open = db_get_all_rows_sql("SELECT * FROM tnetwork_map"); $old_networkmaps_open = db_get_all_rows_sql("SELECT * FROM tnetwork_map");