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

New maps in progress... (Creation, edit and list mode)

This commit is contained in:
Arturo Gonzalez 2016-02-02 16:58:39 +01:00
parent 65411abc8f
commit d65ab71600
3 changed files with 59 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pandora_console/include/functions_maps.php
View File

@ -22,7 +22,8 @@
*/ */
function maps_save_map($values) { function maps_save_map($values) {
return db_process_sql_insert('tmap', $values); $result_add = db_process_sql_insert('tmap', $values);
return $result_add;
} }
function maps_get_maps($filter) { function maps_get_maps($filter) {
@ -51,18 +52,19 @@ function maps_get_subtype_string($subtype) {
function maps_duplicate_map($id) { function maps_duplicate_map($id) {
global $config; global $config;
$map = db_get_sql("SELECT * FROM tmap WHERE id = " . $id); $map = db_get_all_rows_sql("SELECT * FROM tmap WHERE id = " . $id);
$result = 0; $result = false;
$map = $map[0];
if (!empty($map)) { if (!empty($map)) {
$map_names = db_get_all_rows_sql("SELECT name FROM tmap WHERE name LIKE '" . $map['name'] . "%'"); $map_names = db_get_row_sql("SELECT name FROM tmap WHERE name LIKE '" . $map['name'] . "%'");
$index = 0; $index = 0;
foreach ($map_names as $map_name) { foreach ($map_names as $map_name) {
$index++; $index++;
} }
$map['name'] = $map['name'] . '_' . $index; $new_name = $map['name'] . '_' . $index;
$result = db_process_sql_insert('tmap', array('id_group' => $map['id_group'], $result = db_process_sql_insert('tmap', array('id_group' => $map['id_group'],
'id_user' => $config['id_user'], 'type' => $map['type'], 'subtype' => $map['subtype'], 'id_user' => $config['id_user'], 'type' => $map['type'], 'subtype' => $map['subtype'],
'name' => $map['name'], 'description' => $map['description'], 'width' => $map['width'], 'name' => $new_name, 'description' => $map['description'], 'width' => $map['width'],
'height' => $map['height'], 'center_x' => $map['center_x'], 'center_y' => $map['center_y'], 'height' => $map['height'], 'center_x' => $map['center_x'], 'center_y' => $map['center_y'],
'background' => $map['background'], 'background_options' => $map['background_options'], 'background' => $map['background'], 'background_options' => $map['background_options'],
'source_period' => $map['source_period'], 'source' => $map['source'], 'source_period' => $map['source_period'], 'source' => $map['source'],
@ -74,7 +76,8 @@ function maps_duplicate_map($id) {
function maps_delete_map($id) { function maps_delete_map($id) {
$where = 'id=' . $id; $where = 'id=' . $id;
db_process_sql_delete('tmap', $where); $result = db_process_sql_delete('tmap', $where);
return (int)$result;
} }
function maps_get_count_nodes($id) { function maps_get_count_nodes($id) {

5
pandora_console/operation/maps/networkmap_editor.php
View File

@ -195,9 +195,10 @@ else {
$table->data[14][1] = html_print_input_text ('text', $text, '', 20, $table->data[14][1] = html_print_input_text ('text', $text, '', 20,
10,true); 10,true);
html_print_table($table);
echo '<form method="post" action="index.php?sec=maps&amp;sec2=operation/maps/networkmap_list">'; echo '<form method="post" action="index.php?sec=maps&amp;sec2=operation/maps/networkmap_list">';
html_print_table($table);
echo "<div style='width: " . $table->width . "; text-align: right;'>"; echo "<div style='width: " . $table->width . "; text-align: right;'>";
if ($create_networkmap) { if ($create_networkmap) {
html_print_input_hidden ('save_networkmap', 1); html_print_input_hidden ('save_networkmap', 1);

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

@ -77,10 +77,10 @@ $save_networkmap = (bool)get_parameter('save_networkmap', 0);
if ($save_networkmap) { if ($save_networkmap) {
$id_group = (int) get_parameter('id_group', 0); $id_group = (int) get_parameter('id_group', 0);
$networkmap_write = check_acl ($config['id_user'], $id_group, "MW"); $networkmap_write = check_acl ($config['id_user'], $id_group, "MW");
$networkmap_manage = check_acl ($config['id_user'], $id_group, "MM"); $networkmap_manage = check_acl ($config['id_user'], $id_group, "MM");
if (!$networkmap_write && !$networkmap_manage) { if (!$networkmap_write && !$networkmap_manage) {
db_pandora_audit("ACL Violation", db_pandora_audit("ACL Violation",
"Trying to access networkmap enterprise"); "Trying to access networkmap enterprise");
@ -105,9 +105,10 @@ if ($save_networkmap) {
$show_module_group = get_parameter('show_module_group', false); $show_module_group = get_parameter('show_module_group', false);
$id_tag = get_parameter('id_tag', 0); $id_tag = get_parameter('id_tag', 0);
$text = get_parameter('text', ""); $text = get_parameter('text', "");
$values = array(); $values = array();
$values['name'] = $name; $values['name'] = $name;
$values['id_user'] = $config['id_user'];
$values['id_group'] = $id_group; $values['id_group'] = $id_group;
$values['subtype'] = $subtype; $values['subtype'] = $subtype;
$values['type'] = $$type; $values['type'] = $$type;
@ -115,7 +116,7 @@ if ($save_networkmap) {
$values['source_period'] = $source_period; $values['source_period'] = $source_period;
$values['source_data'] = $source_data; $values['source_data'] = $source_data;
$values['generation_method'] = $generation_method; $values['generation_method'] = $generation_method;
$filter = array(); $filter = array();
$filter['show_groups_filter'] = 60; $filter['show_groups_filter'] = 60;
$filter['show_module_plugins'] = $show_module_plugins; $filter['show_module_plugins'] = $show_module_plugins;
@ -127,9 +128,14 @@ if ($save_networkmap) {
$filter['id_tag'] = $id_tag; $filter['id_tag'] = $id_tag;
$filter['text'] = $text; $filter['text'] = $text;
$values['filter'] = json_encode($filter); $values['filter'] = json_encode($filter);
$networkmap_names = db_get_all_rows_sql("SELECT name FROM tmap");
$result_add = false; foreach ($networkmap_names as $networkmap_name) {
if (!empty($name)) { if ($networkmap_name == $name) {
$same_name = true;
}
}
html_debug($values);
if (!empty($name) && !$same_name) {
$result_add = maps_save_map($values); $result_add = maps_save_map($values);
} }
@ -139,14 +145,14 @@ if ($save_networkmap) {
} }
else if ($delete_networkmap || $duplicate_networkmap || $update_networkmap) { else if ($delete_networkmap || $duplicate_networkmap || $update_networkmap) {
$id = (int)get_parameter('id_networkmap', 0); $id = (int)get_parameter('id_networkmap', 0);
if (empty($id)) { if (empty($id)) {
db_pandora_audit("ACL Violation", db_pandora_audit("ACL Violation",
"Trying to access networkmap enterprise"); "Trying to access networkmap enterprise");
require ("general/noaccess.php"); require ("general/noaccess.php");
return; return;
} }
$id_group_old = db_get_value('id_group', 'tmap', 'id', $id); $id_group_old = db_get_value('id_group', 'tmap', 'id', $id);
if ($id_group_old === false) { if ($id_group_old === false) {
db_pandora_audit("ACL Violation", db_pandora_audit("ACL Violation",
@ -154,20 +160,20 @@ else if ($delete_networkmap || $duplicate_networkmap || $update_networkmap) {
require ("general/noaccess.php"); require ("general/noaccess.php");
return; return;
} }
$networkmap_write_old_group = check_acl ($config['id_user'], $id_group_old, "MW"); $networkmap_write_old_group = check_acl ($config['id_user'], $id_group_old, "MW");
$networkmap_manage_old_group = check_acl ($config['id_user'], $id_group_old, "MM"); $networkmap_manage_old_group = check_acl ($config['id_user'], $id_group_old, "MM");
if (!$networkmap_write_old_group && !$networkmap_manage_old_group) { if (!$networkmap_write_old_group && !$networkmap_manage_old_group) {
db_pandora_audit("ACL Violation", db_pandora_audit("ACL Violation",
"Trying to access networkmap"); "Trying to access networkmap");
require ("general/noaccess.php"); require ("general/noaccess.php");
return; return;
} }
if ($delete_networkmap) { if ($delete_networkmap) {
$result_delete = maps_delete_map($id); $result_delete = maps_delete_map($id);
if (!$result_delete) { if (!$result_delete) {
db_pandora_audit( "Networkmap management", db_pandora_audit( "Networkmap management",
"Fail try to delete networkmap #$id"); "Fail try to delete networkmap #$id");
@ -176,20 +182,20 @@ else if ($delete_networkmap || $duplicate_networkmap || $update_networkmap) {
db_pandora_audit( "Networkmap management", db_pandora_audit( "Networkmap management",
"Delete networkmap #$id"); "Delete networkmap #$id");
} }
ui_print_result_message ($result_delete, ui_print_result_message ($result_delete,
__('Successfully deleted'), __('Successfully deleted'),
__('Could not be deleted')); __('Could not be deleted'));
} }
else if ($duplicate_networkmap) { else if ($duplicate_networkmap) {
$result_duplicate = maps_duplicate_map($id); $result_duplicate = maps_duplicate_map($id);
ui_print_result_message ($result, ui_print_result_message ($result_duplicate,
__('Successfully duplicate'), __('Successfully duplicate'),
__('Could not be duplicate')); __('Could not be duplicate'));
} }
else if ($update_networkmap) { else if ($update_networkmap) {
$name = (string) get_parameter('name', ""); $name = (string) get_parameter('name', "");
$description = (string) get_parameter('description', ""); $description = (string) get_parameter('description', "");
@ -205,14 +211,14 @@ else if ($delete_networkmap || $duplicate_networkmap || $update_networkmap) {
$show_module_group = get_parameter('show_module_group', false); $show_module_group = get_parameter('show_module_group', false);
$id_tag = get_parameter('id_tag', 0); $id_tag = get_parameter('id_tag', 0);
$text = get_parameter('text', ""); $text = get_parameter('text', "");
$values = array(); $values = array();
$values['name'] = $name; $values['name'] = $name;
$values['id_group'] = $id_group; $values['id_group'] = $id_group;
$values['description'] = $description; $values['description'] = $description;
$values['source_period'] = $source_period; $values['source_period'] = $source_period;
$values['source_data'] = $source_data; $values['source_data'] = $source_data;
$filter = array(); $filter = array();
$filter['show_groups_filter'] = 60; $filter['show_groups_filter'] = 60;
$filter['show_module_plugins'] = $show_module_plugins; $filter['show_module_plugins'] = $show_module_plugins;
@ -224,12 +230,12 @@ else if ($delete_networkmap || $duplicate_networkmap || $update_networkmap) {
$filter['id_tag'] = $id_tag; $filter['id_tag'] = $id_tag;
$filter['text'] = $text; $filter['text'] = $text;
$values['filter'] = json_encode($filter); $values['filter'] = json_encode($filter);
$result_add = false; $result_add = false;
if (!empty($name)) { if (!empty($name)) {
$result_add = maps_update_map($id, $values); $result_add = maps_update_map($id, $values);
} }
ui_print_result_message ($result_add, ui_print_result_message ($result_add,
__('Successfully updated'), __('Successfully updated'),
__('Could not be updated')); __('Could not be updated'));
@ -240,37 +246,22 @@ else if ($delete_networkmap || $duplicate_networkmap || $update_networkmap) {
$table = new stdClass(); $table = new stdClass();
$table->width = "100%"; $table->width = "100%";
$table->class = "databox data"; $table->class = "databox data";
$table->headstyle['name'] = 'text-align: center;';
$table->headstyle['type'] = 'text-align: center;';
if (enterprise_installed()) {
$table->headstyle['nodes'] = 'text-align: center;';
}
$table->headstyle['group'] = 'text-align: center;';
$table->headstyle['copy'] = 'text-align: center;';
$table->headstyle['edit'] = 'text-align: center;';
$table->headstyle['delete'] = 'text-align: center;';
$table->style = array(); $table->style = array();
$table->style['name'] = 'text-align: left;'; $table->style['name'] = 'text-align: left;';
$table->style['type'] = 'text-align: center;'; $table->style['type'] = 'text-align: left;';
if (enterprise_installed()) { if (enterprise_installed()) {
$table->style['nodes'] = 'text-align: center;'; $table->style['nodes'] = 'text-align: left;';
} }
$table->style['group'] = 'text-align: center;'; $table->style['group'] = 'text-align: center;';
$table->style['copy'] = 'text-align: center;'; $table->style['copy'] = 'text-align: left;';
$table->style['edit'] = 'text-align: center;'; $table->style['edit'] = 'text-align: left;';
$table->style['delete'] = 'text-align: center;'; $table->style['delete'] = 'text-align: left;';
$table->size = array(); $table->size = array();
$table->size['name'] = '60%'; $table->size[0] = '60%';
$table->size['type'] = '30px'; $table->size[1] = '60px';
if (enterprise_installed()) { $table->size[2] = '70px';
$table->size['nodes'] = '30px';
}
$table->size['group'] = '30px';
$table->size['copy'] = '30px';
$table->size['edit'] = '30px';
$table->size['delete'] = '30px';
$table->head = array(); $table->head = array();
$table->head['name'] = __('Name'); $table->head['name'] = __('Name');
@ -293,18 +284,18 @@ if (empty($networkmaps)) {
else { else {
foreach ($networkmaps as $networkmap) { foreach ($networkmaps as $networkmap) {
$data = array(); $data = array();
$data['name'] = $networkmap['name']; $data['name'] = $networkmap['name'];
$data['name'] = '<a href="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'] .'">' .
$networkmap['name'] . '</a>'; $networkmap['name'] . '</a>';
$data['type'] = maps_get_subtype_string($networkmap['subtype']); $data['type'] = maps_get_subtype_string($networkmap['subtype']);
if (enterprise_installed()) { if (enterprise_installed()) {
if ($networkmap['generated']) { if ($networkmap['generated']) {
$data['nodes'] = maps_get_count_nodes($networkmap['id']); $data['nodes'] = maps_get_count_nodes($networkmap['id']);
@ -313,7 +304,7 @@ else {
$data['nodes'] = __('Pending to generate'); $data['nodes'] = __('Pending to generate');
} }
} }
if (!empty($networkmap['id_user'])) { if (!empty($networkmap['id_user'])) {
$data['group'] = __('Private for (%s)', $networkmap['id_user']); $data['group'] = __('Private for (%s)', $networkmap['id_user']);
} }
@ -321,26 +312,26 @@ else {
$data['groups'] = $data['groups'] =
ui_print_group_icon($networkmap['id_group'], true); ui_print_group_icon($networkmap['id_group'], true);
} }
$data['copy'] = '<a href="index.php?' . $data['copy'] = '<a href="index.php?' .
'sec=maps&amp;' . 'sec=maps&amp;' .
'sec2=operation/maps/networkmap_list&' . 'sec2=operation/maps/networkmap_list&' .
'duplicate_networkmap=1&id_networkmap=' . $networkmap['id'] . '" alt="' . __('Copy') . '">' . 'duplicate_networkmap=1&id_networkmap=' . $networkmap['id'] . '" alt="' . __('Copy') . '">' .
html_print_image("images/copy.png", true) . '</a>'; html_print_image("images/copy.png", true) . '</a>';
$data['edit'] = '<a href="index.php?' . $data['edit'] = '<a href="index.php?' .
'sec=maps&amp;' . 'sec=maps&amp;' .
'sec2=operation/maps/networkmap_editor&' . 'sec2=operation/maps/networkmap_editor&' .
'edit_networkmap=1&id_networkmap=' . $networkmap['id'] .'">' . 'edit_networkmap=1&id_networkmap=' . $networkmap['id'] .'">' .
html_print_image("images/edit.png", true) . '</a>'; html_print_image("images/edit.png", true) . '</a>';
$data['delete'] = '<a href="index.php?' . $data['delete'] = '<a href="index.php?' .
'sec=maps&amp;' . 'sec=maps&amp;' .
'sec2=operation/maps/networkmap_list&' . 'sec2=operation/maps/networkmap_list&' .
'delete_networkmap=1&id_networkmap=' . $networkmap['id'] . '" alt="' . __('Delete') . 'delete_networkmap=1&id_networkmap=' . $networkmap['id'] . '" alt="' . __('Delete') .
'" onclick="javascript: if (!confirm(\'' . __('Are you sure?') . '\')) return false;">' . '" onclick="javascript: if (!confirm(\'' . __('Are you sure?') . '\')) return false;">' .
html_print_image('images/cross.png', true) . '</a>'; html_print_image('images/cross.png', true) . '</a>';
$table->data[] = $data; $table->data[] = $data;
} }
html_print_table($table); html_print_table($table);