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

Merge branch 'ent-11158-15531-netflow-filters-al-dar-nombre-con-simbolos-espacio-al-filtro-crea-agentes-masivamente' into 'develop' 

Ent 11158 15531 netflow filters al dar nombre con simbolos espacio al filtro crea agentes masivamente

See merge request artica/pandorafms!5873
This commit is contained in:
Daniel Rodriguez 2023-05-16 09:32:41 +00:00
parent 391bb0d3e3 f3b7a4aa09
commit 64d25816d6
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/godmode/agentes/modificar_agente.php
View File

@ -765,7 +765,9 @@ if ($agents !== false) {
}
if (empty($agent['alias']) === true) {
$agent['alias'] = $agent['nombre'];
$agent['alias'] = io_safe_output($agent['nombre']);
} else {
$agent['alias'] = io_safe_output($agent['alias']);
}
$additionalDataAgentName = [];

4
pandora_console/godmode/netflow/nf_edit_form.php
View File

@ -74,8 +74,8 @@ if ($id) {
// Header Buttons.
$buttons = [];
$buttons[] = ['text' => '<a href="index.php?sec=netf&sec2=godmode/netflow/nf_edit">'.html_print_image('images/logs@svg.svg', true, ['title' => __('Filter list')]).'</a>'];
$buttons[] = ['text' => '<a href="index.php?sec=netf&sec2=godmode/netflow/nf_edit_form">'.html_print_image('images/plus@svg.svg', true, ['title' => __('Add filter')]).'</a>'];
$buttons[] = ['text' => '<a href="index.php?sec=netf&sec2=godmode/netflow/nf_edit">'.html_print_image('images/logs@svg.svg', true, ['title' => __('Filter list'), 'main_menu_icon' => true]).'</a>'];
$buttons[] = ['text' => '<a href="index.php?sec=netf&sec2=godmode/netflow/nf_edit_form">'.html_print_image('images/plus@svg.svg', true, ['title' => __('Add filter'), 'main_menu_icon' => true]).'</a>'];
// Header Caption.
$headerTitle = ($id) ? __('Update filter') : __('Create filter');

8
pandora_console/include/functions_html.php
View File

@ -4622,6 +4622,14 @@ function html_print_image(
$output .= 'data-use_title_for_force_title="1" ';
}
if (isset($options['main_menu_icon']) && $options['main_menu_icon'] != '') {
if (isset($options['class'])) {
$options['class'] .= ' main_menu_icon';
} else {
$options['class'] = 'main_menu_icon';
}
}
// Valid attributes (invalid attributes get skipped).
$attrs = [
'height',