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

fixed errors in visual console

Browse Source
This commit is contained in:
daniel 2017-10-24 17:03:35 +02:00
parent 1dd8f630f8
commit b23b9448b6
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/users/configure_user.php
View File

@ -565,7 +565,7 @@ $values = array (
'Tactical view'=>__('Tactical view'), 'Tactical view'=>__('Tactical view'),
'Alert detail' => __('Alert detail'), 'Alert detail' => __('Alert detail'),
'Other'=>__('Other')); 'Other'=>__('Other'));
if (enterprise_installed()) { if (enterprise_installed() && !is_metaconsole()) {
$values['Dashboard'] = __('Dashboard'); $values['Dashboard'] = __('Dashboard');
} }
$table->data[12][1] = html_print_select($values, 'section', io_safe_output($user_info["section"]), 'show_data_section();', '', -1, true, false, false); $table->data[12][1] = html_print_select($values, 'section', io_safe_output($user_info["section"]), 'show_data_section();', '', -1, true, false, false);

18
pandora_console/include/functions_visual_map.php
View File

@ -1175,7 +1175,16 @@ function visual_map_print_item($mode = "read", $layoutData,
if ($link) { if ($link) {
echo "<a href=\"$url\">"; echo "<a href=\"$url\">";
} }
//for clean link text from bbdd
if (get_parameter('action') == 'edit' || get_parameter('operation') == 'edit_visualmap') {
$aux_text1 = explode("<a ", $text);
$aux_text2 = explode("\">", $aux_text1[1]);
$aux_text3 = explode("</a>", $aux_text2[1]);
$text = $aux_text1[0].$aux_text3[0].$aux_text3[1];
}
switch ($type) { switch ($type) {
case BOX_ITEM: case BOX_ITEM:
if ($width == 0 || $width == 0) { if ($width == 0 || $width == 0) {
@ -1650,13 +1659,6 @@ function visual_map_print_item($mode = "read", $layoutData,
} }
break; break;
case LABEL: case LABEL:
if (get_parameter('action') == 'edit' || get_parameter('operation') == 'edit_visualmap') {
$aux_text1 = explode("<a href=\"", $text);
$aux_text2 = explode("\">", $aux_text1[1]);
$aux_text3 = explode("</a>", $aux_text2[1]);
$text = $aux_text1[0].$aux_text3[0].$aux_text3[1];
}
echo io_safe_output($text); echo io_safe_output($text);
break; break;
case ICON: case ICON:

2
pandora_console/include/functions_visual_map_editor.php
View File

@ -556,7 +556,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
'</td>'; '</td>';
$form_items_advance['map_linked_row'] = array(); $form_items_advance['map_linked_row'] = array();
$form_items_advance['map_linked_row']['items'] = array('static_graph', 'label'); $form_items_advance['map_linked_row']['items'] = array('static_graph', 'label', 'icon');
$form_items_advance['map_linked_row']['html'] = '<td align="left">'. $form_items_advance['map_linked_row']['html'] = '<td align="left">'.
__('Map linked') . ui_print_help_tip ( __('Map linked') . ui_print_help_tip (
__("If a parent visual console is selected here, an agent or module cannot be selected and will be removed if a previous selection was done."), true) . __("If a parent visual console is selected here, an agent or module cannot be selected and will be removed if a previous selection was done."), true) .