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

Merge remote-tracking branch 'origin/develop' into ent-9676-modulos-de-inventario-se-actualicen-datos-cuando-venga-el-xml-con-nombre-y-sin-datos

Browse Source
This commit is contained in:
Calvo 2023-04-03 10:25:58 +02:00
commit 764823c93f
93 changed files with 1473 additions and 1163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix package: pandorafms-agent-unix
Version: 7.0NG.770-230330 Version: 7.0NG.770-230403
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# 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. # GNU General Public License for more details.
pandora_version="7.0NG.770-230330" pandora_version="7.0NG.770-230403"
echo "Test if you has the tools for to make the packages." echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

@ -1023,7 +1023,7 @@ my $Sem = undef;
my $ThreadSem = undef; my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.770'; use constant AGENT_VERSION => '7.0NG.770';
use constant AGENT_BUILD => '230330'; use constant AGENT_BUILD => '230403';
# Agent log default file size maximum and instances # Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000; use constant DEFAULT_MAX_LOG_SIZE => 600000;

2
pandora_agents/unix/pandora_agent.redhat.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil} %global __os_install_post %{nil}
%define name pandorafms_agent_linux %define name pandorafms_agent_linux
%define version 7.0NG.770 %define version 7.0NG.770
%define release 230330 %define release 230403
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil} %global __os_install_post %{nil}
%define name pandorafms_agent_linux %define name pandorafms_agent_linux
%define version 7.0NG.770 %define version 7.0NG.770
%define release 230330 %define release 230403
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.770" PI_VERSION="7.0NG.770"
PI_BUILD="230330" PI_BUILD="230403"
OS_NAME=`uname -s` OS_NAME=`uname -s`
FORCE=0 FORCE=0

2
pandora_agents/win32/installer/pandora.mpi
View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{} {}
Version Version
{230330} {230403}
ViewReadme ViewReadme
{Yes} {Yes}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils; using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1 #define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("7.0NG.770 Build 230330") #define PANDORA_VERSION ("7.0NG.770 Build 230403")
string pandora_path; string pandora_path;
string pandora_dir; string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST" VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent" VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.770(Build 230330))" VALUE "ProductVersion", "(7.0NG.770(Build 230403))"
VALUE "FileVersion", "1.0.0.0" VALUE "FileVersion", "1.0.0.0"
END END
END END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console package: pandorafms-console
Version: 7.0NG.770-230330 Version: 7.0NG.770-230403
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# 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. # GNU General Public License for more details.
pandora_version="7.0NG.770-230330" pandora_version="7.0NG.770-230403"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

17
pandora_console/extensions/agents_modules.php
View File

@ -259,6 +259,14 @@ function agents_modules_load_js()
return results[1]; return results[1];
} }
} }
function select_selected () {
// $('#id_agents2 option').each(function(){
// if($(this).attr('selected') === 'selected'){
// $(this).prop('selected', true);
// }
// });
}
</script> </script>
<?php <?php
} }
@ -645,7 +653,7 @@ function mainAgentsModules()
} }
if ($config['pure'] != 1) { if ($config['pure'] != 1) {
$show_filters = '<form method="post" action="'.ui_get_url_refresh(['offset' => $offset, 'hor_offset' => $offset, 'group_id' => $group_id, 'modulegroup' => $modulegroup]).'" class="w100p">'; $show_filters = '<form method="post" action="index.php?sec=view&sec2=extensions/agents_modules" class="w100p">';
$show_filters .= '<table class="filter-table-adv w100p no-border" cellpadding="4" cellspacing="4">'; $show_filters .= '<table class="filter-table-adv w100p no-border" cellpadding="4" cellspacing="4">';
$show_filters .= '<tr>'; $show_filters .= '<tr>';
$show_filters .= '<td width="33%">'.$filter_type.'</td>'; $show_filters .= '<td width="33%">'.$filter_type.'</td>';
@ -666,8 +674,9 @@ function mainAgentsModules()
'srcbutton', 'srcbutton',
false, false,
[ [
'icon' => 'search', 'icon' => 'search',
'mode' => 'mini', 'mode' => 'mini',
'onclick' => 'select_selected()',
], ],
true true
), ),
@ -729,7 +738,7 @@ function mainAgentsModules()
if (isset($modules_selected[0]) === true && $modules_selected[0]) { if (isset($modules_selected[0]) === true && $modules_selected[0]) {
$all_modules = []; $all_modules = [];
foreach ($modules_selected as $key => $value) { foreach ($modules_selected as $key => $value) {
if (is_int($value)) { if ((int) $value > 0) {
$name = modules_get_agentmodule_name($value); $name = modules_get_agentmodule_name($value);
$sql = "SELECT id_agente_modulo $sql = "SELECT id_agente_modulo
FROM tagente_modulo FROM tagente_modulo

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.

31
pandora_console/general/news_dialog.php
View File

@ -39,7 +39,6 @@ if (!empty($news)) {
// Prints news dialog template // Prints news dialog template
echo '<div id="news_dialog" class="invisible">'; echo '<div id="news_dialog" class="invisible">';
echo '<div class="parent_new_dialog_tmplt">'; echo '<div class="parent_new_dialog_tmplt">';
echo '<span id="new_text"></span>'; echo '<span id="new_text"></span>';
echo '<span id="new_author"></span>'; echo '<span id="new_author"></span>';
@ -48,14 +47,22 @@ echo '<div id="news_dialog" class="invisible">';
echo '<div id="div_btn_new_dialog">'; echo '<div id="div_btn_new_dialog">';
echo '<div class="float-right w20p">'; echo '<div class="float-right w20p">';
html_print_submit_button('Ok', 'hide-news-help', false, 'class="ui-button-dialog ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok w100px";"'); html_print_submit_button(
'Ok',
'hide-news-help',
false,
[
'mode' => 'ui-widget ok mini',
'icon' => 'wand',
]
);
echo '</div>';
echo '</div>'; echo '</div>';
echo '</div>';
echo '</div>'; echo '</div>';
ui_require_javascript_file('encode_decode_base64'); ui_require_javascript_file('encode_decode_base64');
?> ?>
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">
/* <![CDATA[ */ /* <![CDATA[ */
@ -82,22 +89,22 @@ $(document).ready (function () {
width: 630, width: 630,
title: news[inew].subject, title: news[inew].subject,
overlay: { overlay: {
opacity: 0.5, opacity: 0.5,
background: "black" background: "black"
} }
}); });
$('.ui-dialog-titlebar-close').hide(); $('.ui-dialog-titlebar-close').hide();
} }
} }
$("#submit-hide-news-help").click (function () { $("#button-hide-news-help").click (function () {
$("#news_dialog" ).dialog('close'); $("#news_dialog" ).dialog('close');
inew++; inew++;
show_new (); show_new();
}); });
show_new (); show_new();
} }
}); });

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/inventory_manager.php
View File

@ -267,7 +267,7 @@ if (db_get_num_rows($sql) == 0) {
$data[5] .= '</b></a>&nbsp;&nbsp;'; $data[5] .= '</b></a>&nbsp;&nbsp;';
// Force refresh module // Force refresh module
$data[5] .= '<a href="index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=inventory&id_agente='.$id_agente.'&force_inventory_module='.$row['id_agent_module_inventory'].'">'; $data[5] .= '<a href="index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=inventory&id_agente='.$id_agente.'&force_inventory_module='.$row['id_agent_module_inventory'].'">';
$data[5] .= html_print_image('images/change-active.svg', true, ['border' => '0', 'title' => __('Force'), 'class' => 'main_menu_icon invert_filter']).'</b></a>'; $data[5] .= html_print_image('images/force@svg.svg', true, ['border' => '0', 'title' => __('Force'), 'class' => 'main_menu_icon invert_filter']).'</b></a>';
array_push($table->data, $data); array_push($table->data, $data);
} }

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

@ -563,7 +563,14 @@ if ($search != '') {
if ($id != '') { if ($id != '') {
$aux = $id[0]['id_agent']; $aux = $id[0]['id_agent'];
$search_sql = sprintf( $search_sql = sprintf(
' AND ( `nombre` LIKE "%%%s%%" OR tagente.id_agente = %d', ' AND ( nombre LIKE "%%%s%%"
OR alias LIKE "%%%s%%"
OR comentarios LIKE "%%%s%%"
OR EXISTS (SELECT * FROM tagent_custom_data WHERE id_agent = id_agente AND description LIKE "%%%s%%")
OR tagente.id_agente = %d',
$search,
$search,
$search,
$search, $search,
$aux $aux
); );
@ -776,7 +783,7 @@ if ($agents !== false) {
} }
if ((bool) $agent['disabled'] === true) { if ((bool) $agent['disabled'] === true) {
$additionalDataAgentName[] = ui_print_help_tip(__('Disabled')); $additionalDataAgentName[] = ui_print_help_tip(__('Disabled'), true);
} }
if ((bool) $agent['quiet'] === true) { if ((bool) $agent['quiet'] === true) {
@ -903,12 +910,12 @@ if ($agents !== false) {
if ((bool) $agent['disabled'] === true) { if ((bool) $agent['disabled'] === true) {
$agentDisableEnableTitle = __('Enable agent'); $agentDisableEnableTitle = __('Enable agent');
$agentDisableEnableAction = 'enable_agent'; $agentDisableEnableAction = 'enable';
$agentDisableEnableCaption = __('You are going to enable a cluster agent. Are you sure?'); $agentDisableEnableCaption = __('You are going to enable a cluster agent. Are you sure?');
$agentDisableEnableIcon = 'change-active.svg'; $agentDisableEnableIcon = 'change-active.svg';
} else { } else {
$agentDisableEnableTitle = __('Disable agent'); $agentDisableEnableTitle = __('Disable agent');
$agentDisableEnableAction = 'disable_agent'; $agentDisableEnableAction = 'disable';
$agentDisableEnableCaption = __('You are going to disable a cluster agent. Are you sure?'); $agentDisableEnableCaption = __('You are going to disable a cluster agent. Are you sure?');
$agentDisableEnableIcon = 'change-pause.svg'; $agentDisableEnableIcon = 'change-pause.svg';
} }
@ -1001,7 +1008,7 @@ if ($agents !== false) {
true, true,
'offset', 'offset',
false, false,
'dataTables_paginate paging_simple_numbers' 'paging_simple_numbers'
); );
/* /*

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.

28
pandora_console/godmode/agentes/status_monitor_custom_fields.php
View File

@ -30,6 +30,26 @@ if (! check_acl($config['id_user'], 0, 'AR')
$update = get_parameter('upd_button', ''); $update = get_parameter('upd_button', '');
$default = (int) get_parameter('default', 0); $default = (int) get_parameter('default', 0);
// Header.
ui_print_standard_header(
__('Monitor detail').$subpage,
'images/agent.png',
false,
'',
true,
$buttons,
[
[
'link' => '',
'label' => __('Monitoring'),
],
[
'link' => '',
'label' => __('Views'),
],
],
(empty($fav_menu) === true) ? [] : $fav_menu
);
if ($default != 0) { if ($default != 0) {
$fields_selected = explode(',', $config['status_monitor_fields']); $fields_selected = explode(',', $config['status_monitor_fields']);
@ -161,11 +181,11 @@ foreach ($fields_available as $key => $available) {
// General title. // General title.
$generalTitleContent = []; $generalTitleContent = [];
$generalTitleContent[] = html_print_div([ 'style' => 'width: 10px; flex: 0 0 auto; margin-right: 5px;}', 'class' => 'section_table_title_line' ], true); // $generalTitleContent[] = html_print_div([ 'style' => 'width: 10px; flex: 0 0 auto; margin-right: 5px;}', 'class' => 'section_table_title_line' ], true);
$generalTitleContent[] = html_print_div([ 'class' => 'section_table_title', 'content' => __('Show monitor detail fields')], true); $generalTitleContent[] = html_print_div([ 'class' => 'section_table_title', 'content' => __('Show monitor detail fields')], true);
$titledata[0] = html_print_div(['class' => 'flex-row-center', 'content' => implode('', $generalTitleContent) ], true); $titledata[0] = html_print_div(['class' => 'flex-row-center', 'content' => implode('', $generalTitleContent) ], true);
$table->data['general_title'] = $titledata; $table->data['general_title'] = $titledata;
$table->data[0][0] = '<b>'.__('Fields available').'</b>'; $table->data[0][0] = '<span class="font-title-font">'.__('Fields available').'</span>';
$table->data[1][0] = html_print_select($fields_available, 'fields_available[]', true, '', '', 0, true, true, false, '', false, 'width: 300px'); $table->data[1][0] = html_print_select($fields_available, 'fields_available[]', true, '', '', 0, true, true, false, '', false, 'width: 300px');
$table->data[1][1] = '<a href="javascript:">'.html_print_image( $table->data[1][1] = '<a href="javascript:">'.html_print_image(
'images/darrowright.png', 'images/darrowright.png',
@ -187,7 +207,7 @@ $table->data[1][1] .= '<br><br><br><br><a href="javascript:">'.html_print_image(
).'</a>'; ).'</a>';
$table->data[0][1] = ''; $table->data[0][1] = '';
$table->data[0][2] = '<b>'.__('Fields selected').'</b>'; $table->data[0][2] = '<span class="font-title-font">'.__('Fields selected').'</span>';
$table->data[1][2] = html_print_select( $table->data[1][2] = html_print_select(
$result_selected, $result_selected,
'fields_selected[]', 'fields_selected[]',
@ -203,7 +223,7 @@ $table->data[1][2] = html_print_select(
'width: 300px' 'width: 300px'
); );
echo '<form id="custom_status_monitor" method="post" action="index.php?sec=view&sec2=operation/agentes/status_monitor&section=fields&amp;pure='.$config['pure'].'">'; echo '<form id="custom_status_monitor" method="post" action="index.php?sec=view&sec2=operation/agentes/status_monitor&section=fields&amp;pure='.$config['pure'].'" class="max_floating_element_size">';
html_print_table($table); html_print_table($table);
html_print_action_buttons( html_print_action_buttons(

12
pandora_console/godmode/consoles/consoles.php
View File

@ -54,12 +54,6 @@ $results = db_get_all_rows_in_table('tconsole');
$message = ''; $message = '';
if ($results === false) {
$message = ui_print_info_message(
__('If you want to have your consoles registered, you must define them by editing config.php in each individual console and wait for cron to run in order to be registered.')
);
}
View::render( View::render(
'consoles/list', 'consoles/list',
[ [
@ -67,3 +61,9 @@ View::render(
'message' => $message, 'message' => $message,
] ]
); );
if ($results === false) {
$message = ui_print_info_message(
__('If you want to have your consoles registered, you must define them by editing config.php in each individual console and wait for cron to run in order to be registered.')
);
}

4
pandora_console/godmode/massive/massive_edit_agents.php
View File

@ -1257,11 +1257,11 @@ echo '<h3 class="error invisible" id="message"> </h3>';
html_print_input_hidden('id_agente', $id_agente); html_print_input_hidden('id_agente', $id_agente);
echo '</div>';
attachActionButton('update_agents', 'update', $table->width, false, $SelectAction); attachActionButton('update_agents', 'update', $table->width, false, $SelectAction);
echo '</form>';
// Shown and hide div. // Shown and hide div.
echo '</div></form>';
ui_require_jquery_file('form'); ui_require_jquery_file('form');
ui_require_jquery_file('pandora.controls'); ui_require_jquery_file('pandora.controls');
ui_require_jquery_file('ajaxqueue'); ui_require_jquery_file('ajaxqueue');

1
pandora_console/godmode/massive/massive_edit_users.php
View File

@ -555,6 +555,7 @@ echo sprintf(
$status $status
); );
echo '</div>'; echo '</div>';
echo '</div>';
attachActionButton('edit_users', 'update', '100%', false, $SelectAction); attachActionButton('edit_users', 'update', '100%', false, $SelectAction);

2
pandora_console/godmode/massive/massive_enable_disable_alerts.php
View File

@ -249,6 +249,8 @@ $table->data[5][1] .= '</form>';
html_print_table($table); html_print_table($table);
html_print_action_buttons('', ['right_content' => $SelectAction, 'class' => 'pdd_b_10px_important pdd_t_10px_important']);
echo '<h3 class="error invisible" id="message"> </h3>'; echo '<h3 class="error invisible" id="message"> </h3>';
ui_require_jquery_file('form'); ui_require_jquery_file('form');

4
pandora_console/godmode/massive/massive_operations.php
View File

@ -448,7 +448,9 @@ if ($option === 'edit_agents' || $option === 'edit_modules') {
$tip = ui_print_help_tip(__('The blank fields will not be updated'), true); $tip = ui_print_help_tip(__('The blank fields will not be updated'), true);
} }
$SelectAction = '<form method="post" id="form_options" action="'.$url.'">'; global $SelectAction;
$SelectAction = '<form id="form_necesario" method="post" id="form_options" action="'.$url.'">';
$SelectAction .= '<span class="mrgn_lft_10px mrgn_right_10px">'._('Action').'</span>'; $SelectAction .= '<span class="mrgn_lft_10px mrgn_right_10px">'._('Action').'</span>';
$SelectAction .= html_print_select( $SelectAction .= html_print_select(
$options, $options,

2
pandora_console/godmode/massive/massive_standby_alerts.php
View File

@ -277,6 +277,8 @@ $table->data[5][1] .= '</form>';
html_print_table($table); html_print_table($table);
html_print_action_buttons('', ['right_content' => $SelectAction, 'class' => 'pdd_b_10px_important pdd_t_10px_important']);
echo '<h3 class="error invisible" id="message"> </h3>'; echo '<h3 class="error invisible" id="message"> </h3>';
ui_require_jquery_file('form'); ui_require_jquery_file('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');

4
pandora_console/godmode/servers/servers.build_table.php
View File

@ -208,7 +208,7 @@ foreach ($servers as $server) {
if ($server['type'] === 'data') { if ($server['type'] === 'data') {
$data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_counts='.$server['id_server']).'">'; $data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_counts='.$server['id_server']).'">';
$data[8] .= html_print_image( $data[8] .= html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Reset module status and fired alert counts'), 'title' => __('Reset module status and fired alert counts'),
@ -219,7 +219,7 @@ foreach ($servers as $server) {
} else if ($server['type'] === 'enterprise snmp') { } else if ($server['type'] === 'enterprise snmp') {
$data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_snmp_enterprise='.$server['id_server']).'">'; $data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_snmp_enterprise='.$server['id_server']).'">';
$data[8] .= html_print_image( $data[8] .= html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Claim back SNMP modules'), 'title' => __('Claim back SNMP modules'),

16
pandora_console/godmode/setup/news.php
View File

@ -289,7 +289,7 @@ if ((isset($_GET['form_add'])) || (isset($_GET['form_edit']))) {
'text', 'text',
25, 25,
100, 100,
$text, io_safe_output($text),
'', '',
true, true,
'w100p' 'w100p'
@ -442,9 +442,19 @@ ui_require_javascript_file('pandora');
dateFormat: "<?php echo DATE_FORMAT_JS; ?>", dateFormat: "<?php echo DATE_FORMAT_JS; ?>",
changeMonth: true, changeMonth: true,
changeYear: true, changeYear: true,
showAnim: "slideDown"}); showAnim: "slideDown"}
);
defineTinyMCE({"elements": "textarea_text",}); var added_config = {
"elements":"textarea_text",
"plugins": "preview, print, table, searchreplace, nonbreaking, xhtmlxtras, noneditable",
"theme_advanced_buttons1": "bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,fontselect,fontsizeselect",
"theme_advanced_buttons2": "search,replace,|,bullist,numlist,|,undo,redo,|,link,unlink,image,|,cleanup,code,preview,|,forecolor,backcolor",
"valid_children": "+body[style]",
"width": "90%",
}
defineTinyMCE(added_config);
$("#checkbox-expire").click(function() { $("#checkbox-expire").click(function() {
check_expire(); check_expire();

7
pandora_console/godmode/users/user_management.php
View File

@ -764,10 +764,9 @@ html_print_table($userManagementTable);
$vcard_data = []; $vcard_data = [];
$vcard_data['version'] = '3.0'; $vcard_data['version'] = '3.0';
$vcard_data['firstName'] = $user_info['firstname']; $vcard_data['firstName'] = $user_info['fullname'];
$vcard_data['lastName'] = $user_info['lastname']; $vcard_data['lastName'] = '';
$vcard_data['middleName'] = ($user_info['middlename'] === '1') ? '' : $user_info['middlename']; $vcard_data['middleName'] = '';
$vcard_data['nickname'] = $user_info['fullname'];
$vcard_data['workPhone'] = $user_info['phone']; $vcard_data['workPhone'] = $user_info['phone'];
$vcard_data['email'] = $user_info['email']; $vcard_data['email'] = $user_info['email'];
$vcard_data['organization'] = io_safe_output(get_product_name()); $vcard_data['organization'] = io_safe_output(get_product_name());

2
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
View File

@ -673,7 +673,7 @@ class DiscoveryTaskList extends HTML
$data[0] .= ');" >'; $data[0] .= ');" >';
$data[0] .= html_print_image( $data[0] .= html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Force'), 'title' => __('Force'),

5
pandora_console/godmode/wizards/HostDevices.class.php
View File

@ -810,10 +810,7 @@ class HostDevices extends Wizard
'name' => 'interval_manual_defined', 'name' => 'interval_manual_defined',
'return' => true, 'return' => true,
], ],
'extra' => '<div id="interval_manual_container"><div class="time_selection_container mrgn_top_20px">'.ui_print_help_tip( 'extra' => '<div id="interval_manual_container"><div class="time_selection_container mrgn_top_20px">'.html_print_extended_select_for_time(
__('The minimum recomended interval for Recon Task is 5 minutes'),
true
).html_print_extended_select_for_time(
'interval', 'interval',
$this->task['interval_sweep'], $this->task['interval_sweep'],
'', '',

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

19
pandora_console/include/ajax/audit_log.php
View File

@ -160,7 +160,7 @@ if ($load_filter_modal) {
true, true,
'', '',
false, false,
'margin-left:5px; width:'.$filter_id_width.';' 'width:'.$filter_id_width.';'
); );
$table->rowclass[] = 'display-grid'; $table->rowclass[] = 'display-grid';
@ -169,8 +169,9 @@ if ($load_filter_modal) {
'load_filter', 'load_filter',
false, false,
[ [
'class' => 'mini w25p', 'class' => 'mini w30p',
'style' => 'margin-left: 73%', 'icon' => 'load',
'style' => 'margin-left: 208px; width: 130px;',
'onclick' => 'load_filter_values();', 'onclick' => 'load_filter_values();',
], ],
true true
@ -189,7 +190,7 @@ function show_filter() {
draggable: true, draggable: true,
modal: false, modal: false,
closeOnEscape: true, closeOnEscape: true,
width: 500 width: 380
}); });
} }
@ -293,8 +294,9 @@ if ($save_filter_modal) {
'save_filter', 'save_filter',
false, false,
[ [
'class' => 'mini w25p', 'class' => 'mini ',
'style' => 'margin-left: 56%', 'icon' => 'save',
'style' => 'margin-left: 175px; width: 125px;',
'onclick' => 'save_new_filter();', 'onclick' => 'save_new_filter();',
], ],
true true
@ -330,8 +332,9 @@ if ($save_filter_modal) {
'update_filter', 'update_filter',
false, false,
[ [
'class' => 'mini w25p', 'class' => 'mini ',
'style' => 'margin-left: 56%', 'icon' => 'save',
'style' => 'margin-left: 155px; width: 145px;',
'onclick' => 'save_update_filter();', 'onclick' => 'save_update_filter();',
], ],
true true

161
pandora_console/include/ajax/heatmap.ajax.php
View File

@ -45,73 +45,101 @@ if (is_ajax() === true) {
$group = get_parameter('group', true); $group = get_parameter('group', true);
echo '<form id="form_dialog" method="post">'; echo '<form id="form_dialog" method="post">';
echo '<div class="div-dialog">'; echo html_print_label_input_block(
echo '<p class="label-dialog">'.__('Refresh').'</p>'; __('Refresh'),
echo html_print_select( html_print_select(
[
'30' => __('30 seconds'),
(string) SECONDS_1MINUTE => __('1 minute'),
'180' => __('3 minutes'),
(string) SECONDS_5MINUTES => __('5 minutes'),
],
'refresh',
$refresh,
'',
'',
0,
true,
false,
false,
'',
false,
'width: 100%; margin-top: 10px;'
),
[ [
'30' => __('30 seconds'), 'label_class' => 'font-title-font',
(string) SECONDS_1MINUTE => __('1 minute'), 'div_class' => 'mrgn_top_10px',
'180' => __('3 minutes'), ]
(string) SECONDS_5MINUTES => __('5 minutes'),
],
'refresh',
$refresh,
'',
'',
0,
true,
false,
false,
'',
false,
'margin-top: 3px;'
); );
echo '</div>';
echo '<div class="div-dialog">'; echo html_print_label_input_block(
echo '<p class="label-dialog">'.__('Search').'</p>'; __('Search'),
echo html_print_input_text('search', $search, '', 30, 255, true); html_print_input_text(
echo '</div>'; 'search',
$search,
echo '<div class="div-dialog">'; '',
echo '<p class="label-dialog">'.__('Type').'</p>'; 30,
echo html_print_select( 255,
true,
false,
false,
'',
'w100p'
),
[ [
0 => __('Group agents'), 'label_class' => 'font-title-font',
1 => __('Group modules by tag'), 'div_class' => 'mrgn_top_10px',
2 => __('Group modules by module group'), ]
3 => __('Group modules by agents'),
],
'type',
$type,
'',
'',
0,
true,
false,
false,
'',
false,
'margin-top: 3px;width:70%'
); );
echo '</div>';
echo '<div class="div-dialog">'; echo html_print_label_input_block(
echo '<p class="label-dialog">'.__('Show groups').'</p>'; __('Type'),
echo html_print_checkbox('group', 1, $group, true); html_print_select(
echo '</div>'; [
0 => __('Group agents'),
1 => __('Group modules by tag'),
2 => __('Group modules by module group'),
3 => __('Group modules by agents'),
],
'type',
$type,
'',
'',
0,
true,
false,
false,
'',
false,
'width: 100%; margin-top: 10px;'
),
[
'label_class' => 'font-title-font',
'div_class' => 'mrgn_top_10px',
]
);
echo html_print_label_input_block(
__('Show groups'),
'<div class="w100p">'.html_print_checkbox('group', 1, $group, true).'</div>',
[
'label_class' => 'font-title-font',
'div_class' => 'mrgn_top_10px',
]
);
echo '</form>'; echo '</form>';
} }
if ($getFilterType === true) { if ($getFilterType === true) {
$filter = get_parameter('filter', 0); $filter = get_parameter('filter', 0);
echo '<div id="filter_type" class="div-dialog">'; $label = ' ';
switch ($type) { switch ($type) {
case 0: case 0:
default: default:
echo '<p style="width:42%;font-weight: bold;">'.__('Group').'</p>'; $label = __('Group');
echo html_print_input( $input = html_print_input(
[ [
'type' => 'select_groups', 'type' => 'select_groups',
'returnAllGroup' => true, 'returnAllGroup' => true,
@ -126,9 +154,9 @@ if (is_ajax() === true) {
break; break;
case 1: case 1:
echo '<p class="label-dialog">'.__('Tag').'</p>'; $label = __('Tag');
if (tags_has_user_acl_tags($config['id_user']) === false) { if (tags_has_user_acl_tags($config['id_user']) === false) {
echo html_print_select_from_sql( $input = html_print_select_from_sql(
'SELECT id_tag, name 'SELECT id_tag, name
FROM ttag FROM ttag
WHERE id_tag WHERE id_tag
@ -142,7 +170,7 @@ if (is_ajax() === true) {
true, true,
false, false,
false, false,
'width: 200px', 'width: 100%',
'5' '5'
); );
} else { } else {
@ -150,7 +178,7 @@ if (is_ajax() === true) {
if (!empty($user_tags)) { if (!empty($user_tags)) {
$id_user_tags = array_keys($user_tags); $id_user_tags = array_keys($user_tags);
echo html_print_select_from_sql( $input = html_print_select_from_sql(
'SELECT id_tag, name 'SELECT id_tag, name
FROM ttag FROM ttag
WHERE id_tag IN ('.implode(',', $id_user_tags).') WHERE id_tag IN ('.implode(',', $id_user_tags).')
@ -164,11 +192,11 @@ if (is_ajax() === true) {
true, true,
false, false,
false, false,
'width: 200px', 'width: 100%',
'5' '5'
); );
} else { } else {
echo html_print_select_from_sql( $input = html_print_select_from_sql(
'SELECT id_tag, name 'SELECT id_tag, name
FROM ttag FROM ttag
WHERE id_tag WHERE id_tag
@ -182,7 +210,7 @@ if (is_ajax() === true) {
true, true,
false, false,
false, false,
'width: 200px', 'width: 100%',
'5' '5'
); );
} }
@ -190,8 +218,8 @@ if (is_ajax() === true) {
break; break;
case 2: case 2:
echo '<p class="label-dialog">'.__('Module group').'</p>'; $label = __('Module group');
echo html_print_select_from_sql( $input = html_print_select_from_sql(
'SELECT id_mg, name FROM tmodule_group ORDER BY name', 'SELECT id_mg, name FROM tmodule_group ORDER BY name',
'filter[]', 'filter[]',
$filter, $filter,
@ -202,7 +230,7 @@ if (is_ajax() === true) {
true, true,
true, true,
false, false,
'width: 200px', 'width: 100%',
'5' '5'
); );
break; break;
@ -212,7 +240,14 @@ if (is_ajax() === true) {
break; break;
} }
echo '</div>'; echo html_print_label_input_block(
$label,
$input,
[
'label_class' => 'font-title-font',
'div_class' => 'mrgn_top_10px',
]
);
} }
if ($getInfo === true) { if ($getInfo === true) {

2
pandora_console/include/ajax/module.php
View File

@ -1279,7 +1279,7 @@ if (check_login()) {
if ((int) $module['flag'] === 0) { if ((int) $module['flag'] === 0) {
$additionalLinkAction = '&amp;flag=1'; $additionalLinkAction = '&amp;flag=1';
$linkCaption = __('Force checks'); $linkCaption = __('Force checks');
$imgaction = 'images/target.png'; $imgaction = 'images/force@svg.svg';
} else { } else {
$additionalLinkAction = ''; $additionalLinkAction = '';
$linkCaption = __('Refresh'); $linkCaption = __('Refresh');

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

22
pandora_console/include/class/AgentWizard.class.php
View File

@ -4132,10 +4132,10 @@ class AgentWizard extends HTML
$table->width = '100%'; $table->width = '100%';
$table->class = 'info_table'; $table->class = 'info_table';
// Subheaders for Warning and Critical columns. // Subheaders for Warning and Critical columns.
$subheaders = '<span class=\'wizard-colum-levels font_w300 mrgn_lft_0.8em\'>Min.</span>'; $subheaders = '<span class=\'wizard-colum-levels font_w300 margin-left-1\'>Min.</span>';
$subheaders .= '<span class=\'wizard-colum-levels font_w300 mrgn_lft_1.6em\'>Max.</span>'; $subheaders .= '<span class=\'wizard-colum-levels font_w300 margin-left-1\'>Max.</span>';
$subheaders .= '<span class=\'wizard-colum-levels font_w300 mrgn_lft_2em\'>Inv.</span>'; $subheaders .= '<span class=\'wizard-colum-levels font_w300 margin-left-1\'>Inv.</span>';
$subheaders .= '<span class=\'wizard-colum-levels font_w300 mrgn_lft_2em\'>%.</span>'; $subheaders .= '<span class=\'wizard-colum-levels font_w300 margin-left-05\'>%.</span>';
// Warning header. // Warning header.
$warning_header = html_print_div( $warning_header = html_print_div(
@ -4352,8 +4352,7 @@ class AgentWizard extends HTML
); );
$data_warning .= html_print_div( $data_warning .= html_print_div(
[ [
'class' => 'wizard-column-levels-check', 'class' => 'wizard-column-levels-check mrgn_top_10px',
'style' => 'margin-top: 0.3em;',
'content' => html_print_checkbox( 'content' => html_print_checkbox(
'module-warning-inv-'.$uniqueId, 'module-warning-inv-'.$uniqueId,
$module['inv_warning'], $module['inv_warning'],
@ -4369,8 +4368,7 @@ class AgentWizard extends HTML
); );
$data_warning .= html_print_div( $data_warning .= html_print_div(
[ [
'class' => 'wizard-column-levels-check', 'class' => 'wizard-column-levels-check mrgn_top_10px',
'style' => 'margin-top: 0.3em;',
'content' => html_print_checkbox( 'content' => html_print_checkbox(
'module-warning-perc-'.$uniqueId, 'module-warning-perc-'.$uniqueId,
$module['perc_warning'], $module['perc_warning'],
@ -4436,8 +4434,7 @@ class AgentWizard extends HTML
$data[4] .= html_print_div( $data[4] .= html_print_div(
[ [
'class' => 'wizard-column-levels-check', 'class' => 'wizard-column-levels-check mrgn_top_10px',
'style' => 'margin-top: 0.3em;',
'content' => html_print_checkbox( 'content' => html_print_checkbox(
'module-critical-inv-'.$uniqueId, 'module-critical-inv-'.$uniqueId,
$module['inv_critical'], $module['inv_critical'],
@ -4454,8 +4451,7 @@ class AgentWizard extends HTML
$data[4] .= html_print_div( $data[4] .= html_print_div(
[ [
'class' => 'wizard-column-levels-check', 'class' => 'wizard-column-levels-check mrgn_top_10px',
'style' => 'margin-top: 0.3em;',
'content' => html_print_checkbox( 'content' => html_print_checkbox(
'module-critical-perc-'.$uniqueId, 'module-critical-perc-'.$uniqueId,
$module['perc_critical'], $module['perc_critical'],
@ -4490,7 +4486,7 @@ class AgentWizard extends HTML
'', '',
true, true,
'', '',
'pdd_0px' 'pdd_0px mrgn_top-8px'
); );
} else { } else {
// WIP. Current value of this module. // WIP. Current value of this module.

5
pandora_console/include/class/AgentsAlerts.class.php
View File

@ -771,7 +771,7 @@ class AgentsAlerts extends HTML
$headerInputs = []; $headerInputs = [];
$headerInputs[] = [ $headerInputs[] = [
'label' => __('Group'), 'label' => '<span class="font-title-font">'.__('Group').'</span>',
'id' => 'select-group-id', 'id' => 'select-group-id',
'arguments' => [ 'arguments' => [
'name' => 'group-id', 'name' => 'group-id',
@ -788,8 +788,9 @@ class AgentsAlerts extends HTML
]; ];
$headerInputs[] = [ $headerInputs[] = [
'label' => __('Show modules without alerts'), 'label' => '<span class="font-title-font label-alert-agent">'.__('Show modules without alerts').'</span>',
'id' => 'txt-use-agent-ip', 'id' => 'txt-use-agent-ip',
'class' => 'display-grid mrgn_lft_15px mrgn_btn_5px',
'arguments' => [ 'arguments' => [
'name' => 'show-modules-without-alerts', 'name' => 'show-modules-without-alerts',
'checked' => $this->showWithoutAlertModules, 'checked' => $this->showWithoutAlertModules,

5
pandora_console/include/class/CustomNetScan.class.php
View File

@ -524,7 +524,7 @@ class CustomNetScan extends Wizard
// Schedule. // Schedule.
$form['inputs'][] = [ $form['inputs'][] = [
'label' => __('Interval').ui_print_help_tip( 'label' => __('Interval').ui_print_help_tip(
__('Manual interval means that it will be executed only On-demand'), __('Manual interval means that it will be executed only On-demand').', '.__('The minimum recomended interval for Recon Task is 5 minutes'),
true true
), ),
'class' => 'input-interval', 'class' => 'input-interval',
@ -549,9 +549,6 @@ class CustomNetScan extends Wizard
true, true,
false, false,
false false
).ui_print_help_tip(
__('The minimum recomended interval for Recon Task is 5 minutes'),
true
).'</span>', ).'</span>',
]; ];

2
pandora_console/include/config_process.php
View File

@ -20,7 +20,7 @@
/** /**
* Pandora build version and version * Pandora build version and version
*/ */
$build_version = 'PC230330'; $build_version = 'PC230403';
$pandora_version = 'v7.0NG.770'; $pandora_version = 'v7.0NG.770';
// Do not overwrite default timezone set if defined. // Do not overwrite default timezone set if defined.

16
pandora_console/include/functions_cron.php
View File

@ -530,7 +530,7 @@ function cron_list_table()
$task['id'] $task['id']
), ),
'content' => html_print_image( 'content' => html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Force run'), 'title' => __('Force run'),
@ -568,7 +568,7 @@ function cron_list_table()
$task['id'] $task['id']
), ),
'content' => html_print_image( 'content' => html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Force run'), 'title' => __('Force run'),
@ -623,7 +623,7 @@ function cron_list_table()
$task['id'] $task['id']
), ),
'content' => html_print_image( 'content' => html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Force run'), 'title' => __('Force run'),
@ -715,7 +715,7 @@ function cron_list_table()
$task['id'] $task['id']
), ),
'content' => html_print_image( 'content' => html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Force run'), 'title' => __('Force run'),
@ -751,7 +751,7 @@ function cron_list_table()
$task['id'] $task['id']
), ),
'content' => html_print_image( 'content' => html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Force run'), 'title' => __('Force run'),
@ -797,7 +797,7 @@ function cron_list_table()
$task['id'] $task['id']
), ),
'content' => html_print_image( 'content' => html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Force run'), 'title' => __('Force run'),
@ -839,7 +839,7 @@ function cron_list_table()
$task['id'] $task['id']
), ),
'content' => html_print_image( 'content' => html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Force run'), 'title' => __('Force run'),
@ -873,7 +873,7 @@ function cron_list_table()
$task['id'] $task['id']
), ),
'content' => html_print_image( 'content' => html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Force run'), 'title' => __('Force run'),

4
pandora_console/include/functions_events.php
View File

@ -4560,7 +4560,7 @@ function events_page_details($event, $server_id=0)
true, true,
[ [
'title' => __('Go to data overview'), 'title' => __('Go to data overview'),
'class' => 'invert_filter', 'class' => 'invert_filter main_menu_icon',
] ]
); );
} else { } else {
@ -4569,7 +4569,7 @@ function events_page_details($event, $server_id=0)
true, true,
[ [
'title' => __('Go to data overview'), 'title' => __('Go to data overview'),
'class' => 'invert_filter', 'class' => 'invert_filter main_menu_icon',
'style' => 'opacity: .5', 'style' => 'opacity: .5',
] ]
); );

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;',
] ]
); );

4
pandora_console/include/functions_inventory.php
View File

@ -812,6 +812,10 @@ function get_data_basic_info_sql($params, $count=false)
$where .= sprintf(' AND id_agente = %d', $params['id_agent']); $where .= sprintf(' AND id_agente = %d', $params['id_agent']);
} }
if ($params['id_group'] > 0) {
$where .= sprintf(' AND id_grupo = %d', $params['id_group']);
}
if ($params['search'] > 0) { if ($params['search'] > 0) {
$where .= sprintf( $where .= sprintf(
' AND ( alias LIKE "%%%s%%" )', ' AND ( alias LIKE "%%%s%%" )',

2
pandora_console/include/functions_menu.php
View File

@ -57,7 +57,7 @@ function menu_print_menu(&$menu)
$sec = (string) get_parameter('sec'); $sec = (string) get_parameter('sec');
$sec2 = (string) get_parameter('sec2'); $sec2 = (string) get_parameter('sec2');
if ($sec2 === 'operation/agentes/ver_agente') { if ($sec2 === 'operation/agentes/ver_agente') {
$sec2 = 'godmode/agentes/configurar_agente'; $sec2 = 'operation/agentes/estado_agente';
} else if ($sec2 === 'godmode/alerts/configure_alert_template') { } else if ($sec2 === 'godmode/alerts/configure_alert_template') {
$sec2 = 'godmode/alerts/alert_templates'; $sec2 = 'godmode/alerts/alert_templates';
} else if ($sec2 === 'godmode/events/events') { } else if ($sec2 === 'godmode/events/events') {

2
pandora_console/include/functions_snmp_browser.php
View File

@ -97,7 +97,7 @@ function snmp_browser_get_html_tree(
// Id used to expand leafs. // Id used to expand leafs.
$sub_id = time().rand(0, getrandmax()); $sub_id = time().rand(0, getrandmax());
// Display the branch. // Display the branch.
$output .= '<li id="li_'.$sub_id.'" class="'.$class.' mrgn_0px pdd_0px">'; $output .= '<li id="li_'.$sub_id.'" class="'.$class.' mrgn_0px pdd_0px flex_center">';
// Indent sub branches. // Indent sub branches.
for ($i = 1; $i <= $depth; $i++) { for ($i = 1; $i <= $depth; $i++) {

584
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";
} }
/* /*
@ -3628,6 +3634,11 @@ function ui_print_datatable(array $parameters)
$parameters['csv'] = 1; $parameters['csv'] = 1;
} }
$dom_elements = '"plfrtiB"';
if (isset($parameters['dom_elements'])) {
$dom_elements = '"'.$parameters['dom_elements'].'"';
}
$filter = ''; $filter = '';
// Datatable filter. // Datatable filter.
if (isset($parameters['form']) && is_array($parameters['form'])) { if (isset($parameters['form']) && is_array($parameters['form'])) {
@ -3790,6 +3801,34 @@ function ui_print_datatable(array $parameters)
} }
$table .= '</tr></thead>'; $table .= '</tr></thead>';
if (isset($parameters['data_element']) === true) {
$table .= '<tbody>';
foreach ($parameters['data_element'] as $row) {
$table .= '<tr>';
foreach ($row as $td_data) {
$table .= '<td>'.$td_data.'</td>';
}
$table .= '</tr>';
}
$table .= '</tbody>';
$js = '<script>
$.fn.dataTable.ext.classes.sPageButton = "pandora_pagination mini-pandora-pagination"
var table = $("#'.$table_id.'").DataTable({
"dom": "'.$parameters['dom_elements'].'"
});
$("div.spinner-fixed").hide();
$("table#'.$table_id.'").removeClass("invisible");
$("#'.$table_id.'_filter > label > input").addClass("mini-search-input");
if (table.page.info().pages == 1) {
$("#'.$table_id.'_paginate").hide();
}
</script>';
}
$table .= '</table>'; $table .= '</table>';
$pagination_class = 'pandora_pagination'; $pagination_class = 'pandora_pagination';
@ -3813,279 +3852,276 @@ function ui_print_datatable(array $parameters)
$export_columns = ',columns: \'th:not(:last-child)\''; $export_columns = ',columns: \'th:not(:last-child)\'';
} }
if (isset($parameters['ajax_url'])) { if (isset($parameters['data_element']) === false) {
$type_data = 'ajax: { if (isset($parameters['ajax_url'])) {
url: "'.ui_get_full_url('ajax.php', false, false, false).'", $type_data = 'ajax: {
type: "POST", url: "'.ui_get_full_url('ajax.php', false, false, false).'",
dataSrc: function (json) { type: "POST",
if($("#'.$form_id.'_search_bt") != undefined) { dataSrc: function (json) {
$("#'.$form_id.'_loading").remove(); if($("#'.$form_id.'_search_bt") != undefined) {
} $("#'.$form_id.'_loading").remove();
}
if (json.error) { if (json.error) {
console.error(json.error); console.error(json.error);
$("#error-'.$table_id.'").html(json.error); $("#error-'.$table_id.'").html(json.error);
$("#error-'.$table_id.'").dialog({ $("#error-'.$table_id.'").dialog({
title: "Filter failed", title: "Filter failed",
width: 630, width: 630,
resizable: true, resizable: true,
draggable: true, draggable: true,
modal: false, modal: false,
closeOnEscape: true, closeOnEscape: true,
buttons: { buttons: {
"Ok" : function () { "Ok" : function () {
$(this).dialog("close"); $(this).dialog("close");
}
} }
} }).parent().addClass("ui-state-error");
}).parent().addClass("ui-state-error"); } else {';
} else {';
if (isset($parameters['ajax_return_operation']) === true if (isset($parameters['ajax_return_operation']) === true
&& empty($parameters['ajax_return_operation']) === false && empty($parameters['ajax_return_operation']) === false
&& isset($parameters['ajax_return_operation_function']) === true && isset($parameters['ajax_return_operation_function']) === true
&& empty($parameters['ajax_return_operation_function']) === false && empty($parameters['ajax_return_operation_function']) === false
) { ) {
$type_data .= ' $type_data .= '
if (json.'.$parameters['ajax_return_operation'].' !== undefined) { if (json.'.$parameters['ajax_return_operation'].' !== undefined) {
'.$parameters['ajax_return_operation_function'].'(json.'.$parameters['ajax_return_operation'].'); '.$parameters['ajax_return_operation_function'].'(json.'.$parameters['ajax_return_operation'].');
} }
'; ';
} }
if (isset($parameters['ajax_postprocess'])) {
$type_data .= '
if (json.data) {
json.data.forEach(function(item) {
'.$parameters['ajax_postprocess'].'
});
} else {
json.data = {};
}';
}
if (isset($parameters['ajax_postprocess'])) {
$type_data .= ' $type_data .= '
if (json.data) { return json.data;
json.data.forEach(function(item) { }
'.$parameters['ajax_postprocess'].' },
data: function (data) {
if($("#button-'.$form_id.'_search_bt") != undefined) {
var loading = \''.html_print_image(
'images/spinner.gif',
true,
[
'id' => $form_id.'_loading',
'class' => 'loading-search-datatables-button',
]
).'\';
$("#button-'.$form_id.'_search_bt").parent().append(loading);
}
inputs = $("#'.$form_id.' :input");
values = {};
inputs.each(function() {
values[this.name] = $(this).val();
})
$.extend(data, {
filter: values,'."\n";
if (is_array($parameters['ajax_data'])) {
foreach ($parameters['ajax_data'] as $k => $v) {
$type_data .= $k.':'.json_encode($v).",\n";
}
}
$type_data .= 'page: "'.$parameters['ajax_url'].'"
}); });
} else {
json.data = {}; return data;
}'; }
},';
} else {
$type_data = 'data: '.json_encode($parameters['data_element']).',';
} }
$type_data .= ' $serverside = 'true';
return json.data; if (isset($parameters['data_element'])) {
} $serverside = 'false';
}, }
data: function (data) {
if($("#button-'.$form_id.'_search_bt") != undefined) {
var loading = \''.html_print_image(
'images/spinner.gif',
true,
[
'id' => $form_id.'_loading',
'class' => 'loading-search-datatables-button',
]
).'\';
$("#button-'.$form_id.'_search_bt").parent().append(loading);
}
inputs = $("#'.$form_id.' :input"); // Javascript controller.
$js = '<script type="text/javascript">
$(document).ready(function(){
$.fn.dataTable.ext.errMode = "none";
$.fn.dataTable.ext.classes.sPageButton = "'.$pagination_class.'";
values = {}; var settings_datatable = {
inputs.each(function() { drawCallback: function(settings) {';
values[this.name] = $(this).val();
})
$.extend(data, { if (!isset($parameters['data_element'])) {
filter: values,'."\n"; $js .= 'if (dt_'.$table_id.'.page.info().pages > 1) {
$("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers").show()
} else {
$("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers").hide()
}';
}
if (is_array($parameters['ajax_data'])) { $js .= 'if ($("#'.$table_id.' tr td").length == 1) {
foreach ($parameters['ajax_data'] as $k => $v) { $(".datatable-msg-info-'.$table_id.'").show();
$type_data .= $k.':'.json_encode($v).",\n"; $(".datatable-msg-info-'.$table_id.'").removeClass(\'invisible_important\');
$("table#'.$table_id.'").hide();
$("div.dataTables_paginate").hide();
$("div.dataTables_info").hide();
$("div.dataTables_length").hide();
$("div.dt-buttons").hide();
if (dt_'.$table_id.'.page.info().pages > 1) {
$(".dataTables_paginate.paging_simple_numbers").show()
}
} else {
$(".datatable-msg-info-'.$table_id.'").hide();
$("table#'.$table_id.'").show();
$("div.dataTables_paginate").show();
$("div.dataTables_info").show();
$("div.dataTables_length").show();
$("div.dt-buttons").show();
if (dt_'.$table_id.'.page.info().pages == 1) {
$(".dataTables_paginate.paging_simple_numbers").hide()
}
}';
if (isset($parameters['drawCallback'])) {
$js .= $parameters['drawCallback'];
}
$searching = 'false';
if (isset($parameters['searching']) && $parameters['searching'] === true) {
$searching = 'true';
}
$ordering = 'true';
if (isset($parameters['ordering']) && $parameters['ordering'] === false) {
$ordering = 'false';
}
$js .= '},';
$languaje = substr(get_user_language(), 0, 2);
$js .= '
processing: true,
serverSide: '.$serverside.',
paging: '.$parameters['paging'].',
pageLength: '.$parameters['default_pagination'].',
searching: '.$searching.',
responsive: true,
dom: '.$dom_elements.',
language: {
url: "/pandora_console/include/javascript/i18n/dataTables.'.$languaje.'.json",
processing:"'.$processing.'",
zeroRecords:"'.$zeroRecords.'",
emptyTable:"'.$emptyTable.'",
},
buttons: '.$parameters['csv'].'== 1 ? [
{
extend: "csv",
text : "'.__('Export current page to CSV').'",
titleAttr: "'.__('Export current page to CSV').'",
title: "export_'.$parameters['id'].'_current_page_'.date('Y-m-d').'",
fieldSeparator: "'.$config['csv_divider'].'",
action: function ( e, dt, node, config ) {
blockResubmit(node);
// Call the default csvHtml5 action method to create the CSV file
$.fn.dataTable.ext.buttons.csvHtml5.action.call(this, e, dt, node, config);
},
exportOptions : {
modifier : {
// DataTables core
order : "current",
page : "All",
search : "applied"
}'.$export_columns.'
},
}
] : [],
lengthMenu: '.json_encode($pagination_options).',
columnDefs: [
{ className: "no-class", targets: "_all" },
{ bSortable: false, targets: '.$no_sortable_columns.' }
],
ordering: '.$ordering.',
initComplete: function(settings, json) {
// Move elements to table_action_buttons bar.
$(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
$(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
$(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
$(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
$(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers"));
$(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dataTables_length"));
$(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dt-buttons"));
$(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dataTables_filter"));
$("div.spinner-fixed").hide();
},
columns: [';
foreach ($parameters['datacolumns'] as $data) {
if (is_array($data)) {
$js .= '{data : "'.$data['text'].'",className: "'.$data['class'].'"},';
} else {
$js .= '{data : "'.$data.'",className: "no-class"},';
} }
} }
$type_data .= 'page: "'.$parameters['ajax_url'].'" $js .= '
}); ],
order: [[ '.$order.' ]],';
$js .= $type_data;
$js .= '
};
return data; dt_'.$table_id.' = $("#'.$table_id.'").DataTable(settings_datatable);
}
},';
} else {
$type_data = 'data: '.json_encode($parameters['data_element']).',';
}
$serverside = 'true'; $("#button-'.$form_id.'_search_bt").click(function (){
if (isset($parameters['data_element'])) { dt_'.$table_id.'.draw().page(0)
$serverside = 'false'; });
} ';
// Javascript controller. if (isset($parameters['caption']) === true
$js = '<script type="text/javascript"> && empty($parameters['caption']) === false
$(document).ready(function(){ ) {
$.fn.dataTable.ext.errMode = "none"; $js .= '$("#'.$table_id.'").append("<caption>'.$parameters['caption'].'</caption>");';
$.fn.dataTable.ext.classes.sPageButton = "'.$pagination_class.'"; $js .= '$(".datatables_thead_tr").css("height", 0);';
}
var settings_datatable = { if (isset($parameters['csv']) === true) {
drawCallback: function(settings) {'; $js."'$('#".$table_id."').on( 'buttons-processing', function ( e, indicator ) {
if ( indicator ) {
console.log('a');
}
else {
console.log('b');
}";
}
if (!isset($parameters['data_element'])) { $js .= '$("table#'.$table_id.'").removeClass("invisible");
$js .= 'if (dt_'.$table_id.'.page.info().pages > 1) { });';
$("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers").show() $js .= '
} else { $(function() {
$("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers").hide() $(document).on("preInit.dt", function (ev, settings) {
}';
}
$js .= 'if ($("#'.$table_id.' tr td").length == 1) {
$(".datatable-msg-info-'.$table_id.'").show();
$(".datatable-msg-info-'.$table_id.'").removeClass(\'invisible_important\');
$("table#'.$table_id.'").hide();
$("div.dataTables_paginate").hide();
$("div.dataTables_info").hide();
$("div.dataTables_length").hide(); $("div.dataTables_length").hide();
$("div.dt-buttons").hide(); $("div.dt-buttons").hide();
});
if (dt_'.$table_id.'.page.info().pages > 1) {
$(".dataTables_paginate.paging_simple_numbers").show()
}
} else {
$(".datatable-msg-info-'.$table_id.'").hide();
$("table#'.$table_id.'").show();
$("div.dataTables_paginate").show();
$("div.dataTables_info").show();
$("div.dataTables_length").show();
$("div.dt-buttons").show();
if (dt_'.$table_id.'.page.info().pages == 1) {
$(".dataTables_paginate.paging_simple_numbers").hide()
}
}';
if (isset($parameters['drawCallback'])) {
$js .= $parameters['drawCallback'];
}
$dom_elements = '"plfrtiB"';
if (isset($parameters['dom_elements'])) {
$dom_elements = '"'.$parameters['dom_elements'].'"';
}
$searching = 'false';
if (isset($parameters['searching']) && $parameters['searching'] === true) {
$searching = 'true';
}
$ordering = 'true';
if (isset($parameters['ordering']) && $parameters['ordering'] === false) {
$ordering = 'false';
}
$js .= '},';
$languaje = substr(get_user_language(), 0, 2);
$js .= '
processing: true,
serverSide: '.$serverside.',
paging: '.$parameters['paging'].',
pageLength: '.$parameters['default_pagination'].',
searching: '.$searching.',
responsive: true,
dom: '.$dom_elements.',
language: {
url: "/pandora_console/include/javascript/i18n/dataTables.'.$languaje.'.json",
processing:"'.$processing.'",
zeroRecords:"'.$zeroRecords.'",
emptyTable:"'.$emptyTable.'",
},
buttons: '.$parameters['csv'].'== 1 ? [
{
extend: "csv",
text : "'.__('Export current page to CSV').'",
titleAttr: "'.__('Export current page to CSV').'",
title: "export_'.$parameters['id'].'_current_page_'.date('Y-m-d').'",
fieldSeparator: "'.$config['csv_divider'].'",
action: function ( e, dt, node, config ) {
blockResubmit(node);
// Call the default csvHtml5 action method to create the CSV file
$.fn.dataTable.ext.buttons.csvHtml5.action.call(this, e, dt, node, config);
},
exportOptions : {
modifier : {
// DataTables core
order : "current",
page : "All",
search : "applied"
}'.$export_columns.'
},
}
] : [],
lengthMenu: '.json_encode($pagination_options).',
columnDefs: [
{ className: "no-class", targets: "_all" },
{ bSortable: false, targets: '.$no_sortable_columns.' }
],
ordering: '.$ordering.',
initComplete: function(settings, json) {
// Move elements to table_action_buttons bar.
$(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
$(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
$(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
$(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
$(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers"));
$(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dataTables_length"));
$(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dt-buttons"));
$(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dataTables_filter"));
$("div.spinner-fixed").hide();
},
columns: [';
foreach ($parameters['datacolumns'] as $data) {
if (is_array($data)) {
$js .= '{data : "'.$data['text'].'",className: "'.$data['class'].'"},';
} else {
$js .= '{data : "'.$data.'",className: "no-class"},';
}
}
$js .= '
],
order: [[ '.$order.' ]],';
$js .= $type_data;
$js .= '
};
dt_'.$table_id.' = $("#'.$table_id.'").DataTable(settings_datatable);
$("#button-'.$form_id.'_search_bt").click(function (){
dt_'.$table_id.'.draw().page(0)
}); });
'; ';
if (isset($parameters['caption']) === true $js .= '</script>';
&& empty($parameters['caption']) === false
) {
$js .= '$("#'.$table_id.'").append("<caption>'.$parameters['caption'].'</caption>");';
$js .= '$(".datatables_thead_tr").css("height", 0);';
} }
if (isset($parameters['csv']) === true) {
$js."'$('#".$table_id."').on( 'buttons-processing', function ( e, indicator ) {
if ( indicator ) {
console.log('a');
}
else {
console.log('b');
}";
}
$js .= '$("table#'.$table_id.'").removeClass("invisible");
});';
$js .= '
$(function() {
$(document).on("preInit.dt", function (ev, settings) {
$("div.dataTables_length").hide();
$("div.dt-buttons").hide();
});
});
';
$js .= '</script>';
// Order. // Order.
$info_msg_arr = []; $info_msg_arr = [];
$info_msg_arr['message'] = $emptyTable; $info_msg_arr['message'] = $emptyTable;
@ -4117,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(
@ -4126,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="';
@ -4136,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>';

83
pandora_console/include/javascript/pandora_ui.js
View File

@ -351,11 +351,86 @@ function load_modal(settings) {
AJAX_RUNNING = 0; AJAX_RUNNING = 0;
} }
} else { } else {
// No onsumbit configured. Directly close. if (Array.isArray(settings.form) === false) {
if (document.getElementById(settings.form) != undefined) { $("#" + settings.form + " :input").each(function() {
document.getElementById(settings.form).submit(); if (this.checkValidity() === false) {
var select2 = $(this).attr("data-select2-id");
if (typeof select2 !== typeof undefined && select2 !== false) {
$(this)
.next()
.attr("title", this.validationMessage);
$(this)
.next()
.tooltip({
tooltipClass: "uitooltip",
position: {
my: "right bottom",
at: "right top",
using: function(position, feedback) {
$(this).css(position);
$("<div>")
.addClass("arrow")
.addClass(feedback.vertical)
.addClass(feedback.horizontal)
.appendTo(this);
}
}
});
$(this)
.next()
.tooltip("open");
var element = $(this).next();
setTimeout(
function(element) {
element.tooltip("destroy");
element.removeAttr("title");
},
3000,
element
);
} else {
$(this).attr("title", this.validationMessage);
$(this).tooltip({
tooltipClass: "uitooltip",
position: {
my: "right bottom",
at: "right top",
using: function(position, feedback) {
$(this).css(position);
$("<div>")
.addClass("arrow")
.addClass(feedback.vertical)
.addClass(feedback.horizontal)
.appendTo(this);
}
}
});
$(this).tooltip("open");
var element = $(this);
setTimeout(
function(element) {
element.tooltip("destroy");
element.removeAttr("title");
},
3000,
element
);
}
flagError = true;
}
});
}
if (!flagError) {
// No onsumbit configured. Directly close.
if (document.getElementById(settings.form) != undefined) {
document.getElementById(settings.form).submit();
}
d.dialog("close");
} }
d.dialog("close");
} }
}; };

1
pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
View File

@ -453,6 +453,7 @@ class ModulesByStatus extends Widget
1000, 1000,
], ],
], ],
'dom_elements' => 'frtilp',
] ]
); );
} catch (\Exception $e) { } catch (\Exception $e) {

32
pandora_console/include/styles/dashboards.css
View File

@ -22,7 +22,7 @@
} }
#menu_tab { #menu_tab {
margin: 0px; margin: 0;
} }
#menu_tab li.nomn.tab_operation img, #menu_tab li.nomn.tab_operation img,
@ -426,12 +426,21 @@ li#search_input_widget {
top: 2px; top: 2px;
} }
div#dashboard-controls { .select2-search--dropdown .select2-search__field {
width: auto;
}
div#dashboard-controls-slides {
width: 720px !important;
}
div#dashboard-controls,
div#dashboard-controls-slides {
position: fixed; position: fixed;
z-index: 1; z-index: 1;
top: 10px; top: 10px;
right: 10px; right: 10px;
width: 800px; width: 450px;
height: 70px; height: 70px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -443,27 +452,32 @@ div#dashboard-controls {
padding: 0px 10px; padding: 0px 10px;
} }
div#dashboard-controls div { div#dashboard-controls div,
flex: 0.5; div#dashboard-controls-slides div {
margin-left: 10px;
text-align: center; text-align: center;
} }
div#dashboard-controls div#dashboard-slides-form-countdown { div#dashboard-controls div#dashboard-slides-form-countdown,
div#dashboard-controls-slides div#dashboard-slides-form-countdown {
flex: 7; flex: 7;
} }
div#dashboard-controls div#dashboard-slides-name { div#dashboard-controls div#dashboard-slides-name,
div#dashboard-controls-slides div#dashboard-slides-name {
flex: 3; flex: 3;
} }
div#dashboard-controls div.dashboard-mode { div#dashboard-controls div.dashboard-mode,
div#dashboard-controls-slides div.dashboard-mode {
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: center; justify-content: center;
} }
div#dashboard-controls div.dashboard-mode a { div#dashboard-controls div.dashboard-mode a,
div#dashboard-controls-slides div.dashboard-mode a {
margin: 0px; margin: 0px;
} }

1
pandora_console/include/styles/events.css
View File

@ -124,7 +124,6 @@ td > input[id^="checkbox-multi"] {
padding-right: 9px; padding-right: 9px;
padding-top: 7px; padding-top: 7px;
padding-bottom: 7px; padding-bottom: 7px;
border-bottom: 2px solid #dedede;
word-break: break-all; word-break: break-all;
} }

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;
}

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

@ -805,6 +805,11 @@ select:-internal-list-box {
max-height: 400px; max-height: 400px;
} }
.mx_height85 {
height: 85px !important;
max-height: 85px !important;
}
.no-text-imp { .no-text-imp {
font-size: 0 !important; font-size: 0 !important;
} }
@ -926,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;
} }
@ -7002,6 +7011,10 @@ div.graph div.legend table {
margin-top: -2px !important; margin-top: -2px !important;
} }
.mrgn_top-8px {
margin-top: -8px !important;
}
.mrgn_top-10px { .mrgn_top-10px {
margin-top: -10px; margin-top: -10px;
} }
@ -7395,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;
} }
@ -7466,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;
} }
@ -7537,6 +7558,10 @@ div.graph div.legend table {
padding-bottom: 10px; padding-bottom: 10px;
} }
.pdd_b_10px_important {
padding-bottom: 10px !important;
}
.pdd_b_20px { .pdd_b_20px {
padding-bottom: 20px; padding-bottom: 20px;
} }
@ -7607,6 +7632,10 @@ div.graph div.legend table {
padding-top: 10px; padding-top: 10px;
} }
.pdd_t_10px_important {
padding-top: 10px !important;
}
.pdd_t_15px { .pdd_t_15px {
padding-top: 15px; padding-top: 15px;
} }
@ -10120,10 +10149,6 @@ select:focus {
border-color: #8a96a6; border-color: #8a96a6;
} }
.dataTables_length > label > select {
min-height: 42px;
}
.dataTables_length > label { .dataTables_length > label {
font-size: 0px; font-size: 0px;
} }
@ -11787,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;
@ -11859,3 +11884,11 @@ li.input-interval .extra-container-input .select2 {
.scale-0-8 { .scale-0-8 {
transform: scale(0.8); transform: scale(0.8);
} }
label:has(span.label-alert-agent) {
margin-bottom: 10px;
}
.info_table.events > tbody > tr > td {
border-bottom: 1px solid #dedede !important;
}

10
pandora_console/include/styles/pandora_black.css
View File

@ -1234,10 +1234,6 @@ a.pandora_pagination:hover {
box-shadow: 0px 3px 6px #111; box-shadow: 0px 3px 6px #111;
} }
.info_table.events > tbody > tr > td {
border-bottom: 2px solid #707070;
}
.info_table tr th, .info_table tr th,
.databox.data > tbody > tr > td { .databox.data > tbody > tr > td {
border-bottom: 1px solid #707070 !important; border-bottom: 1px solid #707070 !important;
@ -1560,7 +1556,7 @@ a.autorefresh_txt,
} }
.info_table.events > tbody > tr > td { .info_table.events > tbody > tr > td {
border-bottom: 1px solid #333; border-bottom: 1px solid #333 !important;
} }
.info_table, .info_table,
@ -1600,3 +1596,7 @@ a.pandora_pagination,
.info_table > tbody > tr > td { .info_table > tbody > tr > td {
border-bottom: 1px solid #3f3f3f; border-bottom: 1px solid #3f3f3f;
} }
.font-title-font {
color: #fff;
}

22
pandora_console/include/styles/tables.css
View File

@ -313,7 +313,7 @@ table.dataTable.info_table.no-footer {
a.pandora_pagination { a.pandora_pagination {
background-color: #f6f7fb; background-color: #f6f7fb;
padding: 11px; padding: 9px;
color: #000; color: #000;
border: 1px solid #cacaca; border: 1px solid #cacaca;
border-left: none; border-left: none;
@ -362,7 +362,7 @@ a.pandora_pagination.current:hover {
background-color: transparent; background-color: transparent;
color: var(--primary-color); color: var(--primary-color);
font-size: 20px; font-size: 20px;
height: 42px; height: 38px;
/* height: 32px; */ /* height: 32px; */
width: 80px; width: 80px;
margin-left: 10px; margin-left: 10px;
@ -816,14 +816,6 @@ div[id^="auto-os-"] > img {
height: 20px; height: 20px;
} }
.dataTables_paginate {
margin-right: 10px;
}
.dataTables_paginate.paging_simple_numbers {
margin-right: 0;
}
.w22px { .w22px {
width: 22px; width: 22px;
} }
@ -842,3 +834,13 @@ td.FF-thresholds-pdd {
padding: 0px !important; padding: 0px !important;
padding-left: 13px !important; padding-left: 13px !important;
} }
div.grid-stack-item-content a.pandora_pagination,
a.mini-pandora-pagination {
padding: 7px;
font-size: 9pt;
}
input.mini-search-input {
height: 30px;
}

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();';

2
pandora_console/install.php
View File

@ -131,7 +131,7 @@
<div style='padding-bottom: 50px'> <div style='padding-bottom: 50px'>
<?php <?php
$version = '7.0NG.770'; $version = '7.0NG.770';
$build = '230330'; $build = '230403';
$banner = "v$version Build $build"; $banner = "v$version Build $build";
error_reporting(0); error_reporting(0);

109
pandora_console/operation/agentes/agent_inventory.php
View File

@ -109,44 +109,93 @@ $utimestampSelectValues = array_reduce(
// Inventory module select. // Inventory module select.
$table = new stdClass(); $table = new stdClass();
$table->width = '100%'; $table->width = '100%';
$table->class = 'databox filters';
$table->size = []; $table->size = [];
$table->data = []; $table->size[0] = '33%';
$table->size[1] = '33%';
$table->size[2] = '33%';
$table->class = 'filter-table-adv';
$table->data[0][0] = __('Module'); $table->data[0][0] = html_print_label_input_block(
$table->data[0][1] = html_print_select_from_sql( __('Module'),
$sqlModuleInventoryAgentView, html_print_select_from_sql(
'module_inventory_agent_view', $sqlModuleInventoryAgentView,
$module, 'module_inventory_agent_view',
'javascript:this.form.submit();', $module,
__('All'), 'javascript:this.form.submit();',
0, __('All'),
0,
true,
false,
true,
false,
'width:100%;'
)
);
$table->data[0][1] = html_print_label_input_block(
__('Date'),
html_print_select(
$utimestampSelectValues,
'utimestamp',
$utimestamp,
'javascript:this.form.submit();',
__('Now'),
0,
true,
false,
true,
'',
false,
'width:100%;'
)
);
$table->data[0][2] = html_print_label_input_block(
__('Search'),
html_print_input_text(
'search_string',
$search_string,
'',
25,
0,
true
)
);
$buttons = html_print_submit_button(
__('Filter'),
'search_button',
false,
[
'icon' => 'search',
'mode' => 'mini',
],
true true
); );
$table->data[0][2] = __('Date'); $searchForm = '<form method="post" action="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=inventory&id_agente='.$id_agente.'">';
$table->data[0][3] = html_print_select( $searchForm .= html_print_table($table, true);
$utimestampSelectValues, $searchForm .= html_print_div(
'utimestamp', [
$utimestamp, 'class' => 'action-buttons',
'javascript:this.form.submit();', 'content' => $buttons,
__('Now'), ],
0,
true true
); );
$searchForm .= '</form>';
$table->data[0][4] = __('Search'); ui_toggle(
$table->data[0][5] = html_print_input_text('search_string', $search_string, '', 25, 0, true); $searchForm,
$table->data[0][6] = html_print_submit_button(__('Search'), 'search_button', false, 'class="sub wand"', true); '<span class="subsection_header_title">'.__('Filters').'</span>',
'filter_form',
// Show filters table. '',
echo sprintf( true,
'<form method="post" action="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=inventory&id_agente=%s">%s</form>', false,
$id_agente, '',
html_print_table($table, true) 'white-box-content',
'box-flat white_table_graph fixed_filter_bar'
); );
unset($table);
$idModuleInventory = null; $idModuleInventory = null;
$rowTable = 1; $rowTable = 1;
@ -181,7 +230,7 @@ foreach ($rows as $row) {
$table->align = []; $table->align = [];
$table->cellpadding = 4; $table->cellpadding = 4;
$table->cellspacing = 4; $table->cellspacing = 4;
$table->class = 'databox filters'; $table->class = 'info_table';
$table->head = []; $table->head = [];
$table->head[0] = $row['name'].' - ('.date($config['date_format'], $row['utimestamp']).')'; $table->head[0] = $row['name'].' - ('.date($config['date_format'], $row['utimestamp']).')';
@ -210,7 +259,7 @@ foreach ($rows as $row) {
foreach ($subHeadTitles as $titleData) { foreach ($subHeadTitles as $titleData) {
$table->data[0][$iterator] = $titleData; $table->data[0][$iterator] = $titleData;
$table->cellstyle[0][$iterator] = 'background: #373737; color: #FFF;'; $table->cellstyle[0][$iterator] = 'background: var(--primary-color); color: #FFF;';
$iterator++; $iterator++;
} }

58
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 {
@ -434,35 +436,39 @@ if ($agent_view_page === true) {
); );
} }
if (((bool) check_acl($config['id_user'], $id_group, 'AW') === true || (bool) check_acl($config['id_user'], $id_group, 'LM') === true)) { if (is_metaconsole() === false) {
if ($agent_view_page === true) { if (((bool) check_acl($config['id_user'], $id_group, 'AW') === true || (bool) check_acl($config['id_user'], $id_group, 'LM') === true)) {
html_print_div( if ($agent_view_page === true) {
[ html_print_div(
'class' => 'action-buttons pdd_b_10px pdd_r_5px w100p', [
'content' => html_print_submit_button( 'class' => 'action-buttons pdd_b_10px pdd_r_5px w100p',
'content' => html_print_submit_button(
__('Validate'),
'alert_validate',
false,
[
'icon' => 'wand',
'mode' => 'secondary mini',
],
true
),
]
);
} else {
html_print_action_buttons(
html_print_submit_button(
__('Validate'), __('Validate'),
'alert_validate', 'alert_validate',
false, false,
[ [ 'icon' => 'wand' ],
'icon' => 'wand',
'mode' => 'secondary mini',
],
true true
), ),
] ['type' => 'form_action']
); );
} else { }
html_print_action_buttons(
html_print_submit_button(
__('Validate'),
'alert_validate',
false,
[ 'icon' => 'wand' ],
true
),
['type' => 'form_action']
);
} }
} else {
html_print_action_buttons('');
} }
$html_content = ob_get_clean(); $html_content = ob_get_clean();
@ -510,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")) {

2
pandora_console/operation/agentes/estado_agente.php
View File

@ -1301,7 +1301,7 @@ if (empty($tableAgents->data) === false) {
true, true,
'offset', 'offset',
false, false,
'dataTables_paginate paging_simple_numbers' 'paging_simple_numbers'
); );
unset($table); unset($table);

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, '../');

3
pandora_console/operation/agentes/status_monitor.php
View File

@ -907,6 +907,9 @@ $tableFilter->data['second_line'][1] = html_print_label_input_block(
true, true,
'', '',
[], [],
true,
0,
'30',
true 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>';

8
pandora_console/operation/heatmap.php
View File

@ -149,13 +149,13 @@ if ($is_ajax === false && $pure === false) {
if ($is_ajax === false && $pure === true) { if ($is_ajax === false && $pure === true) {
// Floating menu - Start. // Floating menu - Start.
echo '<div id="heatmap-controls" class="zindex999">'; echo '<div id="heatmap-controls" class="zindex999" style="max-height: 85px">';
echo '<div id="menu_tab" method="post">'; echo '<div id="menu_tab" method="post">';
echo '<ul class="mn white-box-content box-shadow flex-row">'; echo '<ul class="mn white-box-content box-shadow flex-row">';
// Name. // Name.
echo '<li class="nomn">'; echo '<li class="nomn mx_height85">';
html_print_div( html_print_div(
[ [
@ -167,7 +167,7 @@ if ($is_ajax === false && $pure === true) {
echo '</li>'; echo '</li>';
// Countdown. // Countdown.
echo '<li class="nomn">'; echo '<li class="nomn mx_height85">';
echo '<div class="heatmap-refr">'; echo '<div class="heatmap-refr">';
echo '<div id="heatmap-refr-form">'; echo '<div id="heatmap-refr-form">';
@ -282,7 +282,7 @@ if ($is_ajax === true) {
draggable: false, draggable: false,
modal: true, modal: true,
closeOnEscape: true, closeOnEscape: true,
height: 410, height: 500,
width: 330, width: 330,
title: '<?php echo __('Config'); ?>', title: '<?php echo __('Config'); ?>',
position: { position: {

637
pandora_console/operation/inventory/inventory.php
View File

@ -119,6 +119,7 @@ if (is_ajax() === true) {
$length = (int) get_parameter('length', $config['block_size']); $length = (int) get_parameter('length', $config['block_size']);
$order = get_datatable_order(); $order = get_datatable_order();
$id_agent = (int) get_parameter('id_agent', 0); $id_agent = (int) get_parameter('id_agent', 0);
$id_group = (int) get_parameter('id_group', 0);
$params = [ $params = [
'search' => $filter['value'], 'search' => $filter['value'],
@ -126,6 +127,7 @@ if (is_ajax() === true) {
'length' => $length, 'length' => $length,
'order' => $order, 'order' => $order,
'id_agent' => $id_agent, 'id_agent' => $id_agent,
'id_group' => $id_group,
]; ];
$data = get_data_basic_info_sql($params); $data = get_data_basic_info_sql($params);
@ -753,295 +755,8 @@ if (is_metaconsole() === true) {
$filteringFunction = ''; $filteringFunction = '';
} }
if ($is_metaconsole === false) { if ($inventory_module !== 'basic') {
// Single agent selected. if (is_metaconsole() === true) {
if ($inventory_id_agent > 0 && isset($agents[$inventory_id_agent]) === true) {
$agents = [$inventory_id_agent => $agents[$inventory_id_agent]];
}
$agents_ids = array_keys($agents);
if (count($agents_ids) > 0) {
$rows = inventory_get_datatable(
$agents_ids,
$inventory_module,
$utimestamp,
$inventory_search_string,
$export,
false,
$order_by_agent
);
}
if (count($agents_ids) === 0 || (int) $rows === ERR_NODATA) {
ui_print_info_message(['no_close' => true, 'message' => __('No data found.') ]);
echo '&nbsp;</td></tr><tr><td>';
return;
}
echo "<div id='loading_url' style='display: none; width: ".$table->width."; text-align: right;'>".html_print_image('images/spinner.gif', true).'</div>';
?>
<script type="text/javascript">
function get_csv_url(module, id_group, search_string, utimestamp, agent, order_by_agent) {
$("#url_csv").hide();
$("#loading_url").show();
$.ajax ({
method:'GET',
url:'ajax.php',
datatype:'html',
data:{
"page" : "operation/inventory/inventory",
"get_csv_url" : 1,
"module" : module,
"id_group" : id_group,
"search_string" : search_string,
"utimestamp" : utimestamp,
"agent" : agent,
"export": true,
"order_by_agent": order_by_agent
},
success: function (data, status) {
$("#url_csv").html(data);
$("#loading_url").hide();
$("#url_csv").show();
}
});
}
</script>
<?php
if ($inventory_module !== 'basic') {
if ($order_by_agent === true) {
foreach ($rows as $agent_rows) {
$data = [];
$modules = '';
foreach ($agent_rows['row'] as $key_row => $row) {
$columns = explode(';', io_safe_output($row['data_format']));
array_push($columns, 'Timestamp');
$data_rows = explode(PHP_EOL, $row['data']);
foreach ($data_rows as $data_row) {
// Exclude results don't match filter.
if ($inventory_search_string && preg_match('/'.io_safe_output($inventory_search_string).'/', ($data_row)) == 0) {
continue;
}
$column_data = explode(';', io_safe_output($data_row));
if ($column_data[0] !== '') {
$row_tmp = [];
foreach ($column_data as $key => $value) {
$row_tmp[$columns[$key]] = $value;
}
$row_tmp['Timestamp'] = $row['timestamp'];
array_push($data, (object) $row_tmp);
}
}
$id_table = 'id_'.$key_row.'_'.$row['id_module_inventory'].'_'.$row['id_agente'];
$table = ui_print_datatable(
[
'id' => $id_table,
'class' => 'info_table w100p',
'style' => 'width: 99%',
'columns' => $columns,
'column_names' => $columns,
'no_sortable_columns' => [],
'data_element' => $data,
'searching' => true,
'dom_elements' => 'ftip',
'order' => [
'field' => $columns[0],
'direction' => 'asc',
],
'zeroRecords' => __('No inventory found'),
'emptyTable' => __('No inventory found'),
'return' => true,
'default_pagination' => 10,
'no_sortable_columns' => [-1],
]
);
$modules .= ui_toggle(
$table,
'<span class="title-blue">'.$row['name'].'</span>',
'',
'',
true,
true,
'',
'white-box-content w100p',
'box-shadow white_table_graph w100p',
'images/arrow_down_green.png',
'images/arrow_right_green.png',
false,
false,
false,
'',
'',
null,
null,
false,
$id_table
);
}
ui_toggle(
$modules,
$agent_rows['agent'],
'',
'',
false,
false
);
}
} else {
$count_rows = count($rows);
foreach ($rows as $module_rows) {
$agent = '';
$data = [];
foreach ($module_rows as $row) {
$columns = explode(';', io_safe_output($row['data_format']));
array_push($columns, 'Timestamp');
array_push($columns, 'Agent');
// Exclude results don't match filter.
if ($inventory_search_string && preg_match('/'.io_safe_output($inventory_search_string).'/', ($row['data'])) == 0) {
continue;
}
$data_tmp = [];
if ($row['data'] !== '') {
$values_explode = explode(';', io_safe_output($row['data']));
foreach ($values_explode as $key => $value) {
$data_tmp[$columns[$key]] = $value;
}
$data_tmp['Timestamp'] = $row['timestamp'];
$data_tmp['Agent'] = $row['name_agent'];
array_push($data, $data_tmp);
}
$id_table = 'id_'.$row['id_module_inventory'];
}
$table = ui_print_datatable(
[
'id' => $id_table,
'class' => 'info_table w100p',
'style' => 'width: 99%',
'columns' => $columns,
'column_names' => $columns,
'no_sortable_columns' => [],
'data_element' => $data,
'searching' => true,
'dom_elements' => 'ftip',
'order' => [
'field' => $columns[0],
'direction' => 'asc',
],
'zeroRecords' => __('No inventory found'),
'emptyTable' => __('No inventory found'),
'return' => true,
'no_sortable_columns' => [],
]
);
if ($count_rows > 1) {
ui_toggle(
$table,
array_shift($module_rows)['name'],
'',
'',
false,
false
);
} else {
echo $table;
html_print_action_buttons(
'',
['type' => 'form_action']
);
}
}
}
} else {
$id_agente = $inventory_id_agent;
$agentes = [];
$data = [];
$class = 'info_table';
$style = 'width: 99%';
$ordering = true;
$searching = false;
$columns = [
'alias',
'ip',
'secondoaryIp',
'group',
'secondaryGroups',
'description',
'os',
'interval',
'lastContact',
'lastStatusChange',
'customFields',
'valuesCustomFields',
];
$columns_names = [
__('Alias'),
__('IP'),
__('Secondary IP'),
__('Group'),
__('Secondary groups'),
__('Description'),
__('OS'),
__('Interval'),
__('Last contact'),
__('Last status change'),
__('Custom fields'),
__('Values Custom Fields'),
];
ui_print_datatable(
[
'id' => 'basic_info',
'class' => $class,
'style' => $style,
'columns' => $columns,
'column_names' => $columns_names,
'ordering' => $ordering,
'searching' => $searching,
'order' => [
'field' => $columns[0],
'direction' => 'asc',
],
'ajax_url' => 'operation/inventory/inventory',
'ajax_data' => [
'get_data_basic_info' => 1,
'id_agent' => $id_agente,
],
'zeroRecords' => __('Agent info not found'),
'emptyTable' => __('Agent info not found'),
'return' => false,
]
);
html_print_action_buttons(
'',
['type' => 'form_action']
);
}
} else {
// Metaconsole.
if ($inventory_module !== 'basic') {
if ($order_by_agent === true) { if ($order_by_agent === true) {
$count_nodos_tmp = []; $count_nodos_tmp = [];
foreach ($nodos as $count_value) { foreach ($nodos as $count_value) {
@ -1266,73 +981,293 @@ if ($is_metaconsole === false) {
} }
} }
} else { } else {
$id_agente = $inventory_id_agent; // Single agent selected.
$agentes = []; if ($inventory_id_agent > 0 && isset($agents[$inventory_id_agent]) === true) {
$data = []; $agents = [$inventory_id_agent => $agents[$inventory_id_agent]];
$class = 'info_table'; }
$style = 'width: 99%';
$ordering = true;
$searching = false;
$columns = [ $agents_ids = array_keys($agents);
'alias', if (count($agents_ids) > 0) {
'ip', $rows = inventory_get_datatable(
'secondoaryIp', $agents_ids,
'group', $inventory_module,
'secondaryGroups', $utimestamp,
'description', $inventory_search_string,
'os', $export,
'interval', false,
'lastContact', $order_by_agent
'lastStatusChange', );
'customFields', }
'valuesCustomFields',
];
$columns_names = [ if (count($agents_ids) === 0 || (int) $rows === ERR_NODATA) {
__('Alias'), ui_print_info_message(
__('IP'), [
__('Secondary IP'), 'no_close' => true,
__('Group'), 'message' => __('No data found.'),
__('Secondary groups'), ]
__('Description'), );
__('OS'), return;
__('Interval'), }
__('Last contact'),
__('Last status change'),
__('Custom fields'),
__('Values Custom Fields'),
];
ui_print_datatable( echo "<div id='loading_url' style='display: none; width: ".$table->width."; text-align: right;'>".html_print_image('images/spinner.gif', true).'</div>';
[ ?>
'id' => 'basic_info', <script type="text/javascript">
'class' => $class, function get_csv_url(module, id_group, search_string, utimestamp, agent, order_by_agent) {
'style' => $style, $("#url_csv").hide();
'columns' => $columns, $("#loading_url").show();
'column_names' => $columns_names, $.ajax ({
'ordering' => $ordering, method:'GET',
'searching' => $searching, url:'ajax.php',
'order' => [ datatype:'html',
'field' => $columns[0], data:{
'direction' => 'asc', "page" : "operation/inventory/inventory",
], "get_csv_url" : 1,
'ajax_url' => 'operation/inventory/inventory', "module" : module,
'ajax_data' => [ "id_group" : id_group,
'get_data_basic_info' => 1, "search_string" : search_string,
'id_agent' => $id_agente, "utimestamp" : utimestamp,
], "agent" : agent,
'zeroRecords' => __('Agent info not found'), "export": true,
'emptyTable' => __('Agent info not found'), "order_by_agent": order_by_agent
'return' => false, },
] success: function (data, status) {
); $("#url_csv").html(data);
$("#loading_url").hide();
$("#url_csv").show();
}
});
}
</script>
<?php
if ($order_by_agent === true) {
foreach ($rows as $agent_rows) {
$data = [];
$modules = '';
foreach ($agent_rows['row'] as $key_row => $row) {
$columns = explode(';', io_safe_output($row['data_format']));
array_push($columns, 'Timestamp');
html_print_action_buttons( $data_rows = explode(PHP_EOL, $row['data']);
'', foreach ($data_rows as $data_row) {
['type' => 'form_action'] // Exclude results don't match filter.
); if ($inventory_search_string && preg_match('/'.io_safe_output($inventory_search_string).'/', ($data_row)) == 0) {
continue;
}
$column_data = explode(';', io_safe_output($data_row));
if ($column_data[0] !== '') {
$row_tmp = [];
foreach ($column_data as $key => $value) {
$row_tmp[$columns[$key]] = $value;
}
$row_tmp['Timestamp'] = $row['timestamp'];
array_push($data, (object) $row_tmp);
}
}
$id_table = 'id_'.$key_row.'_'.$row['id_module_inventory'].'_'.$row['id_agente'];
$table = ui_print_datatable(
[
'id' => $id_table,
'class' => 'info_table w100p',
'style' => 'width: 99%',
'columns' => $columns,
'column_names' => $columns,
'no_sortable_columns' => [],
'data_element' => $data,
'searching' => true,
'dom_elements' => 'ftip',
'order' => [
'field' => $columns[0],
'direction' => 'asc',
],
'zeroRecords' => __('No inventory found'),
'emptyTable' => __('No inventory found'),
'return' => true,
'default_pagination' => 10,
'no_sortable_columns' => [-1],
]
);
$modules .= ui_toggle(
$table,
'<span class="title-blue">'.$row['name'].'</span>',
'',
'',
true,
true,
'',
'white-box-content w100p',
'box-shadow white_table_graph w100p',
'images/arrow_down_green.png',
'images/arrow_right_green.png',
false,
false,
false,
'',
'',
null,
null,
false,
$id_table
);
}
ui_toggle(
$modules,
$agent_rows['agent'],
'',
'',
false,
false
);
}
} else {
$count_rows = count($rows);
foreach ($rows as $module_rows) {
$agent = '';
$data = [];
foreach ($module_rows as $row) {
$columns = explode(';', io_safe_output($row['data_format']));
array_push($columns, 'Timestamp');
array_push($columns, 'Agent');
// Exclude results don't match filter.
if ($inventory_search_string && preg_match('/'.io_safe_output($inventory_search_string).'/', ($row['data'])) == 0) {
continue;
}
$data_tmp = [];
if ($row['data'] !== '') {
$values_explode = explode(';', io_safe_output($row['data']));
foreach ($values_explode as $key => $value) {
$data_tmp[$columns[$key]] = $value;
}
$data_tmp['Timestamp'] = $row['timestamp'];
$data_tmp['Agent'] = $row['name_agent'];
array_push($data, $data_tmp);
}
$id_table = 'id_'.$row['id_module_inventory'];
}
$table = ui_print_datatable(
[
'id' => $id_table,
'class' => 'info_table w100p',
'style' => 'width: 99%',
'columns' => $columns,
'column_names' => $columns,
'no_sortable_columns' => [],
'data_element' => $data,
'searching' => true,
'dom_elements' => 'ftip',
'order' => [
'field' => $columns[0],
'direction' => 'asc',
],
'zeroRecords' => __('No inventory found'),
'emptyTable' => __('No inventory found'),
'return' => true,
'no_sortable_columns' => [],
]
);
if ($count_rows > 1) {
ui_toggle(
$table,
array_shift($module_rows)['name'],
'',
'',
false,
false
);
} else {
echo $table;
html_print_action_buttons(
'',
['type' => 'form_action']
);
}
}
}
} }
} else {
$id_agente = $inventory_id_agent;
$agentes = [];
$data = [];
$class = 'info_table';
$style = 'width: 99%';
$ordering = true;
$searching = false;
$columns = [
'alias',
'ip',
'secondoaryIp',
'group',
'secondaryGroups',
'description',
'os',
'interval',
'lastContact',
'lastStatusChange',
'customFields',
'valuesCustomFields',
];
$columns_names = [
__('Alias'),
__('IP'),
__('Secondary IP'),
__('Group'),
__('Secondary groups'),
__('Description'),
__('OS'),
__('Interval'),
__('Last contact'),
__('Last status change'),
__('Custom fields'),
__('Values Custom Fields'),
];
ui_print_datatable(
[
'id' => 'basic_info',
'class' => $class,
'style' => $style,
'columns' => $columns,
'column_names' => $columns_names,
'ordering' => $ordering,
'searching' => $searching,
'order' => [
'field' => $columns[0],
'direction' => 'asc',
],
'ajax_url' => 'operation/inventory/inventory',
'ajax_data' => [
'get_data_basic_info' => 1,
'id_agent' => $id_agente,
'id_group' => $inventory_id_group,
],
'zeroRecords' => __('Agent info not found'),
'emptyTable' => __('Agent info not found'),
'return' => false,
]
);
html_print_action_buttons(
'',
['type' => 'form_action']
);
} }
ui_require_jquery_file('pandora.controls'); ui_require_jquery_file('pandora.controls');

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';

2
pandora_console/pandora_console.redhat.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.770 %define version 7.0NG.770
%define release 230330 %define release 230403
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name httpd %define httpd_name httpd

2
pandora_console/pandora_console.rhel7.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.770 %define version 7.0NG.770
%define release 230330 %define release 230403
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name httpd %define httpd_name httpd

2
pandora_console/pandora_console.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.770 %define version 7.0NG.770
%define release 230330 %define release 230403
%define httpd_name httpd %define httpd_name httpd
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name apache2 %define httpd_name apache2

24
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', '#99dd00'), ('graph_color1', '#1d7773'),
('graph_color2', '#336600'), ('graph_color2', '#82b92d'),
('graph_color3', '#3399cc'), ('graph_color3', '#fa4143'),
('graph_color4', '#ff66cc'), ('graph_color4', '#c0d7ea'),
('graph_color5', '#CC0000'), ('graph_color5', '#f3712a'),
('graph_color6', '#0033FF'), ('graph_color6', '#7151cb'),
('graph_color7', '#ff6600'), ('graph_color7', '#287ca2'),
('graph_color8', '#330066'), ('graph_color8', '#42aa8b'),
('graph_color9', '#ffff00'), ('graph_color9', '#d54f6b'),
('graph_color10', '#99ffff'), ('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),
@ -118,10 +118,10 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
('custom_report_front_logo', 'images/pandora_logo_white.jpg'), ('custom_report_front_logo', 'images/pandora_logo_white.jpg'),
('custom_report_front_header', ''), ('custom_report_front_header', ''),
('custom_report_front_footer', ''), ('custom_report_front_footer', ''),
('MR', 61), ('MR', 62),
('identification_reminder', 1), ('identification_reminder', 1),
('identification_reminder_timestamp', 0), ('identification_reminder_timestamp', 0),
('current_package', 769), ('current_package', 770),
('post_process_custom_values', '{"0.00000038580247":"Seconds&#x20;to&#x20;months","0.00000165343915":"Seconds&#x20;to&#x20;weeks","0.00001157407407":"Seconds&#x20;to&#x20;days","0.01666666666667":"Seconds&#x20;to&#x20;minutes","0.00000000093132":"Bytes&#x20;to&#x20;Gigabytes","0.00000095367432":"Bytes&#x20;to&#x20;Megabytes","0.00097656250000":"Bytes&#x20;to&#x20;Kilobytes","0.00000001653439":"Timeticks&#x20;to&#x20;weeks","0.00000011574074":"Timeticks&#x20;to&#x20;days"}'), ('post_process_custom_values', '{"0.00000038580247":"Seconds&#x20;to&#x20;months","0.00000165343915":"Seconds&#x20;to&#x20;weeks","0.00001157407407":"Seconds&#x20;to&#x20;days","0.01666666666667":"Seconds&#x20;to&#x20;minutes","0.00000000093132":"Bytes&#x20;to&#x20;Gigabytes","0.00000095367432":"Bytes&#x20;to&#x20;Megabytes","0.00097656250000":"Bytes&#x20;to&#x20;Kilobytes","0.00000001653439":"Timeticks&#x20;to&#x20;weeks","0.00000011574074":"Timeticks&#x20;to&#x20;days"}'),
('custom_docs_logo', 'default_docs.png'), ('custom_docs_logo', 'default_docs.png'),
('custom_support_logo', 'default_support.png'), ('custom_support_logo', 'default_support.png'),

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="

2
pandora_console/views/cluster/view.php
View File

@ -216,7 +216,7 @@ $table_agent_header .= '<div class="icono_right">'.$status_img.'</div>';
$table_agent_header .= '&nbsp;&nbsp;'; $table_agent_header .= '&nbsp;&nbsp;';
$table_agent_header .= '<a href="'.$model->url.'&op=force&id='.$cluster->id(); $table_agent_header .= '<a href="'.$model->url.'&op=force&id='.$cluster->id();
$table_agent_header .= '">'.html_print_image( $table_agent_header .= '">'.html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Force cluster status calculation'), 'title' => __('Force cluster status calculation'),

17
pandora_console/views/consoles/list.php
View File

@ -27,21 +27,22 @@
*/ */
// Header. // Header.
\ui_print_page_header( ui_print_standard_header(
// Title.
__('%s registered consoles', $config['rb_product_name']), __('%s registered consoles', $config['rb_product_name']),
// Icon.
'', '',
// Return.
false, false,
// Help.
'', '',
// Godmode.
true, true,
// Options. [],
'' [
[
'link' => '',
'label' => __('Servers'),
],
]
); );
if (empty($message) === false) { if (empty($message) === false) {
echo $message; echo $message;
} }

1
pandora_console/views/dashboard/formSlides.php
View File

@ -81,6 +81,7 @@ $inputs[] = [
'return' => true, 'return' => true,
'multiple' => true, 'multiple' => true,
'sort' => false, 'sort' => false,
'required' => 'required',
], ],
]; ];

4
pandora_console/views/dashboard/header.php
View File

@ -159,7 +159,7 @@ if ($public_dashboard_hash !== false) {
} }
$comboRefreshCountdown['text'] = '<div class="dashboard-countdown display_in"></div>'; $comboRefreshCountdown['text'] = '<div class="dashboard-countdown display_in"></div>';
$comboRefresh['text'] = '<form id="refr-form" method="post" class="mrgn_top_13px" action="'.$urlRefresh.'">'; $comboRefresh['text'] = '<form id="refr-form" method="post" class="mrgn_top_13px" action="'.$urlRefresh.'">';
$comboRefresh['text'] .= __('Refresh').':'; $comboRefresh['text'] .= __('Refresh').':';
$comboRefresh['text'] .= html_print_select( $comboRefresh['text'] .= html_print_select(
\get_refresh_time_array(), \get_refresh_time_array(),
@ -284,7 +284,7 @@ if (isset($config['public_dashboard']) === true
} }
} }
if ($publicLink === false) { if ($config['pure'] === false) {
ui_print_standard_header( ui_print_standard_header(
$dashboardName, $dashboardName,
'', '',

2
pandora_console/views/dashboard/slides.php
View File

@ -28,7 +28,7 @@
global $config; global $config;
$output = '<div id="dashboard-controls">'; $output = '<div id="dashboard-controls-slides">';
// Normal view button. // Normal view button.
$output .= '<div>'; $output .= '<div>';

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server package: pandorafms-server
Version: 7.0NG.770-230330 Version: 7.0NG.770-230403
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# 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. # GNU General Public License for more details.
pandora_version="7.0NG.770-230330" pandora_version="7.0NG.770-230403"
package_cpan=0 package_cpan=0
package_pandora=1 package_pandora=1

2
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -46,7 +46,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.770"; my $pandora_version = "7.0NG.770";
my $pandora_build = "230330"; my $pandora_build = "230403";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash # Setup hash

2
pandora_server/lib/PandoraFMS/PluginTools.pm
View File

@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.770"; my $pandora_version = "7.0NG.770";
my $pandora_build = "230330"; my $pandora_build = "230403";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] ); our %EXPORT_TAGS = ( 'all' => [ qw() ] );

2
pandora_server/pandora_server.redhat.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil} %global __os_install_post %{nil}
%define name pandorafms_server %define name pandorafms_server
%define version 7.0NG.770 %define version 7.0NG.770
%define release 230330 %define release 230403
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

2
pandora_server/pandora_server.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil} %global __os_install_post %{nil}
%define name pandorafms_server %define name pandorafms_server
%define version 7.0NG.770 %define version 7.0NG.770
%define release 230330 %define release 230403
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

2
pandora_server/pandora_server_installer
View File

@ -9,7 +9,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.770" PI_VERSION="7.0NG.770"
PI_BUILD="230330" PI_BUILD="230403"
MODE=$1 MODE=$1
if [ $# -gt 1 ]; then if [ $# -gt 1 ]; then

2
pandora_server/util/pandora_db.pl
View File

@ -35,7 +35,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB; use PandoraFMS::DB;
# version: define current version # version: define current version
my $version = "7.0NG.770 Build 230330"; my $version = "7.0NG.770 Build 230403";
# Pandora server configuration # Pandora server configuration
my %conf; my %conf;

2
pandora_server/util/pandora_manage.pl
View File

@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv; Encode::Locale::decode_argv;
# version: define current version # version: define current version
my $version = "7.0NG.770 Build 230330"; my $version = "7.0NG.770 Build 230403";
# save program name for logging # save program name for logging
my $progname = basename($0); my $progname = basename($0);

3
tentacle/tentacle_server
View File

@ -901,6 +901,9 @@ sub serve_client() {
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 ();