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

Working in the actual filters with the old generation method.

This commit is contained in:
mdtrooper 2016-02-12 16:28:07 +01:00
parent f3a161743d
commit 37b0e972b3
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,12 +28,10 @@ enterprise_include("include/functions_networkmap_enterprise.php");
require_once("include/class/Map.class.php"); require_once("include/class/Map.class.php");
class Networkmap extends Map { class Networkmap extends Map {
protected $show_snmp_modules = false; protected $filter = array();
protected $source_group = 0; protected $source_group = 0;
protected $source_ip_mask = ""; protected $source_ip_mask = "";
protected $show_groups = false;
protected $show_module_groups = false;
protected $filter_text = "";
public function __construct($id) { public function __construct($id) {
parent::__construct($id); parent::__construct($id);
@ -44,8 +42,7 @@ class Networkmap extends Map {
public function processDBValues($dbValues) { public function processDBValues($dbValues) {
$filter = json_decode($dbValues['filter'], true); $filter = json_decode($dbValues['filter'], true);
$this->show_snmp_modules = $filter['show_snmp_modules']; $this->filter = $filter;
$this->filter_text = $filter["text"];
switch ($dbValues['source_data']) { switch ($dbValues['source_data']) {
case MAP_SOURCE_GROUP: case MAP_SOURCE_GROUP:
@ -79,12 +76,12 @@ class Networkmap extends Map {
$return['regen'] = 0; // HARD CODED $return['regen'] = 0; // HARD CODED
$return['pure'] = 0; // HARD CODED $return['pure'] = 0; // HARD CODED
$return['id'] = $this->id; $return['id'] = $this->id;
$return['show_snmp_modules'] = $this->show_snmp_modules; $return['show_snmp_modules'] = $this->filter['only_snmp_modules'];
$return['l2_network_interfaces'] = true; // HARD CODED $return['l2_network_interfaces'] = true; // HARD CODED
$return['ip_mask'] = $this->source_ip_mask; $return['ip_mask'] = $this->source_ip_mask;
$return['dont_show_subgroups'] = !$this->show_groups; $return['dont_show_subgroups'] = false;
$return['old_mode'] = false; $return['old_mode'] = false;
$return['filter'] = $this->filter_text; $return['filter'] = $this->filter['text'];
return $return; return $return;
} }