tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 07:44:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round

Browse Source
This commit is contained in:
Jonathan 2023-03-31 13:37:59 +02:00
commit 8d950c3672
26 changed files with 372 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/extensions/agents_modules.php
View File

@ -261,12 +261,11 @@ function agents_modules_load_js()
} }
function select_selected () { function select_selected () {
$('#id_agents2 option').each(function(){ // $('#id_agents2 option').each(function(){
if($(this).attr('selected') === 'selected'){ // if($(this).attr('selected') === 'selected'){
$(this).prop('selected', true); // $(this).prop('selected', true);
} // }
}); // });
} }
</script> </script>
<?php <?php

6
pandora_console/extensions/realtime_graphs.php
View File

@ -280,10 +280,10 @@ function pandora_realtime_graphs()
); );
html_print_input_hidden('incremental_base', '0'); html_print_input_hidden('incremental_base', '0');
echo '<script type="text/javascript" src="'.ui_get_full_url('include/javascript/pandora_snmp_browser.js').'"></script>'; echo '<script type="text/javascript" src="'.ui_get_full_url('include/javascript/pandora_snmp_browser.js').'?v='.$config['current_package'].'"></script>';
echo '<script type="text/javascript" src="'.ui_get_full_url('extensions/realtime_graphs/realtime_graphs.js').'"></script>'; echo '<script type="text/javascript" src="'.ui_get_full_url('extensions/realtime_graphs/realtime_graphs.js').'?v='.$config['current_package'].'"></script>';
if ($config['style'] !== 'pandora_black') { if ($config['style'] !== 'pandora_black') {
echo '<link rel="stylesheet" type="text/css" href="'.ui_get_full_url('extensions/realtime_graphs/realtime_graphs.css').'"></style>'; echo '<link rel="stylesheet" type="text/css" href="'.ui_get_full_url('extensions/realtime_graphs/realtime_graphs.css').'?v='.$config['current_package'].'"></style>';
} }
// Store servers timezone offset to be retrieved from js. // Store servers timezone offset to be retrieved from js.

2
pandora_console/general/pandora_help.php
View File

@ -25,7 +25,7 @@ echo __('%s help system', get_product_name());
</title> </title>
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
</head> </head>
<?php echo '<link rel="stylesheet" href="../include/styles/'.$config['style'].'.css" type="text/css">'; ?> <?php echo '<link rel="stylesheet" href="../include/styles/'.$config['style'].'.css?v='.$config['current_package'].'" type="text/css">'; ?>
<body class="height_100p bg_333"> <body class="height_100p bg_333">
<?php <?php
$id = get_parameter('id'); $id = get_parameter('id');

2
pandora_console/godmode/agentes/module_manager_editor_network.php
View File

@ -33,7 +33,7 @@ $snmp_browser_path = (is_metaconsole() === true) ? '../../' : '';
$snmp_browser_path .= 'include/javascript/pandora_snmp_browser.js'; $snmp_browser_path .= 'include/javascript/pandora_snmp_browser.js';
$array_credential_identifier = CredentialStore::getKeys('CUSTOM'); $array_credential_identifier = CredentialStore::getKeys('CUSTOM');
echo "<script type='text/javascript' src='".$snmp_browser_path."'></script>"; echo '<script type="text/javascript" src="'.$snmp_browser_path.'?v='.$config['current_package'].'"></script>';
// Define a custom action to save the OID selected // Define a custom action to save the OID selected
// in the SNMP browser to the form. // in the SNMP browser to the form.

253
pandora_console/godmode/reporting/graph_builder.graph_editor.php
View File

@ -204,9 +204,142 @@ if ($count_module_array > $config['items_combined_charts']) {
); );
} }
$table = new stdClass();
$table->width = '100%';
$table->colspan[0][0] = 3;
$table->size = [];
if (defined('METACONSOLE')) {
$table->class = 'databox data';
$table->head[0] = __('Sort items');
$table->head_colspan[0] = 4;
$table->headstyle[0] = 'text-align: center';
$table->size[0] = '25%';
$table->size[1] = '25%';
$table->size[2] = '25%';
$table->size[3] = '25%';
} else {
$table->class = 'filter-table-adv';
$table->size[0] = '50%';
$table->size[1] = '50%';
}
$table->data[0][0] = html_print_label_input_block(
__('Sort selected items'),
html_print_select_style(
[
'before' => __('before to'),
'after' => __('after to'),
],
'move_to',
'',
'',
'',
'',
0,
true
)
);
$table->data[0][1] = html_print_label_input_block(
__('Position'),
html_print_input_text_extended(
'position_to_sort',
1,
'text-position_to_sort',
'',
3,
10,
false,
"only_numbers('position_to_sort');",
'',
true
).html_print_input_hidden('ids_items_to_sort', '', true)
);
$SortItems = "<form action='index.php?sec=reporting&sec2=godmode/reporting/graph_builder&tab=graph_editor&edit_graph=1&id=".$id_graph."' method='post' onsubmit='return added_ids_sorted_items_to_hidden_input();'>";
$SortItems .= html_print_table($table, true);
$SortItems .= html_print_input_hidden('action', 'sort_items', true);
$SortItems .= html_print_div(
[
'class' => 'action-buttons',
'content' => html_print_submit_button(
__('Sort'),
'srcbutton',
false,
[
'class' => 'mini',
'icon' => 'search',
'mode' => 'secondary',
],
true
),
],
true
);
$SortItems .= '</form>';
ui_toggle(
$SortItems,
'<span class="subsection_header_title">'.__('Sort items').'</span>',
'',
'',
false,
false,
'',
'white-box-content no_border',
'filter-datatable-main box-flat white_table_graph max_floating_element_size'
);
// Configuration form.
echo '<span id ="none_text" class="invisible">'.__('None').'</span>';
echo "<form id='agentmodules' method='post' action='index.php?sec=reporting&sec2=godmode/reporting/graph_builder&tab=graph_editor&add_module=1&edit_graph=1&id=".$id_graph."'>";
echo "<table width='100%' cellpadding='4' cellpadding='4' class='databox filters max_floating_element_size'>";
echo '<tr>';
echo '<td class="w50p pdd_50px" id="select_multiple_modules_filtered">'.html_print_input(
[
'type' => 'select_multiple_modules_filtered',
'uniqId' => 'modules',
'class' => 'flex flex-row',
'searchBar' => true,
]
).'</td>';
echo '</tr><tr>';
echo "<td colspan='3'>";
echo "<table cellpadding='4' class='filter-table-adv'><tr>";
echo '<td>';
echo html_print_label_input_block(
__('Weight'),
'<input type="text" name="weight" value="1" size=3>'
);
echo '</td>';
echo '</tr></table>';
echo '</td>';
echo '</tr><tr>';
echo "<td colspan='3' align='right'></td>";
echo '</tr></table>';
$ActionButtons[] = html_print_submit_button(
__('Add'),
'submit-add',
false,
[
'class' => 'sub ok',
'icon' => 'next',
],
true
);
html_print_action_buttons(
implode('', $ActionButtons),
['type' => 'form_action']
);
echo '</form>';
// Modules table. // Modules table.
if ($count_module_array > 0) { if ($count_module_array > 0) {
echo "<table width='100%' cellpadding=4 cellpadding=4 class='databox filters'>"; echo "<table width='100%' cellpadding=4 cellpadding=4 class='databox filters info_table'>";
echo '<tr> echo '<tr>
<th>'.__('P.').'</th> <th>'.__('P.').'</th>
<th>'.__('Agent').'</th> <th>'.__('Agent').'</th>
@ -290,124 +423,6 @@ if ($count_module_array > 0) {
echo '</table>'; echo '</table>';
} }
$table = new stdClass();
$table->width = '100%';
$table->colspan[0][0] = 3;
$table->size = [];
if (defined('METACONSOLE')) {
$table->class = 'databox data';
$table->head[0] = __('Sort items');
$table->head_colspan[0] = 4;
$table->headstyle[0] = 'text-align: center';
$table->size[0] = '25%';
$table->size[1] = '25%';
$table->size[2] = '25%';
$table->size[3] = '25%';
} else {
$table->class = 'filter-table-adv';
$table->size[0] = '50%';
$table->size[1] = '50%';
}
$table->data[0][0] = html_print_label_input_block(
__('Sort selected items'),
html_print_select_style(
[
'before' => __('before to'),
'after' => __('after to'),
],
'move_to',
'',
'',
'',
'',
0,
true
)
);
$table->data[0][1] = html_print_label_input_block(
__('Position'),
html_print_input_text_extended(
'position_to_sort',
1,
'text-position_to_sort',
'',
3,
10,
false,
"only_numbers('position_to_sort');",
'',
true
).html_print_input_hidden('ids_items_to_sort', '', true)
);
$SortItems = "<form action='index.php?sec=reporting&sec2=godmode/reporting/graph_builder&tab=graph_editor&edit_graph=1&id=".$id_graph."' method='post' onsubmit='return added_ids_sorted_items_to_hidden_input();'>";
$SortItems .= html_print_table($table, true);
$SortItems .= html_print_input_hidden('action', 'sort_items', true);
$SortItems .= html_print_div(
[
'class' => 'action-buttons',
'content' => html_print_submit_button(
__('Sort'),
'srcbutton',
false,
[
'class' => 'mini',
'icon' => 'search',
'mode' => 'secondary',
],
true
),
],
true
);
$SortItems .= '</form>';
ui_toggle($SortItems, __('Sort items'), '', '', false);
// Configuration form.
echo '<span id ="none_text" class="invisible">'.__('None').'</span>';
echo "<form id='agentmodules' method='post' action='index.php?sec=reporting&sec2=godmode/reporting/graph_builder&tab=graph_editor&add_module=1&edit_graph=1&id=".$id_graph."'>";
echo "<table width='100%' cellpadding='4' cellpadding='4' class='databox filters'>";
echo '<tr>';
echo '<td class="w50p pdd_50px" id="select_multiple_modules_filtered">'.html_print_input(
[
'type' => 'select_multiple_modules_filtered',
'uniqId' => 'modules',
'class' => 'flex flex-row',
'searchBar' => true,
]
).'</td>';
echo '</tr><tr>';
echo "<td colspan='3'>";
echo "<table cellpadding='4'><tr>";
echo '<td>'.__('Weight').'</td>';
echo "<td><input type='text' name='weight' value='1' size=3></td>";
echo '</tr></table>';
echo '</td>';
echo '</tr><tr>';
echo "<td colspan='3' align='right'></td>";
echo '</tr></table>';
$ActionButtons[] = html_print_submit_button(
__('Add'),
'submit-add',
false,
[
'class' => 'sub ok',
'icon' => 'next',
],
true
);
html_print_action_buttons(
implode('', $ActionButtons),
['type' => 'form_action']
);
ui_require_jquery_file('pandora.controls'); ui_require_jquery_file('pandora.controls');
ui_require_jquery_file('ajaxqueue'); ui_require_jquery_file('ajaxqueue');
ui_require_jquery_file('bgiframe'); ui_require_jquery_file('bgiframe');

9
pandora_console/images/alerts.svg Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
<title>Dark / 20 / Menu Alerts@svg</title>
<desc>Created with Sketch.</desc>
<g id="Dark-/-20-/-Menu-Alerts" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M10,20 C11.4190985,20 12.5702076,18.6570313 12.5702076,17 L7.42979244,17 C7.42979244,18.6570313 8.5809015,20 10,20 Z M18.6540098,13.9342308 C17.8777645,13.1357692 16.425318,11.9346154 16.425318,8 C16.425318,5.01153846 14.2364028,2.61923077 11.2849029,2.03230769 L11.2849029,1.23076923 C11.2849029,0.551153846 10.7095493,0 10,0 C9.29045075,0 8.71509711,0.551153846 8.71509711,1.23076923 L8.71509711,2.03230769 C5.76359722,2.61923077 3.57468198,5.01153846 3.57468198,8 C3.57468198,11.9346154 2.12223547,13.1357692 1.3459902,13.9342308 C1.10492023,14.1823077 0.998045886,14.4788462 1.00002702,14.7692308 C1.00447442,15.4 1.52156948,16 2.28977909,16 L17.7102209,16 C18.4784305,16 18.9959274,15.4 18.999973,14.7692308 C19.0019541,14.4788462 18.8950798,14.1819231 18.6540098,13.9342308 L18.6540098,13.9342308 Z" id="Shape" fill="#a6adb2"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

64
pandora_console/include/chart_generator.php
View File

@ -75,13 +75,13 @@ if (check_login(false) === false) {
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Access denied</title> <title>Access denied</title>
<link rel="stylesheet" href="styles/pandora.css" type="text/css" /> <link rel="stylesheet" href="styles/pandora.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
<link rel="stylesheet" href="styles/pandora_minimal.css" type="text/css" /> <link rel="stylesheet" href="styles/pandora_minimal.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
<link rel="stylesheet" href="styles/js/jquery-ui.min.css" type="text/css" /> <link rel="stylesheet" href="styles/js/jquery-ui.min.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
<link rel="stylesheet" href="styles/js/jquery-ui_custom.css" type="text/css" /> <link rel="stylesheet" href="styles/js/jquery-ui_custom.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
<script language="javascript" type='text/javascript' src='javascript/pandora.js'></script> <script language="javascript" type='text/javascript' src='javascript/pandora.js?v=<?php echo $config['current_package']; ?>'></script>
<script language="javascript" type='text/javascript' src='javascript/pandora_ui.js'></script> <script language="javascript" type='text/javascript' src='javascript/pandora_ui.js?v=<?php echo $config['current_package']; ?>'></script>
<script language="javascript" type='text/javascript' src='javascript/jquery.current.js'></script> <script language="javascript" type='text/javascript' src='javascript/jquery.current.js?v=<?php echo $config['current_package']; ?>'></script>
</head> </head>
<body> <body>
<h1>Access is not granted</h1> <h1>Access is not granted</h1>
@ -137,31 +137,31 @@ if (file_exists('languages/'.$user_language.'.mo') === true) {
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Pandora FMS Graph</title> <title>Pandora FMS Graph</title>
<link rel="stylesheet" href="styles/pandora.css" type="text/css" /> <link rel="stylesheet" href="styles/pandora.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
<link rel="stylesheet" href="styles/pandora_minimal.css" type="text/css" /> <link rel="stylesheet" href="styles/pandora_minimal.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
<link rel="stylesheet" href="styles/js/jquery-ui.min.css" type="text/css" /> <link rel="stylesheet" href="styles/js/jquery-ui.min.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
<link rel="stylesheet" href="styles/js/jquery-ui_custom.css" type="text/css" /> <link rel="stylesheet" href="styles/js/jquery-ui_custom.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
<script language="javascript" type='text/javascript' src='javascript/pandora_ui.js'></script> <script language="javascript" type='text/javascript' src='javascript/pandora_ui.js?v=<?php echo $config['current_package']; ?>'></script>
<script language="javascript" type='text/javascript' src='javascript/jquery.current.js'></script> <script language="javascript" type='text/javascript' src='javascript/jquery.current.js?v=<?php echo $config['current_package']; ?>'></script>
<script language="javascript" type='text/javascript' src='javascript/jquery.pandora.js'></script> <script language="javascript" type='text/javascript' src='javascript/jquery.pandora.js?v=<?php echo $config['current_package']; ?>'></script>
<script language="javascript" type='text/javascript' src='javascript/jquery-ui.min.js'></script> <script language="javascript" type='text/javascript' src='javascript/jquery-ui.min.js?v=<?php echo $config['current_package']; ?>'></script>
<script language="javascript" type='text/javascript' src='javascript/pandora.js'></script> <script language="javascript" type='text/javascript' src='javascript/pandora.js?v=<?php echo $config['current_package']; ?>'></script>
<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.js"></script> <script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.js?v=<?php echo $config['current_package']; ?>"></script>
<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.min.js"></script> <script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.min.js?v=<?php echo $config['current_package']; ?>"></script>
<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.time.js"></script> <script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.time.js?v=<?php echo $config['current_package']; ?>"></script>
<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.pie.js"></script> <script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.pie.js?v=<?php echo $config['current_package']; ?>"></script>
<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.crosshair.min.js"></script> <script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.crosshair.min.js?v=<?php echo $config['current_package']; ?>"></script>
<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.stack.min.js"></script> <script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.stack.min.js?v=<?php echo $config['current_package']; ?>"></script>
<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.selection.min.js"></script> <script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.selection.min.js?v=<?php echo $config['current_package']; ?>"></script>
<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.resize.min.js"></script> <script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.resize.min.js?v=<?php echo $config['current_package']; ?>"></script>
<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.threshold.js"></script> <script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.threshold.js?v=<?php echo $config['current_package']; ?>"></script>
<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.threshold.multiple.js"></script> <script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.threshold.multiple.js?v=<?php echo $config['current_package']; ?>"></script>
<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.symbol.min.js"></script> <script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.symbol.min.js?v=<?php echo $config['current_package']; ?>"></script>
<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.exportdata.pandora.js"></script> <script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.exportdata.pandora.js?v=<?php echo $config['current_package']; ?>"></script>
<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.axislabels.js"></script> <script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.axislabels.js?v=<?php echo $config['current_package']; ?>"></script>
<script language="javascript" type="text/javascript" src="graphs/flot/pandora.flot.js"></script> <script language="javascript" type="text/javascript" src="graphs/flot/pandora.flot.js?v=<?php echo $config['current_package']; ?>"></script>
<script language="javascript" type="text/javascript" src="graphs/chartjs/chart.js"></script> <script language="javascript" type="text/javascript" src="graphs/chartjs/chart.js?v=<?php echo $config['current_package']; ?>"></script>
<script language="javascript" type="text/javascript" src="graphs/chartjs/chartjs-plugin-datalabels.min.js"></script> <script language="javascript" type="text/javascript" src="graphs/chartjs/chartjs-plugin-datalabels.min.js?v=<?php echo $config['current_package']; ?>"></script>
</head> </head>
<body style='width:794px; margin: 0px; background-color: <?php echo $params['backgroundColor']; ?>;'> <body style='width:794px; margin: 0px; background-color: <?php echo $params['backgroundColor']; ?>;'>
<?php <?php

80
pandora_console/include/functions_html.php
View File

@ -515,7 +515,7 @@ function html_print_select_groups(
false, false,
false false
); );
$output .= '" type="text/javascript"></script>'; $output .= '?v='.$config['current_package'].'" type="text/javascript"></script>';
$output .= '<link rel="stylesheet" href="'; $output .= '<link rel="stylesheet" href="';
$output .= ui_get_full_url( $output .= ui_get_full_url(
@ -524,7 +524,7 @@ function html_print_select_groups(
false, false,
false false
); );
$output .= '"/>'; $output .= '?v='.$config['current_package'].'"/>';
} else { } else {
ui_require_css_file($select2_css); ui_require_css_file($select2_css);
ui_require_javascript_file('select2.min'); ui_require_javascript_file('select2.min');
@ -977,7 +977,7 @@ function html_print_select(
false, false,
false false
); );
$output .= '" type="text/javascript"></script>'; $output .= '?v='.$config['current_package'].'" type="text/javascript"></script>';
$output .= '<link rel="stylesheet" href="'; $output .= '<link rel="stylesheet" href="';
$output .= ui_get_full_url( $output .= ui_get_full_url(
@ -986,7 +986,7 @@ function html_print_select(
false, false,
false false
); );
$output .= '"/>'; $output .= '?v='.$config['current_package'].'"/>';
} else { } else {
ui_require_css_file($select2); ui_require_css_file($select2);
ui_require_javascript_file('select2.min'); ui_require_javascript_file('select2.min');
@ -1559,6 +1559,7 @@ function html_print_select_multiple_modules_filtered(array $data):string
$output .= html_print_input( $output .= html_print_input(
[ [
'label' => __('Group'), 'label' => __('Group'),
'label_class' => 'font-title-font',
'name' => 'filtered-module-group-'.$uniqId, 'name' => 'filtered-module-group-'.$uniqId,
'returnAllGroup' => $return_all_group, 'returnAllGroup' => $return_all_group,
'privilege' => 'AR', 'privilege' => 'AR',
@ -1572,14 +1573,15 @@ function html_print_select_multiple_modules_filtered(array $data):string
// Recursion. // Recursion.
$output .= html_print_input( $output .= html_print_input(
[ [
'label' => __('Recursion'), 'label' => __('Recursion'),
'type' => 'switch', 'label_class' => 'font-title-font',
'name' => 'filtered-module-recursion-'.$uniqId, 'type' => 'switch',
'value' => (empty($data['mRecursion']) === true) ? false : true, 'name' => 'filtered-module-recursion-'.$uniqId,
'checked' => (empty($data['mRecursion']) === true) ? false : true, 'value' => (empty($data['mRecursion']) === true) ? false : true,
'return' => true, 'checked' => (empty($data['mRecursion']) === true) ? false : true,
'id' => 'filtered-module-recursion-'.$uniqId, 'return' => true,
'onchange' => 'fmAgentChange(\''.$uniqId.'\')', 'id' => 'filtered-module-recursion-'.$uniqId,
'onchange' => 'fmAgentChange(\''.$uniqId.'\')',
] ]
); );
@ -1598,6 +1600,7 @@ function html_print_select_multiple_modules_filtered(array $data):string
$output .= html_print_input( $output .= html_print_input(
[ [
'label' => __('Module group'), 'label' => __('Module group'),
'label_class' => 'font-title-font',
'type' => 'select', 'type' => 'select',
'fields' => $module_groups, 'fields' => $module_groups,
'name' => 'filtered-module-module-group-'.$uniqId, 'name' => 'filtered-module-module-group-'.$uniqId,
@ -1682,15 +1685,16 @@ function html_print_select_multiple_modules_filtered(array $data):string
$output .= html_print_input( $output .= html_print_input(
[ [
'label' => __('Agents'), 'label' => __('Agents'),
'type' => 'select', 'label_class' => 'font-title-font',
'fields' => $agents, 'type' => 'select',
'name' => 'filtered-module-agents-'.$uniqId, 'fields' => $agents,
'selected' => explode(',', $data['mAgents']), 'name' => 'filtered-module-agents-'.$uniqId,
'return' => true, 'selected' => explode(',', $data['mAgents']),
'multiple' => true, 'return' => true,
'style' => 'min-width: 200px;max-width:200px;', 'multiple' => true,
'script' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')', 'style' => 'min-width: 200px;max-width:200px;',
'script' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')',
] ]
); );
@ -1701,14 +1705,15 @@ function html_print_select_multiple_modules_filtered(array $data):string
$output .= html_print_input( $output .= html_print_input(
[ [
'label' => __('Only common modules'), 'label' => __('Only common modules'),
'type' => 'switch', 'label_class' => 'font-title-font',
'checked' => $commonModules, 'type' => 'switch',
'value' => $commonModules, 'checked' => $commonModules,
'name' => 'filtered-module-show-common-modules-'.$uniqId, 'value' => $commonModules,
'id' => 'filtered-module-show-common-modules-'.$uniqId, 'name' => 'filtered-module-show-common-modules-'.$uniqId,
'return' => true, 'id' => 'filtered-module-show-common-modules-'.$uniqId,
'onchange' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')', 'return' => true,
'onchange' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')',
] ]
); );
@ -1742,14 +1747,15 @@ function html_print_select_multiple_modules_filtered(array $data):string
$output .= html_print_input( $output .= html_print_input(
[ [
'label' => __('Modules'), 'label' => __('Modules'),
'type' => 'select', 'label_class' => 'font-title-font',
'fields' => $all_modules, 'type' => 'select',
'name' => 'filtered-module-modules-'.$uniqId, 'fields' => $all_modules,
'selected' => $result, 'name' => 'filtered-module-modules-'.$uniqId,
'return' => true, 'selected' => $result,
'multiple' => true, 'return' => true,
'style' => 'min-width: 200px;max-width:200px;', 'multiple' => true,
'style' => 'min-width: 200px;max-width:200px;',
] ]
); );

62
pandora_console/include/functions_ui.php
View File

@ -1287,38 +1287,44 @@ function ui_format_alert_row(
$additionUrl = ''; $additionUrl = '';
} }
$forceExecButtons[] = html_print_button( $forceExecButtons[] = html_print_anchor(
$forceTitle, [
'force_execution_'.$alert['id'], 'href' => $url.'&amp;id_alert='.$alert['id'].'&amp;refr=60'.$additionUrl,
false, 'content' => html_print_image(
'window.location.assign("'.$url.'&amp;id_alert='.$alert['id'].'&amp;refr=60'.$additionUrl.'");', 'images/force@svg.svg',
[ 'mode' => 'link' ], true,
[
'title' => $forceTitle,
'class' => 'main_menu_icon invert_filter',
]
),
],
true true
); );
} }
$forceExecButtons[] = html_print_button( $forceExecButtons[] = html_print_anchor(
__('View'),
'view_template_'.$alert['id'],
false,
'',
[ [
'mode' => 'link', 'href' => 'ajax.php?page=godmode/alerts/alert_templates&get_template_tooltip=1&id_template='.$template['id'],
'class' => 'template_details', 'class' => 'template_details',
'href' => 'ajax.php?page=godmode/alerts/alert_templates&get_template_tooltip=1&id_template='.$template['id'], 'content' => html_print_image(
'images/details.svg',
true,
['class' => 'main_menu_icon invert_filter']
),
], ],
true true
); );
} else { } else {
$forceExecButtons[] = html_print_button( $forceExecButtons[] = html_print_anchor(
__('View'),
'view_template_'.$alert['id'],
false,
'',
[ [
'mode' => 'link', 'href' => ui_get_full_url('/', false, false, false).'/ajax.php?page=enterprise/meta/include/ajax/tree_view.ajax&action=get_template_tooltip&id_template='.$template['id'].'&server_name='.$alert['server_data']['server_name'],
'class' => 'template_details', 'class' => 'template_details',
'href' => ui_get_full_url('/', false, false, false).'/ajax.php?page=enterprise/meta/include/ajax/tree_view.ajax&action=get_template_tooltip&id_template='.$template['id'].'&server_name='.$alert['server_data']['server_name'], 'content' => html_print_image(
'images/details.svg',
true,
['class' => 'main_menu_icon invert_filter']
),
], ],
true true
); );
@ -2034,7 +2040,7 @@ function ui_process_page_head($string, $bitfield)
array_push($loaded, $name); array_push($loaded, $name);
$url_css = ui_get_full_url($filename, false, false, false); $url_css = ui_get_full_url($filename, false, false, false);
$output .= '<link rel="stylesheet" href="'.$url_css.'" type="text/css" />'."\n\t"; $output .= '<link rel="stylesheet" href="'.$url_css.'?v='.$config['current_package'].'" type="text/css" />'."\n\t";
} }
/* /*
@ -2091,7 +2097,7 @@ function ui_process_page_head($string, $bitfield)
array_push($loaded, $name); array_push($loaded, $name);
$url_js = ui_get_full_url($filename, false, false, false); $url_js = ui_get_full_url($filename, false, false, false);
$output .= '<script type="text/javascript" src="'.$url_js.'"></script>'."\n\t"; $output .= '<script type="text/javascript" src="'.$url_js.'?v='.$config['current_package'].'"></script>'."\n\t";
} }
/* /*
@ -2136,7 +2142,7 @@ function ui_process_page_head($string, $bitfield)
array_push($loaded, $name); array_push($loaded, $name);
$url_js = ui_get_full_url($filename, false, false, false); $url_js = ui_get_full_url($filename, false, false, false);
$output .= '<script type="text/javascript" src="'.$url_js.'"></script>'."\n\t"; $output .= '<script type="text/javascript" src="'.$url_js.'?v='.$config['current_package'].'"></script>'."\n\t";
} }
/* /*
@ -4147,7 +4153,7 @@ function ui_print_datatable(array $parameters)
false, false,
false false
); );
$output .= '"/>'; $output .= '?v='.$config['current_package'].'"/>';
// Load tables.css. // Load tables.css.
$output .= '<link rel="stylesheet" href="'; $output .= '<link rel="stylesheet" href="';
$output .= ui_get_full_url( $output .= ui_get_full_url(
@ -4156,7 +4162,7 @@ function ui_print_datatable(array $parameters)
false, false,
false false
); );
$output .= '"/>'; $output .= '?v='.$config['current_package'].'"/>';
if (is_metaconsole() === true) { if (is_metaconsole() === true) {
// Load meta_tables.css. // Load meta_tables.css.
$output .= '<link rel="stylesheet" href="'; $output .= '<link rel="stylesheet" href="';
@ -4166,7 +4172,7 @@ function ui_print_datatable(array $parameters)
false, false,
false false
); );
$output .= '"/>'; $output .= '?v='.$config['current_package'].'"/>';
} }
// Load datatables.js. // Load datatables.js.

2
pandora_console/include/graphs/functions_flot.php
View File

@ -51,7 +51,7 @@ function include_javascript_dependencies_flot_graph($return=false, $mobile=false
<script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/include/graphs/flot/jquery.flot.symbol.min.js').'"></script> <script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/include/graphs/flot/jquery.flot.symbol.min.js').'"></script>
<script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/include/graphs/flot/jquery.flot.exportdata.pandora.js').'"></script> <script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/include/graphs/flot/jquery.flot.exportdata.pandora.js').'"></script>
<script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/include/graphs/flot/jquery.flot.axislabels.js').'"></script> <script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/include/graphs/flot/jquery.flot.axislabels.js').'"></script>
<script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/include/graphs/flot/pandora.flot.js').'"></script>'; <script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/include/graphs/flot/pandora.flot.js').'?v='.$config['current_package'].'"></script>';
// Chartjs. // Chartjs.
$output .= '<script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/include/graphs/chartjs/chart.js').'"></script>'; $output .= '<script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/include/graphs/chartjs/chart.js').'"></script>';

25
pandora_console/include/styles/form.css
View File

@ -340,3 +340,28 @@ div.ui-tooltip.ui-corner-all.ui-widget-shadow.ui-widget.ui-widget-content.uitool
top: auto; top: auto;
} }
/* END Tooltip message errors*/ /* END Tooltip message errors*/
form.modal {
position: initial !important;
display: initial !important;
}
form#modal_form_feedback > ul > li {
visibility: initial !important;
display: initial !important;
flex-direction: initial !important;
width: initial !important;
margin: initial !important;
justify-items: initial !important;
align-items: initial !important;
flex-wrap: initial !important;
}
form#modal_form_feedback > ul > li > textarea {
width: 575px !important;
}
form#modal_form_feedback > ul > li:not(:first-child) > label {
margin-top: 20px !important;
}

18
pandora_console/include/styles/pandora.css
View File

@ -931,6 +931,10 @@ select:-internal-list-box {
justify-content: flex-start; justify-content: flex-start;
} }
.flex-align-start {
align-items: start;
}
.flex-baseline { .flex-baseline {
align-self: baseline; align-self: baseline;
} }
@ -7404,6 +7408,10 @@ div.graph div.legend table {
/* /*
* PADDING RIGHT * PADDING RIGHT
*/ */
.pdd_r_0px {
padding-right: 0px !important;
}
.pdd_r_2px { .pdd_r_2px {
padding-right: 2px; padding-right: 2px;
} }
@ -7475,6 +7483,10 @@ div.graph div.legend table {
/* /*
* PADDING LEFT * PADDING LEFT
*/ */
.pdd_l_0px {
padding-left: 0px !important;
}
.pdd_l_4px { .pdd_l_4px {
padding-left: 4px; padding-left: 4px;
} }
@ -11800,9 +11812,9 @@ span.help_icon_15px > img {
/* ==== Spinner ==== */ /* ==== Spinner ==== */
.spinner-fixed { .spinner-fixed {
position: fixed; position: absolute;
left: 50%; left: 40%;
bottom: 50%; top: 40%;
z-index: 1; z-index: 1;
width: 100px; width: 100px;
height: 100px; height: 100px;

2
pandora_console/index.php
View File

@ -233,7 +233,7 @@ ob_start('ui_process_page_head');
enterprise_include_once('index.php'); enterprise_include_once('index.php');
// Load event.css to display the about section dialog with correct styles. // Load event.css to display the about section dialog with correct styles.
echo '<link rel="stylesheet" href="'.ui_get_full_url('/include/styles/events.css', false, false, false).'" type="text/css" />'; echo '<link rel="stylesheet" href="'.ui_get_full_url('/include/styles/events.css', false, false, false).'?v='.$config['current_package'].'" type="text/css" />';
echo '<script type="text/javascript">'; echo '<script type="text/javascript">';
echo 'var dispositivo = navigator.userAgent.toLowerCase();'; echo 'var dispositivo = navigator.userAgent.toLowerCase();';

8
pandora_console/operation/agentes/alerts_status.php
View File

@ -233,6 +233,7 @@ if ((bool) check_acl($config['id_user'], $id_group, 'LW') === true || (bool) che
[ [
'title' => __('Operations'), 'title' => __('Operations'),
'text' => __('Operations'), 'text' => __('Operations'),
'class' => 'left pdd_l_0px pdd_r_0px w100p',
], ],
); );
@ -317,6 +318,7 @@ if (is_metaconsole() === true) {
$no_sortable_columns = [ $no_sortable_columns = [
0, 0,
1, 1,
2,
5, 5,
]; ];
} else { } else {
@ -514,10 +516,14 @@ function alerts_table_controls() {
attribute: 'href', attribute: 'href',
cluetipClass: 'default' cluetipClass: 'default'
}).click (function () { }).click (function () {
console.log('click aqui');
return false; return false;
}); });
$("a.template_details").cluetip ({
arrows: true,
attribute: 'href',
cluetipClass: 'default'
});
$('[id^=checkbox-all_validate]').change(function(){ $('[id^=checkbox-all_validate]').change(function(){
if ($("#checkbox-all_validate").prop("checked")) { if ($("#checkbox-all_validate").prop("checked")) {

18
pandora_console/operation/agentes/interface_traffic_graph_win.php
View File

@ -67,7 +67,7 @@ if (file_exists('../../include/languages/'.$user_language.'.mo')) {
$l10n->load_tables(); $l10n->load_tables();
} }
echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css"/>'; echo '<link rel="stylesheet" href="../../include/styles/pandora.css?v='.$config['current_package'].'" type="text/css"/>';
if ($config['style'] === 'pandora_black' && !is_metaconsole()) { if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
ui_require_css_file('pandora_black', 'include/styles/', true); ui_require_css_file('pandora_black', 'include/styles/', true);
} }
@ -93,14 +93,14 @@ if ($refresh > 0) {
?> ?>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php echo __('%s Interface Graph', get_product_name()).' ('.agents_get_alias($agent_id).' - '.$interface_name; ?>)</title> <title><?php echo __('%s Interface Graph', get_product_name()).' ('.agents_get_alias($agent_id).' - '.$interface_name; ?>)</title>
<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" /> <link rel="stylesheet" href="../../include/styles/pandora_minimal.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
<link rel="stylesheet" href="../../include/styles/js/jquery-ui.min.css" type="text/css" /> <link rel="stylesheet" href="../../include/styles/js/jquery-ui.min.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
<link rel="stylesheet" href="../../include/styles/select2.min.css" type="text/css" /> <link rel="stylesheet" href="../../include/styles/select2.min.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
<script type='text/javascript' src='../../include/javascript/pandora.js'></script> <script type='text/javascript' src='../../include/javascript/pandora.js?v=<?php echo $config['current_package']; ?>'></script>
<script type='text/javascript' src='../../include/javascript/jquery.current.js'></script> <script type='text/javascript' src='../../include/javascript/jquery.current.js?v=<?php echo $config['current_package']; ?>'></script>
<script type='text/javascript' src='../../include/javascript/jquery.pandora.js'></script> <script type='text/javascript' src='../../include/javascript/jquery.pandora.js?v=<?php echo $config['current_package']; ?>'></script>
<script type='text/javascript' src='../../include/javascript/jquery-ui.min.js'></script> <script type='text/javascript' src='../../include/javascript/jquery-ui.min.js?v=<?php echo $config['current_package']; ?>'></script>
<script type='text/javascript' src='../../include/javascript/select2.min.js'></script> <script type='text/javascript' src='../../include/javascript/select2.min.js?v=<?php echo $config['current_package']; ?>'></script>
<?php <?php
require_once $config['homedir'].'/include/graphs/functions_flot.php'; require_once $config['homedir'].'/include/graphs/functions_flot.php';
echo include_javascript_dependencies_flot_graph(true, '../'); echo include_javascript_dependencies_flot_graph(true, '../');

16
pandora_console/operation/agentes/realtime_win.php
View File

@ -68,7 +68,7 @@ if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
ui_require_css_file('pandora_black', 'include/styles/', true); ui_require_css_file('pandora_black', 'include/styles/', true);
} }
echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css"/>'; echo '<link rel="stylesheet" href="../../include/styles/pandora.css?v='.$config['current_package'].'" type="text/css"/>';
?> ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
@ -83,13 +83,13 @@ echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/
?> ?>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php echo __('%s Realtime Module Graph', get_product_name()); ?></title> <title><?php echo __('%s Realtime Module Graph', get_product_name()); ?></title>
<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" /> <link rel="stylesheet" href="../../include/styles/pandora_minimal.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
<link rel="stylesheet" href="../../include/styles/js/jquery-ui.min.css" type="text/css" /> <link rel="stylesheet" href="../../include/styles/js/jquery-ui.min.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
<script type='text/javascript' src='../../include/javascript/pandora.js'></script> <script type='text/javascript' src='../../include/javascript/pandora.js?v=<?php echo $config['current_package']; ?>'></script>
<script type='text/javascript' src='../../include/javascript/pandora_ui.js'></script> <script type='text/javascript' src='../../include/javascript/pandora_ui.js?v=<?php echo $config['current_package']; ?>'></script>
<script type='text/javascript' src='../../include/javascript/jquery.current.js'></script> <script type='text/javascript' src='../../include/javascript/jquery.current.js?v=<?php echo $config['current_package']; ?>'></script>
<script type='text/javascript' src='../../include/javascript/jquery.pandora.js'></script> <script type='text/javascript' src='../../include/javascript/jquery.pandora.js?v=<?php echo $config['current_package']; ?>'></script>
<script type='text/javascript' src='../../include/javascript/jquery-ui.min.js'></script> <script type='text/javascript' src='../../include/javascript/jquery-ui.min.js?v=<?php echo $config['current_package']; ?>'></script>
<?php <?php
// Include the javascript for the js charts library. // Include the javascript for the js charts library.
require_once $config['homedir'].'/include/graphs/functions_flot.php'; require_once $config['homedir'].'/include/graphs/functions_flot.php';

6
pandora_console/operation/agentes/snapshot_view.php
View File

@ -80,15 +80,15 @@ if (!check_acl_one_of_groups($config['id_user'], $all_groups, 'AR')) {
$query = ui_get_url_refresh(false); $query = ui_get_url_refresh(false);
echo '<meta http-equiv="refresh" content="'.$refresh.'; URL='.$query.'" />'; echo '<meta http-equiv="refresh" content="'.$refresh.'; URL='.$query.'" />';
if ($config['style'] === 'pandora_black' && !is_metaconsole()) { if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
echo '<link rel="stylesheet" href="../../include/styles/pandora_black.css" type="text/css"/>'; echo '<link rel="stylesheet" href="../../include/styles/pandora_black.css?v='.$config['current_package'].'" type="text/css"/>';
} else { } else {
echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css"/>'; echo '<link rel="stylesheet" href="../../include/styles/pandora.css?v='.$config['current_package'].'" type="text/css"/>';
} }
} }
?> ?>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php echo __('%s Snapshot data view for module (%s)', get_product_name(), $label); ?></title> <title><?php echo __('%s Snapshot data view for module (%s)', get_product_name(), $label); ?></title>
<script type='text/javascript' src='../../include/javascript/jquery.current.js'></script> <script type='text/javascript' src='../../include/javascript/jquery.current.js?v=<?php echo $config['current_package']; ?>'></script>
</head> </head>
<body class=''> <body class=''>
<?php <?php

24
pandora_console/operation/agentes/stat_win.php
View File

@ -65,10 +65,10 @@ if (file_exists('../../include/languages/'.$user_language.'.mo')) {
} }
global $config; global $config;
echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css"/>'; echo '<link rel="stylesheet" href="../../include/styles/pandora.css?v='.$config['current_package'].'" type="text/css"/>';
if ($config['style'] === 'pandora_black' && !is_metaconsole()) { if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
echo '<link rel="stylesheet" href="../../include/styles/pandora_black.css" type="text/css"/>'; echo '<link rel="stylesheet" href="../../include/styles/pandora_black.css?v='.$config['current_package'].'" type="text/css"/>';
} }
@ -114,16 +114,16 @@ ui_print_message_dialog(
?> ?>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php echo __('%s Graph', get_product_name()).' ('.$alias.' - '.$label; ?>)</title> <title><?php echo __('%s Graph', get_product_name()).' ('.$alias.' - '.$label; ?>)</title>
<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" /> <link rel="stylesheet" href="../../include/styles/pandora_minimal.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
<link rel="stylesheet" href="../../include/styles/js/jquery-ui.min.css" type="text/css" /> <link rel="stylesheet" href="../../include/styles/js/jquery-ui.min.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
<link rel="stylesheet" href="../../include/styles/js/jquery-ui_custom.css" type="text/css" /> <link rel="stylesheet" href="../../include/styles/js/jquery-ui_custom.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
<link rel="stylesheet" href="../../include/styles/select2.min.css" type="text/css" /> <link rel="stylesheet" href="../../include/styles/select2.min.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
<script type='text/javascript' src='../../include/javascript/pandora_ui.js'></script> <script type='text/javascript' src='../../include/javascript/pandora_ui.js?v=<?php echo $config['current_package']; ?>'></script>
<script type='text/javascript' src='../../include/javascript/jquery.current.js'></script> <script type='text/javascript' src='../../include/javascript/jquery.current.js?v=<?php echo $config['current_package']; ?>'></script>
<script type='text/javascript' src='../../include/javascript/jquery.pandora.js'></script> <script type='text/javascript' src='../../include/javascript/jquery.pandora.js?v=<?php echo $config['current_package']; ?>'></script>
<script type='text/javascript' src='../../include/javascript/jquery-ui.min.js'></script> <script type='text/javascript' src='../../include/javascript/jquery-ui.min.js?v=<?php echo $config['current_package']; ?>'></script>
<script type='text/javascript' src='../../include/javascript/select2.min.js'></script> <script type='text/javascript' src='../../include/javascript/select2.min.js?v=<?php echo $config['current_package']; ?>'></script>
<script type='text/javascript' src='../../include/javascript/pandora.js'></script> <script type='text/javascript' src='../../include/javascript/pandora.js?v=<?php echo $config['current_package']; ?>'></script>
<?php <?php
require_once $config['homedir'].'/include/graphs/functions_flot.php'; require_once $config['homedir'].'/include/graphs/functions_flot.php';
echo include_javascript_dependencies_flot_graph(true, '../'); echo include_javascript_dependencies_flot_graph(true, '../');

4
pandora_console/operation/events/sound_events.php
View File

@ -154,9 +154,9 @@ ui_require_css_file('discovery');
<?php <?php
echo '<link rel="icon" href="../../'.ui_get_favicon().'" type="image/ico" />'; echo '<link rel="icon" href="../../'.ui_get_favicon().'" type="image/ico" />';
if ($config['style'] === 'pandora_black' && !is_metaconsole()) { if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
echo '<link rel="stylesheet" href="../../include/styles/pandora_black.css" type="text/css" />'; echo '<link rel="stylesheet" href="../../include/styles/pandora_black.css?v='.$config['current_package'].'" type="text/css" />';
} else { } else {
echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css" />'; echo '<link rel="stylesheet" href="../../include/styles/pandora.css?v='.$config['current_package'].'" type="text/css" />';
} }
echo '</head>'; echo '</head>';

4
pandora_console/operation/visual_console/legacy_public_view.php
View File

@ -45,12 +45,12 @@ ob_start('ui_process_page_head');
enterprise_include('index.php'); enterprise_include('index.php');
$url_css = ui_get_full_url('include/styles/visual_maps.css', false, false, false); $url_css = ui_get_full_url('include/styles/visual_maps.css', false, false, false);
echo '<link rel="stylesheet" href="'.$url_css.'" type="text/css" />'; echo '<link rel="stylesheet" href="'.$url_css.'?v='.$config['current_package'].'" type="text/css" />';
html_print_input_hidden('homeurl', $config['homeurl']); html_print_input_hidden('homeurl', $config['homeurl']);
$url_css_modal = ui_get_full_url('include/styles/register.css', false, false, false); $url_css_modal = ui_get_full_url('include/styles/register.css', false, false, false);
echo '<link rel="stylesheet" href="'.$url_css_modal.'" type="text/css" />'; echo '<link rel="stylesheet" href="'.$url_css_modal.'?v='.$config['current_package'].'" type="text/css" />';
// Connection lost alert. // Connection lost alert.
ui_require_javascript_file('connection_check', 'include/javascript/', true); ui_require_javascript_file('connection_check', 'include/javascript/', true);
set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false)); set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false));

2
pandora_console/operation/visual_console/public_view.php
View File

@ -56,7 +56,7 @@ ob_start('ui_process_page_head');
enterprise_include('index.php'); enterprise_include('index.php');
$url_css = ui_get_full_url('include/styles/visual_maps.css', false, false, false); $url_css = ui_get_full_url('include/styles/visual_maps.css', false, false, false);
echo '<link rel="stylesheet" href="'.$url_css.'" type="text/css" />'; echo '<link rel="stylesheet" href="'.$url_css.'?v='.$config['current_package'].'" type="text/css" />';
require_once 'include/functions_visual_map.php'; require_once 'include/functions_visual_map.php';

20
pandora_console/pandoradb_data.sql
View File

@ -51,16 +51,16 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
('show_lastalerts','1'), ('show_lastalerts','1'),
('style','pandora'), ('style','pandora'),
('graph_image_height', '250'), ('graph_image_height', '250'),
('graph_color1', '#1c7973'), ('graph_color1', '#1d7773'),
('graph_color2', '#82b92f'), ('graph_color2', '#82b92d'),
('graph_color3', '#e82a2a'), ('graph_color3', '#fa4143'),
('graph_color4', '#8577cf'), ('graph_color4', '#c0d7ea'),
('graph_color5', '#f5a623'), ('graph_color5', '#f3712a'),
('graph_color6', '#14524f'), ('graph_color6', '#7151cb'),
('graph_color7', '#024eff'), ('graph_color7', '#287ca2'),
('graph_color8', '#18c7c5'), ('graph_color8', '#42aa8b'),
('graph_color9', '#ec7175'), ('graph_color9', '#d54f6b'),
('graph_color10', '#c0ccdc'), ('graph_color10', '#f9c64e'),
('trap2agent', '0'), ('trap2agent', '0'),
('date_format', 'F j, Y, g:i a'), ('date_format', 'F j, Y, g:i a'),
('event_view_hr', 8), ('event_view_hr', 8),

8
pandora_console/update_manager_client/views/offline.php
View File

@ -27,7 +27,7 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* ============================================================================ * ============================================================================
*/ */
global $config;
?> ?>
<head> <head>
@ -39,12 +39,12 @@
document.write('<script type="text/javascript" src="<?php echo $asset('resources/javascript/jquery.fileupload.js'); ?>"></'+'script>'); document.write('<script type="text/javascript" src="<?php echo $asset('resources/javascript/jquery.fileupload.js'); ?>"></'+'script>');
} }
</script> </script>
<script src="<?php $asset('resources/javascript/umc.js'); ?>" type="text/javascript"></script> <script src="<?php $asset('resources/javascript/umc.js'); ?>?v=<?php echo $config['current_package']; ?>" type="text/javascript"></script>
<script src="<?php $asset('resources/javascript/umc_offline.js'); ?>" type="text/javascript"></script> <script src="<?php $asset('resources/javascript/umc_offline.js'); ?>?v=<?php echo $config['current_package']; ?>" type="text/javascript"></script>
<script src="<?php $asset('resources/javascript/jquery.fileupload.js'); ?>" type="text/javascript"></script> <script src="<?php $asset('resources/javascript/jquery.fileupload.js'); ?>" type="text/javascript"></script>
<script src="<?php $asset('resources/javascript/jquery.iframe-transport.js'); ?>" type="text/javascript"></script> <script src="<?php $asset('resources/javascript/jquery.iframe-transport.js'); ?>" type="text/javascript"></script>
<script src="<?php $asset('resources/javascript/jquery.knob.js'); ?>" type="text/javascript"></script> <script src="<?php $asset('resources/javascript/jquery.knob.js'); ?>" type="text/javascript"></script>
<link rel="stylesheet" href="<?php $asset('resources/styles/um.css'); ?>"> <link rel="stylesheet" href="<?php $asset('resources/styles/um.css'); ?>?v=<?php echo $config['current_package']; ?>">
</head> </head>
<div id="box_offline"> <div id="box_offline">

6
pandora_console/update_manager_client/views/online.php
View File

@ -27,11 +27,11 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* ============================================================================ * ============================================================================
*/ */
global $config;
?> ?>
<head> <head>
<link rel="stylesheet" href="<?php $asset('resources/styles/um.css'); ?>"> <link rel="stylesheet" href="<?php $asset('resources/styles/um.css'); ?>?v=<?php echo $config['current_package']; ?>">
<script src="<?php $asset('resources/javascript/umc.js'); ?>" type="text/javascript"></script> <script src="<?php $asset('resources/javascript/umc.js'); ?>?v=<?php echo $config['current_package']; ?>" type="text/javascript"></script>
</head> </head>

5
pandora_console/update_manager_client/views/register.php
View File

@ -28,6 +28,7 @@
* ============================================================================ * ============================================================================
*/ */
global $config;
$product_name = get_product_name(); ?> $product_name = get_product_name(); ?>
<head> <head>
@ -39,8 +40,8 @@ $product_name = get_product_name(); ?>
} }
</script> </script>
<script src="<?php $asset('resources/javascript/umc.js'); ?>" type="text/javascript"></script> <script src="<?php $asset('resources/javascript/umc.js'); ?>" type="text/javascript"></script>
<link rel="stylesheet" href="<?php $asset('resources/styles/jquery-ui.min.css'); ?>"> <link rel="stylesheet" href="<?php $asset('resources/styles/jquery-ui.min.css'); ?>?v=<?php echo $config['current_package']; ?>">
<link rel="stylesheet" href="<?php $asset('resources/styles/um.css'); ?>"> <link rel="stylesheet" href="<?php $asset('resources/styles/um.css'); ?>?v=<?php echo $config['current_package']; ?>">
</head> </head>
<div id="registration_wizard" title=" <div id="registration_wizard" title="

5
tentacle/tentacle_server
View File

@ -899,8 +899,11 @@ sub serve_client() {
serve_proxy_connection (); serve_proxy_connection ();
} else { } else {
serve_connection (); serve_connection ();
} }
}; };
if($@) {
print_info($@);
}
$t_client_socket->shutdown (2); $t_client_socket->shutdown (2);
$t_client_socket->close (); $t_client_socket->close ();