tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Working in the fixes for the networkmaps into enterprise metaconsole.

Browse Source
This commit is contained in:
mdtrooper 2016-05-05 15:12:58 +02:00
parent fc7961b0d8
commit 4c2336e7b7
3 changed files with 82 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/include/class/Networkmap.class.php
View File

@ -21,12 +21,6 @@
* @subpackage Networkmap * @subpackage Networkmap
*/ */
require_once ('include/functions_os.php');
require_once ('include/functions_networkmap.php');
enterprise_include("include/functions_networkmap_enterprise.php");
require_once("include/class/Map.class.php");
class Networkmap extends Map { class Networkmap extends Map {
protected $filter = array(); protected $filter = array();
@ -34,6 +28,12 @@ class Networkmap extends Map {
protected $source_ip_mask = ""; protected $source_ip_mask = "";
public function __construct($id) { public function __construct($id) {
global $config;
require_once($config['homedir'] . '/include/functions_os.php');
require_once($config['homedir'] . '/include/functions_networkmap.php');
enterprise_include_once("include/functions_networkmap_enterprise.php");
parent::__construct($id); parent::__construct($id);
$this->requires_js[] = "include/javascript/map/NetworkmapController.js"; $this->requires_js[] = "include/javascript/map/NetworkmapController.js";

94
pandora_console/operation/maps/networkmap.php
View File

@ -38,44 +38,84 @@ if (!$networkmaps_read && !$networkmaps_write && !$networkmaps_manage) {
$id = (int)get_parameter('id', 0); $id = (int)get_parameter('id', 0);
require_once('include/functions_migration.php'); require_once($config['homedir'] . '/include/functions_migration.php');
require_once('include/class/Networkmap.class.php'); require_once($config['homedir'] . '/include/class/Map.class.php');
require_once($config['homedir'] . '/include/class/Networkmap.class.php');
enterprise_include('include/class/NetworkmapEnterprise.class.php'); enterprise_include('include/class/NetworkmapEnterprise.class.php');
//~ require_once('include/browscap/php-local-browscap.php'); //~ require_once('include/browscap/php-local-browscap.php');
if (is_metaconsole()) {
$buttons['list'] = array('active' => false, $buttons['list'] = array('active' => true,
'text' => '<a href="index.php?sec=screen&sec2=screens/screens&action=networkmap">' .
html_print_image("images/list.png", true,
array ('title' => __('List of networkmaps'))) .
'</a>');
$title_header = __('Network map &raquo; %s', Map::getName($id));
$buttons['edit'] = array('active' => true,
'text' => '<a href="index.php?sec=screen&sec2=screens/screens&action=networkmap&edit_networkmap=1&id_networkmap=' . $id . '">' .
html_print_image("images/cog.png", true,
array ('title' => __('Edit networkmap'))) .
'</a>');
if (enterprise_installed()) {
$buttons['deleted'] = array('active' => false,
'text' => '<a href="index.php?sec=screen&sec2=screens/screens&action=networkmap&list_deleted=1&id_networkmap=' . $id . '">' .
html_print_image("images/list.png", true,
array ('title' => __('Deleted list'))) .
'</a>');
}
$buttons['networkmap'] = array('active' => false,
'text' => '<a href="index.php?sec=screen&sec2=screens/screens&action=networkmap&id=' . $id . '">' .
html_print_image("images/op_network.png", true,
array ('title' => __('View networkmap'))) .
'</a>');
// Bread crumbs
ui_meta_add_breadcrumb(
array('link' =>
'index.php?sec=screen&sec2=screens/screens&action=networkmap',
'text' => $title_header));
ui_meta_print_page_header($nav_bar);
//Print header
ui_meta_print_header($title_header, "", $buttons);
}
else {
$buttons['list'] = array('active' => false,
'text' => '<a href="index.php?sec=network&sec2=operation/maps/networkmap_list">' . 'text' => '<a href="index.php?sec=network&sec2=operation/maps/networkmap_list">' .
html_print_image("images/list.png", true, html_print_image("images/list.png", true,
array ('title' => __('List of networkmaps'))) . array ('title' => __('List of networkmaps'))) .
'</a>'); '</a>');
$buttons['edit'] = array('active' => false, $buttons['edit'] = array('active' => false,
'text' => '<a href="index.php?sec=maps&sec2=operation/maps/networkmap_editor&edit_networkmap=1&id_networkmap=' . $id . '">' . 'text' => '<a href="index.php?sec=maps&sec2=operation/maps/networkmap_editor&edit_networkmap=1&id_networkmap=' . $id . '">' .
html_print_image("images/cog.png", true, html_print_image("images/cog.png", true,
array ('title' => __('Edit networkmap'))) . array ('title' => __('Edit networkmap'))) .
'</a>'); '</a>');
if (enterprise_installed()) { if (enterprise_installed()) {
$buttons['deleted'] = array('active' => false, $buttons['deleted'] = array('active' => false,
'text' => '<a href="index.php?sec=maps&sec2=enterprise/operation/maps/networkmap_list_deleted&&id_networkmap=' . $id . '">' . 'text' => '<a href="index.php?sec=maps&sec2=enterprise/operation/maps/networkmap_list_deleted&&id_networkmap=' . $id . '">' .
html_print_image("images/list.png", true, html_print_image("images/list.png", true,
array ('title' => __('Deleted list'))) . array ('title' => __('Deleted list'))) .
'</a>');
}
$buttons['networkmap'] = array('active' => true,
'text' => '<a href="index.php?sec=network&sec2=operation/maps/networkmap&id=' . $id . '">' .
html_print_image("images/op_network.png", true,
array ('title' => __('View networkmap'))) .
'</a>'); '</a>');
ui_print_page_header(
__('Network map &raquo; %s', Map::getName($id)),
"images/op_network.png",
false,
"network_map",
false,
$buttons);
} }
$buttons['networkmap'] = array('active' => true,
'text' => '<a href="index.php?sec=network&sec2=operation/maps/networkmap&id=' . $id . '">' .
html_print_image("images/op_network.png", true,
array ('title' => __('View networkmap'))) .
'</a>');
ui_print_page_header(
__('Network map &raquo; %s', Map::getName($id)),
"images/op_network.png",
false,
"network_map",
false,
$buttons);
if (empty($id)) { if (empty($id)) {
ui_print_error_message(__('Not found networkmap.')); ui_print_error_message(__('Not found networkmap.'));

13
pandora_console/operation/maps/networkmap_list.php
View File

@ -406,12 +406,17 @@ else {
foreach ($networkmaps as $networkmap) { foreach ($networkmaps as $networkmap) {
$data = array(); $data = array();
$data['name'] = $networkmap['name']; $url_networkmap = 'index.php?' .
$data['name'] = '<a href="index.php?' .
'sec=maps&amp;' . 'sec=maps&amp;' .
'sec2=operation/maps/networkmap&' . 'sec2=operation/maps/networkmap&' .
'id=' . $networkmap['id'] .'">' . 'id=' . $networkmap['id'];
if (is_metaconsole()) {
$url_networkmap = 'index.php?' .
'sec=screen&sec2=screens/screens&' .
'action=networkmap&id=' . $networkmap['id'];
}
$data['name'] = '<a href="' . $url_networkmap . '">' .
$networkmap['name'] . '</a>'; $networkmap['name'] . '</a>';
$data['type'] = maps_get_subtype_string($networkmap['subtype']); $data['type'] = maps_get_subtype_string($networkmap['subtype']);