tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

New networkmaps in progress... (Fixed holding area)

Browse Source
This commit is contained in:
Arturo Gonzalez 2016-09-19 17:03:31 +02:00
parent 5adcdd9b5f
commit 038470793d
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/include/functions_pandora_networkmap.php
View File

@ -1018,7 +1018,6 @@ function get_status_color_networkmap($id, $color = true) {
if (!$color) { if (!$color) {
return $status; return $status;
} }
// Set node status // Set node status
switch($status) { switch($status) {
case 0: case 0:
@ -1200,7 +1199,7 @@ function show_node_info($id_node, $refresh_state, $user_readonly) {
$row = db_get_row('titem', 'id', $id_node); $row = db_get_row('titem', 'id', $id_node);
$style = json_decode($row['style'], true); $style = json_decode($row['style'], true);
html_debug($style, true);
if ($row['source_data'] == -2) { if ($row['source_data'] == -2) {
//Show the dialog to edit the fictional point. //Show the dialog to edit the fictional point.
if ($user_readonly) { if ($user_readonly) {
@ -2190,7 +2189,7 @@ function networkmap_get_new_nodes_and_links($id_networkmap) {
$new_agents = array(); $new_agents = array();
} }
} }
else if (!empty($networkmap['source_data'])) { else if (!empty($networkmap['source_data']) && ($networkmap['source_data'] != 0)) {
$agents = networkmap_get_new_nodes_from_ip_mask( $agents = networkmap_get_new_nodes_from_ip_mask(
$networkmap['source_data']); $networkmap['source_data']);
@ -2251,9 +2250,9 @@ function networkmap_get_new_nodes_and_links($id_networkmap) {
WHERE " . $sql_group . " WHERE " . $sql_group . "
AND t1.disabled = 0 AND t1.disabled = 0
AND t1.id_agente NOT IN ( AND t1.id_agente NOT IN (
SELECT id_agent SELECT source_data
FROM titem FROM titem
WHERE id_map = " . $id_networkmap . ") WHERE id_map = " . $id_networkmap . " AND type = 0)
"; ";
$new_agents = db_get_all_rows_sql($sql); $new_agents = db_get_all_rows_sql($sql);

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

@ -122,7 +122,6 @@ if (is_ajax ()) {
$return['correct'] = (bool)db_process_sql_update( $return['correct'] = (bool)db_process_sql_update(
'titem', $node, 'titem', $node,
array('id' => $node_id)); array('id' => $node_id));
echo json_encode($return); echo json_encode($return);
return; return;
@ -837,7 +836,6 @@ if (is_ajax ()) {
if ($update_node_color) { if ($update_node_color) {
$id = (int)get_parameter('id', 0); $id = (int)get_parameter('id', 0);
$id_agent = db_get_value('source_data', $id_agent = db_get_value('source_data',
'titem', 'id', $id); 'titem', 'id', $id);