2013-06-10 Sergio Martin <sergio.martin@artica.es>
* include/styles/jquery-ui-1.10.0.custom.css include/styles/pandora.css include/ajax/events.php include/functions_graph.php include/functions_events.php include/functions_networkmap.php include/functions_netflow.php operation/tree.php operation/events/events.build_table.php operation/reporting/reporting_viewer.php operation/agentes/status_monitor.php operation/agentes/stat_win.php operation/netflow/nf_live_view.php images/header_refresh_disabled.png images/image_problem_data.png images/input_pdf.png images/input_delete.png general/header.php godmode/users/user_list.php godmode/events/event_edit_filter.php godmode/events/event_responses.list.php godmode/events/events.php: Fix a lot of aesthetic issues and other little fixes git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8283 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo
parent
9e554db5c2
commit
4c493c4c28
|
|
@ -1,3 +1,29 @@
|
|||
2013-06-10 Sergio Martin <sergio.martin@artica.es>
|
||||
|
||||
* include/styles/jquery-ui-1.10.0.custom.css
|
||||
include/styles/pandora.css
|
||||
include/ajax/events.php
|
||||
include/functions_graph.php
|
||||
include/functions_events.php
|
||||
include/functions_networkmap.php
|
||||
include/functions_netflow.php
|
||||
operation/tree.php
|
||||
operation/events/events.build_table.php
|
||||
operation/reporting/reporting_viewer.php
|
||||
operation/agentes/status_monitor.php
|
||||
operation/agentes/stat_win.php
|
||||
operation/netflow/nf_live_view.php
|
||||
images/header_refresh_disabled.png
|
||||
images/image_problem_data.png
|
||||
images/input_pdf.png
|
||||
images/input_delete.png
|
||||
general/header.php
|
||||
godmode/users/user_list.php
|
||||
godmode/events/event_edit_filter.php
|
||||
godmode/events/event_responses.list.php
|
||||
godmode/events/events.php: Fix a lot of aesthetic issues and other
|
||||
little fixes
|
||||
|
||||
2013-06-10 Miguel de Dios <miguel.dedios@artica.es>
|
||||
|
||||
* include/functions_ui.php: fixed the reload the widget autocomplete
|
||||
|
|
|
|||
|
|
@ -124,17 +124,24 @@ config_check();
|
|||
(string)SECONDS_15MINUTES => __('15 minutes'),
|
||||
(string)SECONDS_30MINUTES => __('30 minutes'),
|
||||
(string)SECONDS_1HOUR => __('1 hour'));
|
||||
$autorefresh_additional = '<span id="combo_refr" style="display: none; padding-right: 9px;">';
|
||||
$autorefresh_additional = '<span id="combo_refr" style="display: none;">';
|
||||
$autorefresh_additional .= html_print_select ($values, 'ref', '', '', __('Select'), '0', true, false, false);
|
||||
$autorefresh_additional .= '</span>';
|
||||
unset ($values);
|
||||
|
||||
$autorefresh_link_open_img = '<a class="white autorefresh" href="' . ui_get_url_refresh ($ignored_params) . '">';
|
||||
$autorefresh_link_open_txt = '<a class="white autorefresh autorefresh_txt" href="' . ui_get_url_refresh ($ignored_params) . '">';
|
||||
|
||||
if ($_GET['refr']) {
|
||||
$autorefresh_link_open_txt = '<a class="white autorefresh autorefresh_txt" href="' . ui_get_url_refresh ($ignored_params) . '">';
|
||||
}
|
||||
else {
|
||||
$autorefresh_link_open_txt = '<a>';
|
||||
}
|
||||
|
||||
$autorefresh_link_close = '</a>';
|
||||
}
|
||||
else {
|
||||
$autorefresh_img = html_print_image("images/header_refresh.png", true, array("class" => 'bot autorefresh_disabled', "alt" => 'lightning', 'title' => __('Disabled autorefresh')));
|
||||
$autorefresh_img = html_print_image("images/header_refresh_disabled.png", true, array("class" => 'bot autorefresh_disabled', "alt" => 'lightning', 'title' => __('Disabled autorefresh')));
|
||||
|
||||
$ignored_params['refr'] = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ if (! check_acl ($config["id_user"], 0, "EW")) {
|
|||
db_pandora_audit("ACL Violation",
|
||||
"Trying to access events filter editor");
|
||||
require ("general/noaccess.php");
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ if (! check_acl($config['id_user'], 0, "PM")) {
|
|||
return;
|
||||
}
|
||||
|
||||
echo '<br><br><div style="width:90%;text-align:right;">';
|
||||
echo '<br><br><div style="width:99%;text-align:right;">';
|
||||
echo '<form method="post" action="index.php?sec=geventos&sec2=godmode/events/events§ion=responses&mode=editor&pure='.$config['pure'].'">';
|
||||
html_print_submit_button(__('Create response'), 'create_response_button', false, array('class' => 'sub next'));
|
||||
echo '</form>';
|
||||
|
|
@ -46,7 +46,7 @@ if(empty($event_responses)) {
|
|||
return;
|
||||
}
|
||||
|
||||
$table->width = '90%';
|
||||
$table->width = '99%';
|
||||
|
||||
$table->size = array();
|
||||
$table->size[0] = '200px';
|
||||
|
|
|
|||
|
|
@ -86,6 +86,8 @@ switch ($section) {
|
|||
|
||||
include_once($config["homedir"] . '/include/functions_events.php');
|
||||
|
||||
open_meta_frame();
|
||||
|
||||
switch($section) {
|
||||
case 'edit_filter':
|
||||
require_once($config["homedir"] . '/godmode/events/event_edit_filter.php');
|
||||
|
|
@ -101,4 +103,6 @@ switch($section) {
|
|||
break;
|
||||
}
|
||||
|
||||
close_meta_frame();
|
||||
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ elseif ($disable_user !== false) { //disable_user
|
|||
|
||||
$table->cellpadding = 4;
|
||||
$table->cellspacing = 4;
|
||||
$table->width = '98%';
|
||||
$table->width = '99%';
|
||||
$table->class = "databox";
|
||||
$table->head = array ();
|
||||
$table->data = array ();
|
||||
|
|
@ -237,7 +237,13 @@ $table->head[6] = '<span title="Operations">' . __('Op.') . '</span>';
|
|||
$table->align[2] = "right";
|
||||
$table->align[3] = "center";
|
||||
$table->size[2] = '150px';
|
||||
$table->size[6] = '85px';
|
||||
|
||||
if (defined('METACONSOLE')) {
|
||||
$table->size[6] = '110px';
|
||||
}
|
||||
else {
|
||||
$table->size[6] = '85px';
|
||||
}
|
||||
|
||||
$table->valign[0] = 'top';
|
||||
$table->valign[1] = 'top';
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 372 B |
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.2 KiB |
|
|
@ -51,7 +51,7 @@ if ($get_event_name) {
|
|||
return;
|
||||
}
|
||||
|
||||
echo io_safe_output($name);
|
||||
ui_print_truncate_text(io_safe_output($name), 75, false, false, false, '...');
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1497,6 +1497,12 @@ function events_check_event_filter_group ($id_filter) {
|
|||
$own_info = get_user_info ($config['id_user']);
|
||||
// Get group list that user has access
|
||||
$groups_user = users_get_groups ($config['id_user'], "EW", $own_info['is_admin'], true);
|
||||
|
||||
// Permissions in any group allow to edit "All group" filters
|
||||
if($id_group == 0 && !empty($groups_user)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$groups_id = array();
|
||||
$has_permission = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -673,11 +673,11 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
|
|||
|
||||
if (!$avg_only) {
|
||||
$legend['max'.$series_suffix] = __('Max').$series_suffix_str.': '.__('Last').': '.$graph_stats['max']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['max']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['max']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['max']['min'].' '.$unit;
|
||||
$legend['sum'.$series_suffix] = __('Avg').$series_suffix_str.': '.__('Last').': '.$graph_stats['sum']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['sum']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['sum']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['sum']['min'].' '.$unit;
|
||||
$legend['sum'.$series_suffix] = __('Data').$series_suffix_str.': '.__('Last').': '.$graph_stats['sum']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['sum']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['sum']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['sum']['min'].' '.$unit;
|
||||
$legend['min'.$series_suffix] = __('Min').$series_suffix_str.': '.__('Last').': '.$graph_stats['min']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['min']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['min']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['min']['min'].' '.$unit;
|
||||
}
|
||||
else
|
||||
$legend['sum'.$series_suffix] = __('Avg').$series_suffix_str.': '.__('Last').': '.$graph_stats['sum']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['sum']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['sum']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['sum']['min'].' '.$unit;
|
||||
$legend['sum'.$series_suffix] = __('Data').$series_suffix_str.': '.__('Last').': '.$graph_stats['sum']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['sum']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['sum']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['sum']['min'].' '.$unit;
|
||||
//Baseline was replaced by compare graph feature
|
||||
/*if ($baseline) {
|
||||
$legend['baseline'.$series_suffix] = __('Baseline');
|
||||
|
|
@ -2821,12 +2821,12 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
|
|||
if (!$avg_only) {
|
||||
//Boolean graph doesn't have max!!!
|
||||
//$legend['max'.$series_suffix] = __('Max').$series_suffix_str .': '.__('Last').': '.$graph_stats['max']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['max']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['max']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['max']['min'].' '.$unit;
|
||||
$legend['sum'.$series_suffix] = __('Avg').$series_suffix_str.': '.__('Last').': '.$graph_stats['sum']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['sum']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['sum']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['sum']['min'].' '.$unit;
|
||||
$legend['sum'.$series_suffix] = __('Data').$series_suffix_str.': '.__('Last').': '.$graph_stats['sum']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['sum']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['sum']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['sum']['min'].' '.$unit;
|
||||
//Boolean graph doesn't have min!!!
|
||||
//$legend['min'.$series_suffix] = __('Min').$series_suffix_str .': '.__('Last').': '.$graph_stats['min']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['min']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['min']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['min']['min'].' '.$unit;
|
||||
}
|
||||
else {
|
||||
$legend['sum'.$series_suffix] = __('Avg').$series_suffix_str.': '.__('Last').': '.$graph_stats['sum']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['sum']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['sum']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['sum']['min'].' '.$unit;
|
||||
$legend['sum'.$series_suffix] = __('Data').$series_suffix_str.': '.__('Last').': '.$graph_stats['sum']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['sum']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['sum']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['sum']['min'].' '.$unit;
|
||||
|
||||
}
|
||||
//$legend['baseline'.$series_suffix] = __('Baseline').$series_suffix_str;
|
||||
|
|
@ -3878,17 +3878,20 @@ function grafico_modulo_log4x_format_y_axis ( $number , $decimals=2, $dec_point=
|
|||
}
|
||||
}
|
||||
|
||||
function graph_nodata_image($width = 300, $height = 110, $type = 'area') {
|
||||
function graph_nodata_image($width = 300, $height = 110, $type = 'area', $text = '') {
|
||||
$image = ui_get_full_url('images/image_problem_' . $type . '.png',
|
||||
false, false, false);
|
||||
|
||||
$text_div = '<div class="nodata_text">' .
|
||||
__('No data to show') . '</div>';
|
||||
if ($text == '') {
|
||||
$text = __('No data to show');
|
||||
}
|
||||
|
||||
$text_div = '<div class="nodata_text">' . $text . '</div>';
|
||||
|
||||
$image_div = '<div class="nodata_container" style="background-image: url(\'' . $image . '\');">' .
|
||||
$text_div . '</div>';
|
||||
|
||||
$div = '<div style="width:' . $width . 'px; height:' . $height . 'px; border: 1px dotted #ddd; background-color: white;">' .
|
||||
$div = '<div style="width:' . $width . 'px; height:' . $height . 'px; border: 1px dotted #ddd; background-color: white; margin: 0 auto;">' .
|
||||
$image_div . '</div>';
|
||||
|
||||
return $div;
|
||||
|
|
|
|||
|
|
@ -1092,7 +1092,7 @@ function netflow_draw_item ($start_date, $end_date, $interval_length, $type, $fi
|
|||
}
|
||||
|
||||
if ($output == 'HTML' || $output == 'PDF') {
|
||||
return fs_error_image();
|
||||
return graph_nodata_image(300, 110, 'data');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -960,7 +960,7 @@ function networkmap_get_networkmap ($id_networkmap, $filter = false, $fields = f
|
|||
$user_info = users_get_user_by_id($config['id_user']);
|
||||
|
||||
if (!$user_info['is_admin']) {
|
||||
$filter['id_user'] = $config['id_user'];
|
||||
//$filter['id_user'] = $config['id_user'];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1189,6 +1189,13 @@ body .ui-tooltip {
|
|||
color: #ffffff !important;
|
||||
}
|
||||
|
||||
.ui-datepicker-calendar th {
|
||||
background-color: #3F3F3F;
|
||||
}
|
||||
|
||||
.ui-dialog .ui-widget-header {
|
||||
background-color: transparent !important;
|
||||
}
|
||||
|
||||
.ui_tpicker_hour,
|
||||
.ui_tpicker_minute,
|
||||
|
|
@ -1213,4 +1220,4 @@ body .ui-tooltip {
|
|||
}
|
||||
|
||||
.ui-icon {
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1042,14 +1042,15 @@ td input[type=checkbox]
|
|||
display: table-cell;
|
||||
}
|
||||
|
||||
td.datos3 {
|
||||
background-color: #d4ddc6;
|
||||
td.datos3, td.datos3 * {
|
||||
background-color: #b1b1b1;
|
||||
color: white !important;
|
||||
}
|
||||
|
||||
td.datos4 {
|
||||
/*Add !important because in php the function html_print_table write style in cell and this is style head.*/
|
||||
text-align: center !important;
|
||||
background-color: #d4ddc6;
|
||||
background-color: #b1b1b1;
|
||||
}
|
||||
|
||||
td.datos_id {
|
||||
|
|
@ -2017,6 +2018,18 @@ div#pandora_logo_header {
|
|||
cursor: not-allowed !important;
|
||||
}
|
||||
|
||||
a.autorefresh {
|
||||
padding-right: 8px;
|
||||
}
|
||||
|
||||
#refrcounter {
|
||||
color: white;
|
||||
}
|
||||
|
||||
#combo_refr select {
|
||||
margin-right: 8px;
|
||||
}
|
||||
|
||||
.disabled_module {
|
||||
color: #aaa;
|
||||
}
|
||||
|
|
@ -2326,12 +2339,12 @@ tr.group_view_unk, .group_view_unk {
|
|||
|
||||
a.datos_blue, .datos_bluef9, .datos_blue, .datos_blue * {
|
||||
background-color: #4CA8E0;
|
||||
color: #111;
|
||||
color: #fff !important;
|
||||
}
|
||||
|
||||
.datos_grey, .datos_greyf9, .datos_grey * {
|
||||
background-color: #999999;
|
||||
color: #111;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.datos_pink, .datos_pinkf9, .datos_pink * {
|
||||
|
|
|
|||
|
|
@ -73,6 +73,7 @@ $label = base64_decode(get_parameter('label', ''));
|
|||
<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" />
|
||||
<script type='text/javaScript' src='../../include/javascript/calendar.js'></script>
|
||||
<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
|
||||
<script type='text/javascript' src='../../include/javascript/jquery.pandora.js'></script>
|
||||
<script type='text/javascript' src='../../include/javascript/jquery-1.7.1.js'></script>
|
||||
<script type='text/javascript'>
|
||||
<!--
|
||||
|
|
@ -367,6 +368,9 @@ $label = base64_decode(get_parameter('label', ''));
|
|||
$params['position'] = 'left';
|
||||
|
||||
html_print_side_layer($params);
|
||||
|
||||
// Hidden div to forced title
|
||||
html_print_div(array('id' => 'forced_title_layer', 'class' => 'forced_title_layer', 'hidden' => true));
|
||||
?>
|
||||
|
||||
</body>
|
||||
|
|
@ -410,4 +414,6 @@ $label = base64_decode(get_parameter('label', ''));
|
|||
<?php
|
||||
}
|
||||
?>
|
||||
|
||||
forced_title_callback();
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -933,7 +933,7 @@ foreach ($result as $row) {
|
|||
$data[3] .= ui_print_help_tip ($row["extended_info"], true, '/images/comments.png');
|
||||
}
|
||||
if ($row["tags"] != "") {
|
||||
$data[3] .= ui_print_help_tip ($row["tags"], true, '/images/tip.png');
|
||||
$data[3] .= html_print_image('/images/tag_red.png', true, array('title' => $row["tags"], 'style' => 'width: 20px; margin-left: 3px;'));
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ if (in_array('id_evento', $show_fields)) {
|
|||
if (in_array('evento', $show_fields)) {
|
||||
$table->head[$i] = __('Event Name');
|
||||
$table->align[$i] = 'left';
|
||||
$table->style[$i] = 'max-width: 350px; word-break: break-all;';
|
||||
$table->style[$i] = 'min-width: 200px; max-width: 350px; word-break: break-all;';
|
||||
$i++;
|
||||
}
|
||||
if (in_array('id_agente', $show_fields)) {
|
||||
|
|
@ -87,6 +87,7 @@ if (in_array('id_grupo', $show_fields)) {
|
|||
if (in_array('event_type', $show_fields)) {
|
||||
$table->head[$i] = __('Event type');
|
||||
$table->align[$i] = 'center';
|
||||
$table->style[$i] = 'min-width: 85px;';
|
||||
$i++;
|
||||
}
|
||||
if (in_array('id_agentmodule', $show_fields)) {
|
||||
|
|
@ -565,10 +566,12 @@ if (!empty ($table->data)) {
|
|||
echo "<input type='hidden' name='delete' id='hidden_delete_events' value='0' />";
|
||||
}
|
||||
|
||||
echo '<div style="width: 98%; overflow-x: auto;">';
|
||||
html_print_table ($table);
|
||||
echo '</div>';
|
||||
|
||||
if ($allow_action) {
|
||||
echo '<div style="width:'.$table->width.';" class="action-buttons">';
|
||||
echo '<div style="width: 98%;" class="action-buttons">';
|
||||
if (!$readonly && tags_check_acl ($config["id_user"], 0, "EW", $event['clean_tags']) == 1) {
|
||||
html_print_button(__('Validate selected'), 'validate_button', false, 'validate_selected();', 'class="sub ok"');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -159,6 +159,8 @@ if (isset($config['netflow_disable_custom_lvfilters'])) {
|
|||
$netflow_disable_custom_lvfilters = $config['netflow_disable_custom_lvfilters'];
|
||||
}
|
||||
|
||||
open_meta_frame();
|
||||
|
||||
echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&sec2=operation/netflow/nf_live_view&pure='.$pure.'">';
|
||||
echo "<table class='databox' width='99%'>";
|
||||
|
||||
|
|
@ -347,7 +349,7 @@ echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&s
|
|||
echo "<br />";
|
||||
|
||||
if (defined ('METACONSOLE')) {
|
||||
echo "<table class='databox' width='800' style='border: 0px;'><tr><td>";
|
||||
echo "<table class='databox' width='99%' style='border: 0px;'><tr><td>";
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -377,6 +379,8 @@ if ($draw != '') {
|
|||
$max_aggregates, $connection_name);
|
||||
}
|
||||
|
||||
close_meta_frame();
|
||||
|
||||
ui_require_jquery_file ("ui-timepicker-addon");
|
||||
?>
|
||||
|
||||
|
|
|
|||
|
|
@ -167,7 +167,7 @@ $table->data[1][2] .= html_print_input_text ('date', $date, '', 12, 10, true). '
|
|||
$table->data[1][2] .= html_print_input_text ('time', $time, '', 10, 7, true). ' ';
|
||||
$table->data[1][2] .= html_print_submit_button (__('Update'), 'date_submit', false, 'class="sub next"', true);
|
||||
|
||||
echo '<form method="post" action="'.$url.'&pure='.$config["pure"].'">';
|
||||
echo '<form method="post" action="'.$url.'&pure='.$config["pure"].'" style="margin-right: 0px;">';
|
||||
html_print_table ($table);
|
||||
html_print_input_hidden ('id_report', $id_report);
|
||||
echo '</form>';
|
||||
|
|
@ -255,8 +255,8 @@ if ($datetime === false || $datetime == -1) {
|
|||
|
||||
$table->size = array ();
|
||||
$table->style = array ();
|
||||
$table->width = '99%';
|
||||
$table->class = 'databox report_table';
|
||||
$table->width = '98%';
|
||||
$table->class = 'databox';
|
||||
$table->rowclass = array ();
|
||||
$table->rowclass[0] = 'datos3';
|
||||
|
||||
|
|
|
|||
|
|
@ -559,12 +559,35 @@ else {
|
|||
|
||||
$img_style = array ("class" => "top", "width" => 16);
|
||||
$activeTab = get_parameter('tab','group');
|
||||
|
||||
// Check if the loaded tab is allowed or not
|
||||
$allowed_tabs = array('group');
|
||||
|
||||
if ($config['enable_tags_tree']) {
|
||||
$allowed_tabs[] = 'tag';
|
||||
}
|
||||
|
||||
if (!in_array($activeTab, $allowed_tabs)) {
|
||||
db_pandora_audit("HACK Attempt",
|
||||
"Trying to access to not allowed tab on tree view");
|
||||
include ("general/noaccess.php");
|
||||
exit;
|
||||
}
|
||||
// End of tab check
|
||||
|
||||
$group_tab = array('text' => "<a href='index.php?sec=monitoring&sec2=operation/tree&refr=0&tab=group&pure=$pure'>"
|
||||
. html_print_image ("images/group.png", true, array ("title" => __('Groups'))) . "</a>",
|
||||
'active' => $activeTab == "group");
|
||||
$tags_tab = array('text' => "<a href='index.php?&sec=monitoring&sec2=operation/tree&refr=0&tab=tag&pure=$pure'>"
|
||||
. html_print_image ("images/tag.png", true, array ("title" => __('Tags'))) . "</a>", 'active' => $activeTab == "tag");
|
||||
$subsections = array('group' => $group_tab, 'tag' => $tags_tab);
|
||||
|
||||
$subsections['group'] = $group_tab;
|
||||
|
||||
if($config['enable_tags_tree']) {
|
||||
$tags_tab = array('text' => "<a href='index.php?&sec=monitoring&sec2=operation/tree&refr=0&tab=tag&pure=$pure'>"
|
||||
. html_print_image ("images/tag.png", true, array ("title" => __('Tags'))) . "</a>", 'active' => $activeTab == "tag");
|
||||
|
||||
$subsections['tag'] = $tags_tab;
|
||||
}
|
||||
|
||||
switch ($activeTab) {
|
||||
case 'group':
|
||||
$subsection = __('Groups');
|
||||
|
|
|
|||
Loading…
Reference in New Issue