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

Some fixes for the new networkmap in the enterprise metaconsole.

This commit is contained in:
mdtrooper 2016-05-05 13:05:35 +02:00
parent 98bf61fd12
commit 8d255dacd8
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,7 @@ if ($edit_networkmap) {
} }
//+++++++++++++++TABLE TO CREATE/EDIT NETWORKMAP++++++++++++++++++++++ //+++++++++++++++TABLE TO CREATE/EDIT NETWORKMAP++++++++++++++++++++++
if (enterprise_installed() && defined('METACONSOLE')) { if (is_metaconsole()) {
$buttons['list'] = array('active' => true, $buttons['list'] = array('active' => true,
'text' => '<a href="index.php?sec=screen&sec2=screens/screens&action=networkmap">' . 'text' => '<a href="index.php?sec=screen&sec2=screens/screens&action=networkmap">' .
html_print_image("images/list.png", true, html_print_image("images/list.png", true,
@ -191,22 +191,32 @@ else {
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">';
} }
$table = null;
$table->id = 'form_editor';
$table->width = '98%';
$table->class = "databox_color"; $table = new stdClass();
$table->id = 'form_editor';
$table->width = '100%';
$table->class = 'databox filters';
$table->head = array(); $table->head = array();
if (is_metaconsole()) {
$table->head[0] = __("Create visual console");
$table->head_colspan[0] = 5;
$table->headstyle[0] = 'text-align: center';
$table->align[0] = 'left';
$table->align[1] = 'left';
}
$table->size = array(); $table->size = array();
$table->size[0] = '30%'; $table->size[0] = '30%';
$table->style = array (); $table->style = array ();
$table->style[0] = 'font-weight: bold; width: 150px;'; $table->style[0] = 'font-weight: bold; width: 150px;';
$table->data = array();
// ----- Main configuration ---------------------------------------- // ----- Main configuration ----------------------------------------
$table->data = array();
$table->data['name'][0] = __('Name'); $table->data['name'][0] = __('Name');
$table->data['name'][1] = html_print_input_text ('name', $name, '', $table->data['name'][1] = html_print_input_text ('name', $name, '',
@ -258,9 +268,11 @@ else {
echo '<fieldset><legend>' . __('Main') . '</legend>'; echo '<fieldset><legend>' . __('Main') . '</legend>';
html_print_table($table); html_print_table($table);
echo '</fieldset>'; echo '</fieldset>';
$table->data = array();
// ----- Source configuration -------------------------------------- // ----- Source configuration --------------------------------------
$table->data = array();
$table->data['source'][0] = __('Source type'); $table->data['source'][0] = __('Source type');
$table->data['source'][1] = $table->data['source'][1] =
@ -278,9 +290,11 @@ else {
echo '<fieldset><legend>' . __('Source') . '</legend>'; echo '<fieldset><legend>' . __('Source') . '</legend>';
html_print_table($table); html_print_table($table);
echo '</fieldset>'; echo '</fieldset>';
$table->data = array();
// ----- Filter configuration -------------------------------------- // ----- Filter configuration --------------------------------------
$table->data = array();
$table->data["filter_by_tag"][0] = __('Filter by tags'); $table->data["filter_by_tag"][0] = __('Filter by tags');
$table->data["filter_by_tag"][1] = html_print_select( $table->data["filter_by_tag"][1] = html_print_select(
@ -290,11 +304,11 @@ else {
$table->data["filter_by_text"][1] = html_print_input_text ('text', $table->data["filter_by_text"][1] = html_print_input_text ('text',
$text, '', 30, 100,true); $text, '', 30, 100,true);
if (is_metaconsole()) { //~ if (is_metaconsole()) {
$table->data[13][0] = __('Show pandora nodes'); //~ $table->data[13][0] = __('Show pandora nodes');
$table->data[13][1] = html_print_checkbox('show_pandora_nodes', '1', //~ $table->data[13][1] = html_print_checkbox('show_pandora_nodes', '1',
$show_pandora_nodes, true); //~ $show_pandora_nodes, true);
} //~ }
$table->data['show_agents'][0] = __('Show agents'); $table->data['show_agents'][0] = __('Show agents');
$table->data['show_agents'][1] = html_print_checkbox( $table->data['show_agents'][1] = html_print_checkbox(
@ -330,6 +344,8 @@ else {
html_print_table($table); html_print_table($table);
echo '</fieldset>'; echo '</fieldset>';
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);

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

@ -47,7 +47,7 @@ if (enterprise_installed()) {
$buttons = array(); $buttons = array();
// Page header for metaconsole // Page header for metaconsole
if (enterprise_installed() && defined('METACONSOLE')) { if (is_metaconsole()) {
$buttons['list'] = array('active' => true, $buttons['list'] = array('active' => true,
'text' => '<a href="index.php?sec=screen&sec2=screens/screens&action=networkmap">' . 'text' => '<a href="index.php?sec=screen&sec2=screens/screens&action=networkmap">' .
html_print_image("images/list.png", true, html_print_image("images/list.png", true,
@ -468,7 +468,7 @@ html_print_button(__('Delete'), 'del', false, 'submit_multiple_delete();', 'clas
echo '</form>'; echo '</form>';
$action_url = 'index.php?sec=maps&amp;sec2=operation/maps/networkmap_editor'; $action_url = 'index.php?sec=maps&amp;sec2=operation/maps/networkmap_editor';
if (enterprise_installed() && defined('METACONSOLE')) { if (is_metaconsole()) {
$action_url = 'index.php?sec=screen&sec2=screens/screens'; $action_url = 'index.php?sec=screen&sec2=screens/screens';
} }