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

Cleanup Networkmaps 

Former-commit-id: 68893c73092e80bf4a67a0aa82c51ec242aab01f
This commit is contained in:
fbsanchez 2019-03-13 11:38:03 +01:00
parent 750c64fbd7
commit 95c61024f7
7 changed files with 1381 additions and 2640 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/include/class/NetworkMap.class.php
View File

@ -30,9 +30,7 @@
global $config; global $config;
require_once $config['homedir'].'/include/functions_networkmap.php'; require_once $config['homedir'].'/include/functions_networkmap.php';
require_once $config['homedir'].'/include/functions_pandora_networkmap.php'; enterprise_include_once('include/functions_networkmap.php');
enterprise_include_once('include/functions_pandora_networkmap.php');
define('SOURCE_GROUP', 0); define('SOURCE_GROUP', 0);
define('SOURCE_TASK', 1); define('SOURCE_TASK', 1);
@ -653,7 +651,6 @@ class NetworkMap
ui_print_error_message( ui_print_error_message(
__('Failed to generate dotmap, please select different layout schema') __('Failed to generate dotmap, please select different layout schema')
); );
$this->graph = networkmap_process_networkmap($this->idMap);
return; return;
} }

2
pandora_console/include/functions_agents.php
View File

@ -2202,7 +2202,7 @@ function agents_delete_agent($id_agents, $disableACL=false)
// Delete agent in networkmap enterprise // Delete agent in networkmap enterprise
if (enterprise_installed()) { if (enterprise_installed()) {
enterprise_include_once('include/functions_pandora_networkmap.php'); enterprise_include_once('include/functions_networkmap.php');
networkmap_delete_nodes_by_agent([$id_agent]); networkmap_delete_nodes_by_agent([$id_agent]);
} }

1718
pandora_console/include/functions_networkmap.php
View File

File diff suppressed because it is too large Load Diff

42
pandora_console/include/functions_networkmaps.php
View File

@ -1,17 +1,29 @@
<?php <?php
; /**
// Pandora FMS - http://pandorafms.com * Library for networkmaps in Pandora FMS
// ================================================== *
// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas * @category Deprecated
// Please see http://pandorafms.org for full contribution list * @package Pandora FMS
// This program is free software; you can redistribute it and/or * @subpackage NetworkMap
// modify it under the terms of the GNU Lesser General Public License * @version 1.0.0
// as published by the Free Software Foundation; version 2 * @license See below
// This program is distributed in the hope that it will be useful, *
// but WITHOUT ANY WARRANTY; without even the implied warranty of * ______ ___ _______ _______ ________
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
// GNU General Public License for more details. * | __/| _ | | _ || _ | _| _ | | ___| |__ |
/* * |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
* @package Include *
* @subpackage Networkmaps * ============================================================================
* Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/ */
// Deprecated.

2244
pandora_console/include/functions_pandora_networkmap.php
View File

File diff suppressed because it is too large Load Diff

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

@ -30,7 +30,6 @@ if (!$networkmaps_read && !$networkmaps_write && !$networkmaps_manage) {
} }
require_once 'include/functions_networkmap.php'; require_once 'include/functions_networkmap.php';
require_once 'include/functions_pandora_networkmap.php';
$new_networkmap = (bool) get_parameter('new_networkmap', false); $new_networkmap = (bool) get_parameter('new_networkmap', false);
$save_networkmap = (bool) get_parameter('save_networkmap', false); $save_networkmap = (bool) get_parameter('save_networkmap', false);

9
pandora_console/operation/agentes/pandora_networkmap.view.php
View File

@ -29,7 +29,7 @@
global $config; global $config;
require_once 'include/functions_pandora_networkmap.php'; require_once 'include/functions_networkmap.php';
enterprise_include_once('include/functions_policies.php'); enterprise_include_once('include/functions_policies.php');
enterprise_include_once('include/functions_dashboard.php'); enterprise_include_once('include/functions_dashboard.php');
require_once 'include/functions_modules.php'; require_once 'include/functions_modules.php';
@ -866,13 +866,6 @@ if ($networkmap === false) {
); );
} }
/*
$nodes_and_relations = networkmap_process_networkmap($id);
show_networkmap($id, $user_readonly, $nodes_and_relations, $dash_mode, $map_dash_details);
*/
include_once $config['homedir'].'/include/class/NetworkMap.class.php'; include_once $config['homedir'].'/include/class/NetworkMap.class.php';
$map_manager = new NetworkMap( $map_manager = new NetworkMap(