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-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round

This commit is contained in:
Pablo Aragon 2023-03-13 12:03:43 +01:00
parent 2cd09d7618 590e7a3978
commit 0203e5eba9
6 changed files with 72 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/godmode/category/category.php
View File

@ -262,10 +262,7 @@ if ($is_management_allowed === true) {
[ 'icon' => 'next' ],
true
),
[
'type' => 'form_action',
'right_content' => $tablePagination,
]
[ 'right_content' => $tablePagination ]
);
echo '</form>';

4
pandora_console/include/functions_network.php
View File

@ -68,10 +68,10 @@ function network_print_explorer_header(
$cell = '<div class="flex_center">';
$cell .= $title;
$cell .= html_print_link_with_params(
'images/arrow-down-white.png',
'images/arrow@svg.svg',
array_merge($hidden_data, ['order_by' => $order]),
'image',
($selected === $order) ? 'opacity: 0.5' : ''
'rotate: 270deg; width: 20px; margin-top: 4px;'.(($selected === $order) ? '' : 'opacity: 0.5')
);
$cell .= '</div>';

12
pandora_console/include/functions_treeview.php
View File

@ -727,8 +727,8 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
false,
false,
'',
'white-box-content',
'white_table_flex margin-bottom-10 border-bottom-gray'
'white-box-content mrgn_top_0 mrgn_btn_0px',
'white_table_flex'
);
if ($config['agentaccess']) {
@ -747,8 +747,8 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
true,
false,
'',
'white-box-content border-bottom-gray',
'white_table_flex margin-top-10 margin-bottom-10'
'white-box-content mrgn_top_0 mrgn_btn_0px border-bottom-gray',
'white_table_flex'
);
}
@ -920,8 +920,8 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
true,
false,
'',
'white-box-content border-bottom-gray',
'white_table_flex margin-top-10 margin-bottom-10'
'white-box-content mrgn_top_0 mrgn_btn_0px border-bottom-gray',
'white_table_flex'
);
if (empty($server_data) === false && is_metaconsole() === true) {

14
pandora_console/include/functions_ui.php
View File

@ -4360,7 +4360,10 @@ function ui_toggle(
$image_a = html_print_image(
$img_a,
true,
[ 'style' => 'rotate: '.$rotateA ],
[
'class' => 'mrgn_right_10px',
'style' => 'rotate: '.$rotateA,
],
true
);
} else {
@ -4371,7 +4374,10 @@ function ui_toggle(
$image_b = html_print_image(
$img_b,
true,
[ 'style' => 'rotate: '.$rotateB ],
[
'class' => 'mrgn_right_10px',
'style' => 'margin-right:10px; rotate: '.$rotateB,
],
true
);
} else {
@ -4434,7 +4440,7 @@ function ui_toggle(
$original,
true,
[
'class' => 'float-left main_menu_icon',
'class' => 'float-left main_menu_icon mrgn_right_10px',
'style' => 'object-fit: contain; margin-right:10px; rotate:'.$imageRotate,
'title' => $title,
'id' => 'image_'.$uniqid,
@ -4466,7 +4472,7 @@ function ui_toggle(
$original,
true,
[
'class' => 'main_menu_icon',
'class' => 'main_menu_icon mrgn_right_10px',
'style' => 'object-fit: contain; float:right; margin-right:10px; rotate:'.$imageRotate,
'title' => $title,
'id' => 'image_'.$uniqid,

24
pandora_console/operation/netflow/netflow_explorer.php
View File

@ -1,21 +1,29 @@
<?php
/**
* Network explorer
* Netflow Explorer
*
* @package Operations.
* @subpackage Netflow explorer view.
* @category Netflow
* @package Pandora FMS
* @subpackage Community
* @version 1.0.0
* @license See below
*
* Pandora FMS - http://pandorafms.com
* ==================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
* ______ ___ _______ _______ ________
* | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
* | __/| _ | | _ || _ | _| _ | | ___| |__ |
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2022 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; version 2
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/
global $config;

48
pandora_console/operation/network/network_report.php
View File

@ -1,23 +1,32 @@
<?php
/**
* Network explorer
* Netflow Report
*
* @package Operations.
* @subpackage Network explorer view.
* @category Netflow
* @package Pandora FMS
* @subpackage Community
* @version 1.0.0
* @license See below
*
* Pandora FMS - http://pandorafms.com
* ==================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
* ______ ___ _______ _______ ________
* | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
* | __/| _ | | _ || _ | _| _ | | ___| |__ |
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2022 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; version 2
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/
// Begin.
check_login();
// ACL Check.
@ -390,15 +399,26 @@ if (empty($data)) {
],
'labels' => $labels,
];
// Results table.
$resultsTable = html_print_div(
[
'class' => '',
'style' => 'flex: 50;margin-right: 5px;',
'content' => html_print_table($table, true),
],
true
);
// Pie graph.
html_print_div(
$pieGraph = html_print_div(
[
'class' => 'databox netflow-pie-graph-container padding-2 white_box',
'style' => 'flex: 50;margin-left: 5px;',
'content' => pie_graph(
$chart_data,
$options
),
]
],
true
);
// Print the filter remove link.
if (empty($main_value) === false) {
@ -418,7 +438,13 @@ if (empty($data)) {
}
// Print results.
html_print_table($table);
html_print_div(
[
'style' => 'max-width: -webkit-fill-available; display: flex',
'class' => '',
'content' => $resultsTable.$pieGraph,
]
);
}
?>