util directory into the Pandora agent path.
+ */
+ class Pandora_Module_Exec_Powershell : public Pandora_Module {
+
+ private:
+ string module_exec;
+
+ public:
+ Pandora_Module_Exec_Powershell (string name, string exec);
+ void run ();
+ };
+}
+
+#endif
diff --git a/pandora_agents/win32/modules/pandora_module_factory.cc b/pandora_agents/win32/modules/pandora_module_factory.cc
index de149293ff..dd71dc2dd8 100644
--- a/pandora_agents/win32/modules/pandora_module_factory.cc
+++ b/pandora_agents/win32/modules/pandora_module_factory.cc
@@ -22,6 +22,7 @@
#include "pandora_module_factory.h"
#include "pandora_module.h"
#include "pandora_module_exec.h"
+#include "pandora_module_exec_powershell.h"
#include "pandora_module_proc.h"
#include "pandora_module_service.h"
#include "pandora_module_freedisk.h"
@@ -129,6 +130,7 @@ using namespace Pandora_Strutils;
#define TOKEN_ALERT_TEMPLATE ("module_alert_template")
#define TOKEN_USER_SESSION ("module_user_session ")
#define TOKEN_WAIT_TIMEOUT ("module_wait_timeout ")
+#define TOKEN_EXEC_POWERSHELL ("module_exec_powershell ")
string
parseLine (string line, string token) {
@@ -158,7 +160,7 @@ Pandora_Module *
Pandora_Module_Factory::getModuleFromDefinition (string definition) {
list";
$table = new stdClass();
$table->width = '100%';
diff --git a/pandora_console/extensions/grafana/query.php b/pandora_console/extensions/grafana/query.php
index 3c7a843542..ac54d98161 100644
--- a/pandora_console/extensions/grafana/query.php
+++ b/pandora_console/extensions/grafana/query.php
@@ -23,6 +23,9 @@ if ($headers['Authorization']) {
list($user, $password) = explode(':', base64_decode($headers['Authorization']));
+ // Prevent sql injection.
+ $user = mysqli_real_escape_string($config['dbconnection'], $user);
+
// Check user login
$user_in_db = process_user_login($user, $password, true);
diff --git a/pandora_console/extensions/grafana/search.php b/pandora_console/extensions/grafana/search.php
index 9193dd290e..82b670398b 100644
--- a/pandora_console/extensions/grafana/search.php
+++ b/pandora_console/extensions/grafana/search.php
@@ -24,6 +24,9 @@ if ($headers['Authorization']) {
list($user, $password) = explode(':', base64_decode($headers['Authorization']));
+ // Prevent sql injection.
+ $user = mysqli_real_escape_string($config['dbconnection'], $user);
+
// Check user login
$user_in_db = process_user_login($user, $password, true);
diff --git a/pandora_console/extensions/insert_data.php b/pandora_console/extensions/insert_data.php
index 6f09d889f7..98e8886733 100644
--- a/pandora_console/extensions/insert_data.php
+++ b/pandora_console/extensions/insert_data.php
@@ -223,7 +223,7 @@ function mainInsertData()
'',
empty($agent_id)
);
- $table->data[1][2] = html_print_input_text('data', ($save === true) ? date(DATE_FORMAT) : $data, __('Data'), 10, 60, true);
+ $table->data[1][2] = html_print_input_text('date', ($save === true) ? date(DATE_FORMAT) : $data, __('Data'), 10, 60, true);
$table->data[1][2] .= ' ';
$table->data[1][2] .= html_print_input_text('time', ($save === true) ? date(TIME_FORMAT) : $time, '', 10, 7, true);
@@ -283,8 +283,14 @@ function mainInsertData()
secondText: '',
currentText: '',
closeText: ''});
-
- $("#text-date").datepicker({dateFormat: ""});
+
+ $('#text-date').datepicker ({
+ dateFormat: '',
+ changeMonth: true,
+ changeYear: true,
+ showAnim: 'slideDown',
+ firstDay: "",
+ });
$.datepicker.setDefaults($.datepicker.regional[ ""]);
});
diff --git a/pandora_console/extensions/quick_shell.php b/pandora_console/extensions/quick_shell.php
index 9ea79ba364..a3f5872f84 100644
--- a/pandora_console/extensions/quick_shell.php
+++ b/pandora_console/extensions/quick_shell.php
@@ -394,7 +394,7 @@ function quickShellSettings()
__('Address'),
html_print_input_text(
'gotty_addr',
- $config['gotty_addr'],
+ ($config['gotty_addr'] ?? ''),
'',
30,
100,
@@ -443,9 +443,8 @@ function quickShellSettings()
html_print_checkbox_switch(
'gotty_ssh_use_ssl',
1,
- $config['gotty_ssh_use_ssl'],
- true,
- $disable_agentaccess
+ ($config['gotty_ssh_use_ssl'] ?? false),
+ true
)
);
@@ -497,7 +496,7 @@ function quickShellSettings()
html_print_checkbox_switch(
'gotty_telnet_use_ssl',
1,
- $config['gotty_telnet_use_ssl'],
+ ($config['gotty_telnet_use_ssl'] ?? false),
true
)
);
diff --git a/pandora_console/extensions/realtime_graphs/ajax.php b/pandora_console/extensions/realtime_graphs/ajax.php
index 8b633171ab..1482540f91 100644
--- a/pandora_console/extensions/realtime_graphs/ajax.php
+++ b/pandora_console/extensions/realtime_graphs/ajax.php
@@ -128,6 +128,6 @@ if (empty($data)) {
}
echo '{
- "label": "'.htmlspecialchars($graph_title, ENT_QUOTES).'",
- "data": [["'.time().'", '.htmlspecialchars($data, ENT_QUOTES).']]
+ "label": "'.htmlspecialchars(($graph_title ?? ''), ENT_QUOTES).'",
+ "data": [["'.time().'", '.htmlspecialchars(($data ?? ''), ENT_QUOTES).']]
}';
diff --git a/pandora_console/extensions/resource_exportation.php b/pandora_console/extensions/resource_exportation.php
deleted file mode 100755
index 476b7ef1bf..0000000000
--- a/pandora_console/extensions/resource_exportation.php
+++ /dev/null
@@ -1,497 +0,0 @@
-'."\n";
- echo "\n";
- echo '- \n";
- echo '
'.io_safe_output($item['type'])." \n";
- echo ''.io_safe_output($item['description'])." \n";
- echo ''.io_safe_output($item['period'])." \n";
- if ($item['id_agent'] != 0) {
- $agent = db_get_value('alias', 'tagente', 'id_agente', $item['id_agent']);
- }
-
- if ($item['id_agent_module'] != 0) {
- $module = db_get_value('nombre', 'tagente_modulo', 'id_agente_modulo', $item['id_agent_module']);
- $id_agent = db_get_value('id_agente', 'tagente_modulo', 'id_agente_modulo', $item['id_agent_module']);
- $agent = db_get_value('alias', 'tagente', 'id_agente', $item['id_agent']);
-
- echo ''.$item['only_display_wrong']." \n";
- echo ''.$item['monday']." \n";
- echo ''.$item['tuesday']." \n";
- echo ''.$item['wednesday']." \n";
- echo ''.$item['thursday']." \n";
- echo ''.$item['friday']." \n";
- echo ''.$item['saturday']." \n";
- echo ''.$item['sunday']." \n";
- echo ''.$item['time_from']." \n";
- echo ''.$item['time_to']." \n";
-
- $slas = db_get_all_rows_field_filter('treport_content_sla_combined', 'id_report_content', $item['id_rc']);
- if ($slas === false) {
- $slas = [];
- }
-
- foreach ($slas as $sla) {
- $module = db_get_value('nombre', 'tagente_modulo', 'id_agente_modulo', $sla['id_agent_module']);
- $id_agent = db_get_value('id_agente', 'tagente_modulo', 'id_agente_modulo', $sla['id_agent_module']);
- $agent = db_get_value('alias', 'tagente', 'id_agente', $item['id_agent']);
- echo '';
- echo ''.$sla['sla_max']." \n";
- echo ''.$sla['sla_min']." \n";
- echo ''.$sla['sla_limit']." \n";
- echo ' ';
- }
- break;
-
- case 'text':
- echo ''.io_safe_output($sql)." \n";
- }
- break;
-
- case 'sql_graph_pie':
- case 'sql_graph_vbar':
- case 'sql_graph_hbar':
- echo ''.io_safe_output($item['header_definition'])." \n";
- if (!empty($item['external_source'])) {
- echo ''.io_safe_output($item['external_source'])." \n";
- } else {
- $sql = db_get_value('sql', 'treport_custom_sql', 'id', $item['treport_custom_sql_id']);
- echo ''.io_safe_output($sql)." \n";
- }
- break;
-
- case 'event_report_group':
- $group = db_get_value('nombre', 'tgrupo', 'id_grupo', $item['id_agent']);
- echo ' \n";
- }
-
- echo " \n";
-}
-
-
-function output_xml_visual_console($id)
-{
- $visual_map = db_get_row('tlayout', 'id', $id);
-
- echo ''."\n";
- echo "\n";
- echo ''.io_safe_output($visual_map['height'])." \n";
- echo ''.io_safe_output($visual_map['width'])." \n";
- $items = db_get_all_rows_field_filter('tlayout_data', 'id_layout', $visual_map['id']);
- if ($items === false) {
- $items = [];
- }
-
- foreach ($items as $item) {
- echo "- \n";
- echo '
'.$item['id']." \n";
- // OLD ID USE FOR parent item
- $agent = '';
- if ($item['id_agent'] != 0) {
- $agent = db_get_value('nombre', 'tagente', 'id_agente', $item['id_agent']);
- }
-
- if (!empty($item['label'])) {
- echo '\n";
- }
-
- echo ''.$item['pos_x']." \n";
- echo ''.$item['pos_y']." \n";
- echo ''.$item['type']." \n";
- if ($item['width'] != 0) {
- echo ''.$item['width']." \n";
- }
-
- if ($item['height'] != 0) {
- echo ''.$item['height']." \n";
- }
-
- if (!empty($item['image'])) {
- echo ''.$item['image']." \n";
- }
-
- if ($item['period'] != 0) {
- echo ''.$item['period']." \n";
- }
-
- if (isset($item['id_agente_modulo'])) {
- if ($item['id_agente_modulo'] != 0) {
- $module = db_get_value('nombre', 'tagente_modulo', 'id_agente_modulo', $item['id_agente_modulo']);
- $id_agent = db_get_value('id_agente', 'tagente_modulo', 'id_agente_modulo', $item['id_agente_modulo']);
- $agent = db_get_value('nombre', 'tagente', 'id_agente', $id_agent);
-
- echo ''.$item['id_layout_linked']." \n";
- }
-
- if ($item['parent_item'] != 0) {
- echo ''.$item['parent_item']." \n";
- }
-
- if (!empty($item['clock_animation'])) {
- echo ''.$item['clock_animation']." \n";
- }
-
- if (!empty($item['fill_color'])) {
- echo ''.$item['fill_color']." \n";
- }
-
- if (!empty($item['type_graph'])) {
- echo ''.$item['type_graph']." \n";
- }
-
- if (!empty($item['time_format'])) {
- echo ''.$item['time_format']." \n";
- }
-
- if (!empty($item['timezone'])) {
- echo ''.$item['timezone']." \n";
- }
-
- if (!empty($item['border_width'])) {
- echo ''.$item['border_width']." \n";
- }
-
- if (!empty($item['border_color'])) {
- echo ''.$item['border_color']." \n";
- }
-
- echo " \n";
- }
-
- echo " \n";
-}
-
-
-function get_name_xml_resource($hook_enterprise)
-{
- global $config;
-
- $type = get_parameter('type');
- $id = (int) get_parameter('id');
-
- switch ($type) {
- case 'report':
- $name = db_get_value('name', 'treport', 'id_report', $id);
- break;
-
- case 'visual_console':
- $name = db_get_value('name', 'tlayout', 'id', $id);
- break;
-
- default:
- if ($hook_enterprise === true) {
- return enterprise_get_name_xml_resource($type, $id);
- }
- break;
- }
-
- $file = io_safe_output($name).'.ptr';
-
- return $file;
-}
-
-
-function get_xml_resource()
-{
- global $config;
-
- $hook_enterprise = enterprise_include('extensions/resource_exportation/functions.php');
-}
-
-
-function resource_exportation_extension_main()
-{
- global $config;
-
- check_login();
-
- if (! check_acl($config['id_user'], 0, 'PM') && ! is_user_admin($config['id_user'])) {
- db_pandora_audit(
- AUDIT_LOG_ACL_VIOLATION,
- 'Trying to access Setup Management'
- );
- include 'general/noaccess.php';
- return;
- }
-
- $hook_enterprise = enterprise_include('extensions/resource_exportation/functions.php');
-
- ui_print_standard_header(
- __('Resource exportation'),
- 'images/extensions.png',
- false,
- '',
- true,
- [],
- [
- [
- 'link' => '',
- 'label' => __('Resources'),
- ],
- [
- 'link' => '',
- 'label' => __('Resource exporting'),
- ],
- ]
- );
-
- ui_print_warning_message(
- __('This extension makes exportation of resource template more easy.').'
'.__('You can export resource templates in .ptr format.') - ); - - $table = new stdClass(); - $table->class = 'databox filter-table-adv'; - $table->id = 'resource_exportation_table'; - $table->style = []; - $table->style[0] = 'width: 30%'; - $table->style[1] = 'vertical-align: bottom;'; - $table->data = []; - $table->data[0][] = html_print_label_input_block( - __('Report'), - html_print_div( - [ - 'class' => 'flex-content-left', - 'content' => html_print_select_from_sql('SELECT id_report, name FROM treport', 'report', '', '', '', 0, true), - ], - true - ) - ); - $table->data[0][] = html_print_button(__('Export'), '', false, 'export_to_ptr("report");', '', true); - - $table->data[1][] = html_print_label_input_block( - __('Visual console'), - html_print_div( - [ - 'class' => 'flex-content-left', - 'content' => html_print_select_from_sql('SELECT id, name FROM tlayout', 'visual_console', '', '', '', 0, true), - ], - true - ) - ); - $table->data[1][] = html_print_button(__('Export'), '', false, 'export_to_ptr("visual_console");', '', true); - - if ($hook_enterprise === true) { - add_rows_for_enterprise($table->data); - } - - html_print_table($table); - - ?> - - $name) { - $values['id_report'] = $id; - $result = (bool) db_process_sql_insert('treport_content', $values); - - ui_print_result_message( - $result, - sprintf( - __("Success add '%s' item in report '%s'."), - $values['type'], - $name - ), - sprintf( - __("Error create '%s' item in report '%s'."), - $values['type'], - $name - ) - ); - } -} - - -function process_upload_xml_report($xml, $group_filter=0) -{ - foreach ($xml->xpath('/report') as $reportElement) { - $values = []; - - if (isset($reportElement->name)) { - $values['name'] = $reportElement->name; - - $posible_name = $values['name']; - $exist = true; - $loops = 30; - // Loops to exit or tries. - while ($exist && $loops > 0) { - $exist = (bool) db_get_row_filter( - 'treport', - ['name' => io_safe_input($posible_name)] - ); - - if ($exist) { - $loops--; - $posible_name = $values['name'].' ('.(30 - $loops).')'; - } - } - - if ($exist) { - ui_print_error_message( - sprintf( - __("Error create '%s' report, the name exist and there aren't free name."), - $reportElement->name - ) - ); - break; - } else if ($loops != 30) { - ui_print_warning_message( - sprintf( - __("Warning create '%s' report, the name exist, the report have a name %s."), - $reportElement->name, - $posible_name - ) - ); - } - - $values['name'] = io_safe_input($posible_name); - } else { - ui_print_error_message(__("Error the report haven't name.")); - break; - } - - if (isset($reportElement->group) === true - && empty($reportElement->group) === false - ) { - $id_group = db_get_value( - 'id_grupo', - 'tgrupo', - 'nombre', - $reportElement->group - ); - if ($id_group === false) { - ui_print_error_message(__("Error the report haven't group.")); - break; - } - } - - if (isset($reportElement->description) === true) { - $values['description'] = $reportElement->description; - } - - $id_report = db_process_sql_insert('treport', $values); - - ui_print_result_message( - $id_report, - sprintf(__("Success create '%s' report."), $posible_name), - sprintf(__("Error create '%s' report."), $posible_name) - ); - - if ($id_report) { - db_pandora_audit( - AUDIT_LOG_REPORT_MANAGEMENT, - 'Create report '.$id_report, - false, - false - ); - } else { - db_pandora_audit( - AUDIT_LOG_REPORT_MANAGEMENT, - 'Fail to create report', - false, - false - ); - break; - } - - foreach ($reportElement->item as $item) { - $item = (array) $item; - - $values = []; - $values['id_report'] = $id_report; - if (isset($item['description']) === true) { - $values['description'] = io_safe_input($item['description']); - } - - if (isset($item['period']) === true) { - $values['period'] = io_safe_input($item['period']); - } - - if (isset($item['type']) === true) { - $values['type'] = io_safe_input($item['type']); - } - - $agents_item = []; - if (isset($item['agent']) === true) { - $agents = agents_get_agents( - ['id_grupo' => $group_filter], - [ - 'id_agente', - 'alias', - ] - ); - - $agent_clean = str_replace( - [ - '[', - ']', - ], - '', - io_safe_output($item['agent']) - ); - $regular_expresion = ($agent_clean != $item['agent']); - - foreach ($agents as $agent) { - if ($regular_expresion) { - if ((bool) preg_match('/'.$agent_clean.'/', io_safe_output($agent['alias']))) { - $agents_item[$agent['id_agente']]['name'] = $agent['alias']; - } - } else { - if ($agent_clean == io_safe_output($agent['alias'])) { - $agents_item[$agent['id_agente']]['name'] = $agent['alias']; - } - } - } - } - - if (isset($item['module']) === true) { - $module_clean = str_replace(['[', ']'], '', $item['module']); - $regular_expresion = ($module_clean != $item['module']); - - foreach ($agents_item as $id => $agent) { - $modules = db_get_all_rows_filter( - 'tagente_modulo', - ['id_agente' => $id], - [ - 'id_agente_modulo', - 'nombre', - ] - ); - - $agents_item[$id]['modules'] = []; - - foreach ($modules as $module) { - if ($regular_expresion) { - if ((bool) preg_match('/'.$module_clean.'/', io_safe_output($module['nombre']))) { - $agents_item[$id]['modules'][$module['id_agente_modulo']]['name'] = $module['nombre']; - } - } else { - if ($module_clean == io_safe_output($module['nombre'])) { - $agents_item[$id]['modules'][$module['id_agente_modulo']]['name'] = $module['nombre']; - } - } - } - } - } - - switch ($item['type']) { - case 2: - case 'custom_graph': - case 'automatic_custom_graph': - $group = db_get_value('id_grupo', 'tgrupo', 'nombre', io_safe_input($item['graph'])); - $values['id_gs'] = $group; - break; - - case 3: - case 'SLA': - if (isset($item['only_display_wrong'])) { - $values['only_display_wrong'] = (string) $item['only_display_wrong']; - } - - if (isset($item['monday'])) { - $values['monday'] = (string) $item['monday']; - } - - if (isset($item['tuesday'])) { - $values['tuesday'] = (string) $item['tuesday']; - } - - if (isset($item['wednesday'])) { - $values['wednesday'] = (string) $item['wednesday']; - } - - if (isset($item['thursday'])) { - $values['thursday'] = (string) $item['thursday']; - } - - if (isset($item['friday'])) { - $values['friday'] = (string) $item['friday']; - } - - if (isset($item['saturday'])) { - $values['saturday'] = (string) $item['saturday']; - } - - if (isset($item['sunday'])) { - $values['sunday'] = (string) $item['sunday']; - } - - if (isset($item['time_from'])) { - $values['time_from'] = (string) $item['time_from']; - } - - if (isset($item['time_to'])) { - $values['time_to'] = (string) $item['time_to']; - } - - $slas = []; - if (!isset($item['sla'])) { - $item['sla'] = []; - } - - foreach ($item['sla'] as $sla_xml) { - if (isset($sla_xml->agent)) { - $agents = agents_get_agents(['id_grupo' => $group_filter], ['id_agente', 'nombre']); - - $agent_clean = str_replace(['[', ']'], '', $sla_xml->agent); - $regular_expresion = ($agent_clean != $sla_xml->agent); - - foreach ($agents as $agent) { - $id_agent = false; - if ($regular_expresion) { - if ((bool) preg_match('/'.$agent_clean.'/', io_safe_output($agent['nombre']))) { - $id_agent = $agent['id_agente']; - } else { - if ($agent_clean == io_safe_output($agent['nombre'])) { - $id_agent = $agent['id_agente']; - } - } - } - - if ($id_agent) { - if (isset($sla_xml->module)) { - $module_clean = str_replace(['[', ']'], '', $sla_xml->module); - $regular_expresion = ($module_clean != $sla_xml->module); - - $modules = db_get_all_rows_filter( - 'tagente_modulo', - ['id_agente' => $id_agent], - [ - 'id_agente_modulo', - 'nombre', - ] - ); - - foreach ($modules as $module) { - if ($regular_expresion) { - if ((bool) preg_match('/'.$module_clean.'/', io_safe_output($module['nombre']))) { - $slas[] = [ - 'id_agent_module' => $module['id_agente_modulo'], - 'sla_max' => (string) $sla_xml->sla_max, - 'sla_min' => (string) $sla_xml->sla_min, - 'sla_limit' => (string) $sla_xml->sla_limit, - ]; - } - } else { - if ($module_clean == io_safe_output($module['nombre'])) { - $slas[] = [ - 'id_agent_module' => $module['id_agente_modulo'], - 'sla_max' => (string) $sla_xml->sla_max, - 'sla_min' => (string) $sla_xml->sla_min, - 'sla_limit' => (string) $sla_xml->sla_limit, - ]; - } - } - } - } - } - } - } - } - break; - - case 'text': - $values['text'] = io_safe_input($item['text']); - break; - - case 'sql': - $values['header_definition'] = io_safe_input($item['header_definition']); - $values['external_source'] = io_safe_input($item['sql']); - break; - - case 'sql_graph_pie': - case 'sql_graph_vbar': - case 'sql_graph_hbar': - $values['header_definition'] = io_safe_input($item['header_definition']); - $values['external_source'] = io_safe_input($item['sql']); - break; - - case 'event_report_group': - $values['id_agent'] = db_get_value('id_grupo', 'tgrupo', 'nombre', io_safe_input($item->group)); - break; - - case 'url': - $values['external_source'] = io_safe_input($item['url']); - break; - - case 'database_serialized': - $values['header_definition'] = io_safe_input($item['header_definition']); - $values['line_separator'] = io_safe_input($item['line_separator']); - $values['column_separator'] = io_safe_input($item['column_separator']); - break; - - case 1: - case 'simple_graph': - case 'simple_baseline_graph': - case 6: - case 'monitor_report': - case 7: - case 'avg_value': - case 8: - case 'max_value': - case 9: - case 'min_value': - case 10: - case 'sumatory': - case 'event_report_module': - case 'alert_report_module': - case 'alert_report_agent': - case 'alert_report_group': - case 'agent_detailed_event': - case 'event_report_agent': - default: - // Do nothing. - break; - } - - if (empty($agents_item) === true) { - $id_content = db_process_sql_insert('treport_content', $values); - ui_print_result_message( - $id_content, - sprintf(__("Success add '%s' content."), $values['type']), - sprintf(__("Error add '%s' action."), $values['type']) - ); - - if ($item['type'] == 'SLA') { - foreach ($slas as $sla) { - $sla['id_report_content'] = $id_content; - $result = db_process_sql_insert('treport_content_sla_combined', $sla); - ui_print_result_message( - $result, - sprintf(__("Success add '%s' SLA."), $sla['id_agent_module']), - sprintf(__("Error add '%s' SLA."), $sla['id_agent_module']) - ); - } - } - } else { - foreach ($agents_item as $id_agent => $agent) { - if (empty($agent['modules'])) { - $values['id_agent'] = $id_agent; - $id_content = db_process_sql_insert('treport_content', $values); - ui_print_result_message( - $id_content, - sprintf(__("Success add '%s' content."), $values['type']), - sprintf(__("Error add '%s' action."), $values['type']) - ); - } else { - foreach ($agent['modules'] as $id_module => $module) { - $values['id_agent_module'] = $id_module; - $values['id_agent'] = $id_agent; - - $id_content = db_process_sql_insert('treport_content', $values); - ui_print_result_message( - $id_content, - sprintf(__("Success add '%s' content."), $values['type']), - sprintf(__("Error add '%s' action."), $values['type']) - ); - } - } - } - } - } - } -} - - -function process_upload_xml_visualmap($xml, $filter_group=0) -{ - global $config; - - foreach ($xml->xpath('/visual_map') as $visual_map) { - if (isset($visual_map->name)) { - $values['name'] = (string) $visual_map->name; - } else { - ui_print_error_message( - __("Error create '%s' visual map, lost tag name.") - ); - break; - } - - $values['id_group'] = 0; - if (isset($visual_map->group)) { - $id_group = db_get_value('id_grupo', 'tgrupo', 'nombre', io_safe_input($visual_map->group)); - if ($id_group !== false) { - $values['id_group'] = $id_group; - } - } - - if (isset($visual_map->background)) { - $values['background'] = (string) $visual_map->background; - } - - $values['width'] = 0; - if (isset($visual_map->width)) { - $values['width'] = (string) $visual_map->width; - } - - $values['height'] = 0; - if (isset($visual_map->height)) { - $values['height'] = (string) $visual_map->height; - } - - $posible_name = $values['name']; - $exist = true; - $loops = 30; - // Loops to exit or tries - while ($exist && $loops > 0) { - $exist = (bool) db_get_row_filter('tlayout', ['name' => io_safe_input($posible_name)]); - - if ($exist) { - $loops--; - $posible_name = $values['name'].' ('.(30 - $loops).')'; - } - } - - if ($exist) { - ui_print_error_message( - sprintf( - __("Error create '%s' visual map, the name exist and there aren't free name."), - $values['name'] - ) - ); - continue; - } else if ($loops != 30) { - ui_print_error_message( - sprintf( - __("Warning create '%s' visual map, the name exist, the report have a name %s."), - $values['name'], - $posible_name - ) - ); - } - - $values['name'] = io_safe_input($posible_name); - $id_visual_map = db_process_sql_insert('tlayout', $values); - - ui_print_result_message( - (bool) $id_visual_map, - sprintf(__("Success create '%s' visual map."), $posible_name), - sprintf(__("Error create '%s' visual map."), $posible_name) - ); - - if ($id_visual_map !== false) { - db_pandora_audit( - AUDIT_LOG_VISUAL_CONSOLE_MANAGEMENT, - sprintf('Create Visual Console #%s', $id_visual_map), - $config['id_user'] - ); - } else { - break; - } - - $relation_other_ids = []; - - foreach ($visual_map->item as $item) { - $no_agents = true; - - if (isset($item->agent)) { - $agent_clean = str_replace(['[', ']'], '', $item->agent); - $regular_expresion = ($agent_clean != $item->agent); - - $agents = agents_get_agents(['id_grupo' => $filter_group], ['id_agente', 'nombre']); - if ($agents === false) { - $agents = []; - } - - $temp = []; - foreach ($agents as $agent) { - $temp[$agent['id_agente']] = $agent['nombre']; - } - - $agents = $temp; - - $agents_in_item = []; - foreach ($agents as $id => $agent) { - if ($regular_expresion) { - if ((bool) preg_match('/'.$agent_clean.'/', io_safe_output($agent))) { - $agents_in_item[$id]['name'] = $agent; - $no_agents = false; - } - } else { - if ($agent_clean == io_safe_output($agent)) { - $agents_in_item[$id]['name'] = $agent; - $no_agents = false; - break; - } - } - } - } - - $no_modules = true; - if (isset($item->module)) { - $module_clean = str_replace(['[', ']'], '', $item->module); - $regular_expresion = ($module_clean != $item->module); - - foreach ($agents_in_item as $id => $agent) { - $modules = db_get_all_rows_filter( - 'tagente_modulo', - ['id_agente' => $id], - [ - 'id_agente_modulo', - 'nombre', - ] - ); - - $modules_in_item = []; - foreach ($modules as $module) { - if ($regular_expresion) { - if ((bool) preg_match('/'.$module_clean.'/', io_safe_output($module['nombre']))) { - $modules_in_item[$module['id_agente_modulo']] = $module['nombre']; - $no_modules = false; - } - } else { - if ($module_clean == io_safe_output($module['nombre'])) { - $modules_in_item[$module['id_agente_modulo']] = $module['nombre']; - $no_modules = false; - break; - } - } - } - - $agents_in_item[$id]['modules'] = $modules_in_item; - } - } - - $values = []; - - $values['id_layout'] = $id_visual_map; - if (isset($item->label)) { - $values['label'] = io_safe_input($item->label); - } - - if (isset($item->x)) { - $values['pos_x'] = (string) $item->x; - } - - if (isset($item->y)) { - $values['pos_y'] = (string) $item->y; - } - - if (isset($item->height)) { - $values['height'] = (string) $item->height; - } - - if (isset($item->width)) { - $values['width'] = (string) $item->width; - } - - if (isset($item->image)) { - $values['image'] = (string) $item->image; - } - - if (isset($item->period)) { - $values['period'] = (string) $item->period; - } - - if (isset($item->parent_item)) { - // Hack for link the items use theOTHER_ID
- // and have too OTHER_ID
- // then $relation_other_ids[OTHER_ID] have the item_id in DB.
- $values['parent_item'] = (string) $relation_other_ids[(string) $item->parent_item];
- }
-
- if (isset($item->map_linked)) {
- $values['id_layout_linked'] = (string) $item->map_linked;
- }
-
- if (isset($item->type)) {
- $values['type'] = (string) $item->type;
- }
-
- if (isset($item->clock_animation)) {
- $values['clock_animation'] = (string) $item->clock_animation;
- }
-
- if (isset($item->fill_color)) {
- $values['fill_color'] = (string) $item->fill_color;
- }
-
- if (isset($item->type_graph)) {
- $values['type_graph'] = (string) $item->type_graph;
- }
-
- if (isset($item->time_format)) {
- $values['time_format'] = (string) $item->time_format;
- }
-
- if (isset($item->timezone)) {
- $values['timezone'] = (string) $item->timezone;
- }
-
- if (isset($item->border_width)) {
- $values['border_width'] = (string) $item->border_width;
- }
-
- if (isset($item->border_color)) {
- $values['border_color'] = (string) $item->border_color;
- }
-
- if ($no_agents) {
- $id_item = db_process_sql_insert('tlayout_data', $values);
-
- ui_print_result_message(
- (bool) $id_item,
- sprintf(__("Success create item type '%d' visual map."), $values['type']),
- sprintf(__("Error create item type '%d' visual map."), $values['type'])
- );
-
- if ($id_item !== false) {
- db_pandora_audit(
- AUDIT_LOG_VISUAL_CONSOLE_MANAGEMENT,
- sprintf('Create Item %s in Visual Console #%s', $id_item, $values['id_layout']),
- $config['id_user']
- );
- }
- } else {
- foreach ($agents_in_item as $id => $agent) {
- if ($no_modules) {
- $values['id_agent'] = $id;
-
- $id_item = db_process_sql_insert('tlayout_data', $values);
-
- if (isset($item->other_id) === true) {
- $relation_other_ids[(string) $item->other_id] = $id_item;
- }
-
- ui_print_result_message(
- (bool) $id_item,
- sprintf(__("Success create item for agent '%s' visual map."), $agent['name']),
- sprintf(__("Error create item for agent '%s' visual map."), $agent['name'])
- );
-
- if ($id_item !== false) {
- db_pandora_audit(
- AUDIT_LOG_VISUAL_CONSOLE_MANAGEMENT,
- sprintf('Create Item %s in Visual Console #%s', $id_item, $values['id_layout']),
- $config['id_user']
- );
- }
- } else {
- // TODO: Review this else.
- foreach ($agent['modules'] as $id_module => $module) {
- $values['id_agent'] = $id;
- $values['id_agente_modulo'] = $id_module;
-
- db_process_sql_insert('tlayout_data', $values);
-
- ui_print_result_message(
- (bool) $id_item,
- sprintf(__("Success create item for agent '%s' visual map."), $agent['name']),
- sprintf(__("Error create item for agent '%s' visual map."), $agent['name'])
- );
-
- if ($id_item !== false) {
- db_pandora_audit(
- AUDIT_LOG_VISUAL_CONSOLE_MANAGEMENT,
- sprintf('Create Item %s in Visual Console #%s', $id_item, $values['id_layout']),
- $config['id_user']
- );
- }
- }
- }
- }
- }
- }
- }
-}
-
-
-function process_upload_xml_component($xml)
-{
- // Extract components.
- $components = [];
- foreach ($xml->xpath('/component') as $componentElement) {
- $name = io_safe_input((string) $componentElement->name);
- $id_os = (int) $componentElement->id_os;
- $os_version = io_safe_input((string) $componentElement->os_version);
- $data = io_safe_input((string) $componentElement->data);
- $type = (int) $componentElement->type;
- $group = (int) $componentElement->group;
- $description = io_safe_input((string) $componentElement->description);
- $module_interval = (int) $componentElement->module_interval;
- $max = (float) $componentElement->max;
- $min = (float) $componentElement->min;
- $tcp_send = io_safe_input((string) $componentElement->tcp_send);
- $tcp_rcv_text = io_safe_input((string) $componentElement->tcp_rcv_text);
- $tcp_port = (int) $componentElement->tcp_port;
- $snmp_oid = io_safe_input((string) $componentElement->snmp_oid);
- $snmp_community = io_safe_input((string) $componentElement->snmp_community);
- $id_module_group = (int) $componentElement->id_module_group;
- $module_source = (int) $componentElement->module_source;
- $plugin = (int) $componentElement->plugin;
- $plugin_username = io_safe_input((string) $componentElement->plugin_username);
- $plugin_password = io_safe_input((string) $componentElement->plugin_password);
- $plugin_parameters = io_safe_input((string) $componentElement->plugin_parameters);
- $max_timeout = (int) $componentElement->max_timeout;
- $max_retries = (int) $componentElement->max_retries;
- $historical_data = (int) $componentElement->historical_data;
- $dynamic_interval = (int) $componentElement->dynamic_interval;
- $dynamic_min = (int) $componentElement->dynamic_min;
- $dynamic_max = (int) $componentElement->dynamic_max;
- $dynamic_two_tailed = (int) $componentElement->dynamic_two_tailed;
- $min_war = (float) $componentElement->min_war;
- $max_war = (float) $componentElement->max_war;
- $str_war = (string) $componentElement->str_war;
- $min_cri = (float) $componentElement->min_cri;
- $max_cri = (float) $componentElement->max_cri;
- $str_cri = (string) $componentElement->str_cri;
- $ff_treshold = (int) $componentElement->ff_treshold;
- $snmp_version = (int) $componentElement->snmp_version;
- $auth_user = io_safe_input((string) $componentElement->auth_user);
- $auth_password = io_safe_input((string) $componentElement->auth_password);
- $auth_method = io_safe_input((string) $componentElement->auth_method);
- $privacy_method = io_safe_input((string) $componentElement->privacy_method);
- $privacy_pass = io_safe_input((string) $componentElement->privacy_pass);
- $security_level = io_safe_input((string) $componentElement->security_level);
- $wmi_query = io_safe_input((string) $componentElement->wmi_query);
- $key_string = io_safe_input((string) $componentElement->key_string);
- $field_number = (int) $componentElement->field_number;
- $namespace = io_safe_input((string) $componentElement->namespace);
- $wmi_user = io_safe_input((string) $componentElement->wmi_user);
- $wmi_password = io_safe_input((string) $componentElement->wmi_password);
- $post_process = io_safe_input((float) $componentElement->post_process);
-
- $idComponent = false;
- switch ((int) $componentElement->module_source) {
- case 1:
- // Local component.
- $values = [
- 'description' => $description,
- 'id_network_component_group' => $group,
- 'os_version' => $os_version,
- ];
- $return = enterprise_hook('local_components_create_local_component', [$name, $data, $id_os, $values]);
- if ($return !== ENTERPRISE_NOT_HOOK) {
- $idComponent = $return;
- }
- break;
-
- case 2:
- // Network component
- // for modules
- // 15 = remote_snmp, 16 = remote_snmp_inc,
- // 17 = remote_snmp_string, 18 = remote_snmp_proc.
- $custom_string_1 = '';
- $custom_string_2 = '';
- $custom_string_3 = '';
- if ($type >= 15 && $type <= 18) {
- // New support for snmp v3.
- $tcp_send = $snmp_version;
- $plugin_user = $auth_user;
- $plugin_pass = $auth_password;
- $plugin_parameters = $auth_method;
- $custom_string_1 = $privacy_method;
- $custom_string_2 = $privacy_pass;
- $custom_string_3 = $security_level;
- }
-
- $idComponent = network_components_create_network_component(
- $name,
- $type,
- $group,
- [
- 'description' => $description,
- 'module_interval' => $module_interval,
- 'max' => $max,
- 'min' => $min,
- 'tcp_send' => $tcp_send,
- 'tcp_rcv' => $tcp_rcv_text,
- 'tcp_port' => $tcp_port,
- 'snmp_oid' => $snmp_oid,
- 'snmp_community' => $snmp_community,
- 'id_module_group' => $id_module_group,
- 'id_modulo' => $module_source,
- 'id_plugin' => $plugin,
- 'plugin_user' => $plugin_username,
- 'plugin_pass' => $plugin_password,
- 'plugin_parameter' => $plugin_parameters,
- 'max_timeout' => $max_timeout,
- 'max_retries' => $max_retries,
- 'history_data' => $historical_data,
- 'dynamic_interval' => $dynamic_interval,
- 'dynamic_min' => $dynamic_min,
- 'dynamic_max' => $dynamic_max,
- 'dynamic_two_tailed' => $dynamic_two_tailed,
- 'min_warning' => $min_war,
- 'max_warning' => $max_war,
- 'str_warning' => $str_war,
- 'min_critical' => $min_cri,
- 'max_critical' => $max_cri,
- 'str_critical' => $str_cri,
- 'min_ff_event' => $ff_treshold,
- 'custom_string_1' => $custom_string_1,
- 'custom_string_2' => $custom_string_2,
- 'custom_string_3' => $custom_string_3,
- 'post_process' => $post_process,
- ]
- );
- if ((bool) $idComponent === true) {
- $components[] = $idComponent;
- }
- break;
-
- case 4:
- // Plugin component.
- $idComponent = network_components_create_network_component(
- $name,
- $type,
- $group,
- [
- 'description' => $description,
- 'module_interval' => $module_interval,
- 'max' => $max,
- 'min' => $min,
- 'tcp_send' => $tcp_send,
- 'tcp_rcv' => $tcp_rcv_text,
- 'tcp_port' => $tcp_port,
- 'snmp_oid' => $snmp_oid,
- 'snmp_community' => $snmp_community,
- 'id_module_group' => $id_module_group,
- 'id_modulo' => $module_source,
- 'id_plugin' => $plugin,
- 'plugin_user' => $plugin_username,
- 'plugin_pass' => $plugin_password,
- 'plugin_parameter' => $plugin_parameters,
- 'max_timeout' => $max_timeout,
- 'max_retries' => $max_retries,
- 'history_data' => $historical_data,
- 'dynamic_interval' => $dynamic_interval,
- 'dynamic_min' => $dynamic_min,
- 'dynamic_max' => $dynamic_max,
- 'dynamic_two_tailed' => $dynamic_two_tailed,
- 'min_warning' => $min_war,
- 'max_warning' => $max_war,
- 'str_warning' => $str_war,
- 'min_critical' => $min_cri,
- 'max_critical' => $max_cri,
- 'str_critical' => $str_cri,
- 'min_ff_event' => $ff_treshold,
- 'custom_string_1' => $custom_string_1,
- 'custom_string_2' => $custom_string_2,
- 'custom_string_3' => $custom_string_3,
- 'post_process' => $post_process,
- ]
- );
- if ((bool) $idComponent === true) {
- $components[] = $idComponent;
- }
- break;
-
- case 6:
- // WMI component.
- $idComponent = network_components_create_network_component(
- $name,
- $type,
- $group,
- [
- 'description' => $description,
- 'module_interval' => $module_interval,
- 'max' => $max,
- 'min' => $min,
- 'tcp_send' => $namespace,
- // work around
- 'tcp_rcv' => $tcp_rcv_text,
- 'tcp_port' => $field_number,
- // work around
- 'snmp_oid' => $wmi_query,
- // work around
- 'snmp_community' => $key_string,
- // work around
- 'id_module_group' => $id_module_group,
- 'id_modulo' => $module_source,
- 'id_plugin' => $plugin,
- 'plugin_user' => $wmi_user,
- // work around
- 'plugin_pass' => $wmi_password,
- // work around
- 'plugin_parameter' => $plugin_parameters,
- 'max_timeout' => $max_timeout,
- 'max_retries' => $max_retries,
- 'history_data' => $historical_data,
- 'dynamic_interval' => $dynamic_interval,
- 'dynamic_min' => $dynamic_min,
- 'dynamic_max' => $dynamic_max,
- 'dynamic_two_tailed' => $dynamic_two_tailed,
- 'min_warning' => $min_war,
- 'max_warning' => $max_war,
- 'str_warning' => $str_war,
- 'min_critical' => $min_cri,
- 'max_critical' => $max_cri,
- 'str_critical' => $str_cri,
- 'min_ff_event' => $ff_treshold,
- 'custom_string_1' => $custom_string_1,
- 'custom_string_2' => $custom_string_2,
- 'custom_string_3' => $custom_string_3,
- 'post_process' => $post_process,
- ]
- );
- if ((bool) $idComponent === true) {
- $components[] = $idComponent;
- }
- break;
-
- case 5:
- // Prediction component.
- case 7:
- // Web component.
- default:
- // Do nothing.
- break;
- }
-
- ui_print_result_message(
- (bool) $idComponent,
- sprintf(__("Success create '%s' component."), $name),
- sprintf(__("Error create '%s' component."), $name)
- );
- }
-
- // Extract the template.
- $templateElement = $xml->xpath('//template');
- if (empty($templateElement) === false) {
- $templateElement = $templateElement[0];
-
- $templateName = (string) $templateElement->name;
- $templateDescription = (string) $templateElement->description;
-
- $idTemplate = db_process_sql_insert('tnetwork_profile', ['name' => $templateName, 'description' => $templateDescription]);
-
- $result = false;
- if ((bool) $idTemplate) {
- foreach ($components as $idComponent) {
- db_process_sql_insert('tnetwork_profile_component', ['id_nc' => $idComponent, 'id_np' => $idTemplate]);
- }
- }
- }
-}
-
-
-function process_upload_xml($xml)
-{
- $hook_enterprise = enterprise_include('extensions/resource_registration/functions.php');
-
- // Extract component.
- process_upload_xml_component($xml);
-
- $group_filter = get_parameter('group');
-
- // Extract visual map.
- process_upload_xml_visualmap($xml, $group_filter);
-
- // Extract policies.
- if ($hook_enterprise === true) {
- $centralized_management = is_management_allowed();
- if ($centralized_management === true) {
- process_upload_xml_policy($xml, $group_filter);
- }
- }
-
- // Extract reports.
- process_upload_xml_report($xml, $group_filter);
-}
-
-
-function resource_registration_extension_main()
-{
- global $config;
-
- if (! check_acl($config['id_user'], 0, 'PM') && ! is_user_admin($config['id_user'])) {
- db_pandora_audit(
- AUDIT_LOG_ACL_VIOLATION,
- 'Trying to access Setup Management'
- );
- include 'general/noaccess.php';
- return;
- }
-
- include_once $config['homedir'].'/include/functions_network_components.php';
- include_once $config['homedir'].'/include/functions_db.php';
- enterprise_include_once('include/functions_local_components.php');
-
- ui_print_standard_header(
- __('Resource registration'),
- 'images/extensions.png',
- false,
- '',
- true,
- [],
- [
- [
- 'link' => '',
- 'label' => __('Resources'),
- ],
- [
- 'link' => '',
- 'label' => __('Resource registration'),
- ],
- ]
- );
-
- if (extension_loaded('libxml') === false) {
- ui_print_error_message(_('Error, please install the PHP libXML in the system.'));
-
- return;
- }
-
- if (is_management_allowed() === false) {
- if (is_metaconsole() === false) {
- $url = ''.__('metaconsole').'';
- } else {
- $url = __('any node');
- }
-
- ui_print_warning_message(
- __(
- 'This node is configured with centralized mode. Go to %s to create a policy.',
- $url
- )
- );
-
- return;
- }
-
- ui_print_warning_message(
- __('This extension makes registering resource templates easier.').'
'.__('Here you can upload a resource template in .ptr format.').'
'.__('Please refer to our documentation for more information on how to obtain and use %s resources.', get_product_name()).' '.'
'.__('You can get more resurces in our Public Resource Library') - ); - - $table = new stdClass(); - $table->class = 'databox filter-table-adv'; - $table->id = 'resource_registration_table'; - - $table->data = []; - - $table->data[0][] = html_print_label_input_block( - __('File to upload'), - html_print_input_file('resource_upload', true) - ); - - $table->data[0][] = html_print_label_input_block( - __('Group filter'), - html_print_select_groups(false, 'AW', true, 'group', '', '', __('All'), 0, true) - ); - - // Upload form. - echo ''; - /* - echo '';
- echo '
';*/
-
- if (isset($_FILES['resource_upload']['tmp_name']) === false) {
- return;
- }
-
- $xml = simplexml_load_file($_FILES['resource_upload']['tmp_name'], null, LIBXML_NOCDATA);
-
- if ($xml === false) {
- ui_print_error_message(
- __('Error uploading resource. Check if the selected file is a valid resource template in .ptr format')
- );
- } else {
- process_upload_xml($xml);
- }
-}
-
-
-extensions_add_godmode_menu_option(__('Resource registration'), 'PM', 'gagente', '', 'v1r1');
-extensions_add_godmode_function('resource_registration_extension_main');
diff --git a/pandora_console/extras/delete_files/delete_files.txt b/pandora_console/extras/delete_files/delete_files.txt
index f3eada8070..b3fbea46dd 100644
--- a/pandora_console/extras/delete_files/delete_files.txt
+++ b/pandora_console/extras/delete_files/delete_files.txt
@@ -1736,3 +1736,5 @@ extensions/files_repo/sql/files_repo.oracle.sql
extensions/files_repo/sql/files_repo.postgreSQL.sql
extensions/files_repo/sql/files_repo.sql
extensions/files_repo
+extensions/resource_exportation.php
+extensions/resource_registration.php
diff --git a/pandora_console/extras/mr/68.sql b/pandora_console/extras/mr/68.sql
index 254cb2e7c1..30762d513b 100644
--- a/pandora_console/extras/mr/68.sql
+++ b/pandora_console/extras/mr/68.sql
@@ -1,14 +1,97 @@
START TRANSACTION;
+CREATE TABLE IF NOT EXISTS `tmerge_error` (
+ `id` int(10) NOT NULL auto_increment,
+ `id_node` int(10) default 0,
+ `phase` int(10) default 0,
+ `step` int(10) default 0,
+ `msg` LONGTEXT default "",
+ `action` text default "",
+ `utimestamp` int(20) unsigned NOT NULL default 0,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
+
+ALTER TABLE `tmerge_error` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+
+CREATE TABLE IF NOT EXISTS `tmerge_steps` (
+ `id` int(10) NOT NULL auto_increment,
+ `id_node` int(10) default 0,
+ `phase` int(10) default 0,
+ `total` int(10) default 0,
+ `step` int(10) default 0,
+ `debug` varchar(1024) default "",
+ `action` varchar(100) default "",
+ `affected` varchar(100) default "",
+ `query` mediumtext default "",
+ `utimestamp` int(20) unsigned NOT NULL default 0,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
+
+ALTER TABLE `tmerge_steps` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+
+CREATE TABLE IF NOT EXISTS `tmerge_queries` (
+ `steps` int(10) NOT NULL auto_increment,
+ `action` varchar(100) default "",
+ `affected` varchar(100) default "",
+ `utimestamp` int(20) unsigned NOT NULL default 0,
+ `query` LONGTEXT NOT NULL default "",
+ PRIMARY KEY (`steps`)
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
+
+ALTER TABLE `tmerge_queries` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+
+ALTER TABLE `tevent_sound` MODIFY COLUMN `name` text NULL;
+ALTER TABLE `tevent_sound` MODIFY COLUMN `sound` text NULL;
+ALTER TABLE `treport_content` MODIFY COLUMN `use_prefix_notation` tinyint unsigned NOT NULL DEFAULT 1;
+ALTER TABLE `treport_content_template` MODIFY COLUMN `use_prefix_notation` tinyint unsigned NOT NULL DEFAULT 1;
+ALTER TABLE `tsesion_filter` MODIFY COLUMN `id_name` text NULL;
+ALTER TABLE `tsesion_filter` MODIFY COLUMN `ip` text NULL;
+ALTER TABLE `tsesion_filter` MODIFY COLUMN `type` text NULL;
+ALTER TABLE `tsesion_filter` MODIFY COLUMN `user` text NULL;
+ALTER TABLE `tncm_agent_data`
+ADD COLUMN `id_agent_data` int not null default 0 AFTER `script_type`;
+ALTER TABLE `tusuario` CHANGE COLUMN `metaconsole_data_section` `metaconsole_data_section` TEXT NOT NULL DEFAULT '' ;
+ALTER TABLE `tmensajes` ADD COLUMN `icon_notification` VARCHAR(250) NULL DEFAULT NULL AFTER `url`;
+
+UPDATE `tncm_template` SET `vendors` = CONCAT('["', TRIM(BOTH '"' FROM TRIM(BOTH ']' FROM TRIM(BOTH '[' FROM vendors))), '"]'), `models` = CONCAT('["', TRIM(BOTH '"' FROM TRIM(BOTH ']' FROM TRIM(BOTH '[' FROM models))), '"]');
+UPDATE `tncm_agent_data_template` SET `vendors` = CONCAT('["', TRIM(BOTH '"' FROM TRIM(BOTH ']' FROM TRIM(BOTH '[' FROM vendors))), '"]'), `models` = CONCAT('["', TRIM(BOTH '"' FROM TRIM(BOTH ']' FROM TRIM(BOTH '[' FROM models))), '"]');
+
-- Update version for plugin oracle
UPDATE `tdiscovery_apps` SET `version` = '1.2' WHERE `short_name` = 'pandorafms.oracle';
-ALTER TABLE `tncm_agent_data`
-ADD COLUMN `id_agent_data` int not null default 0 AFTER `script_type`;
+SET @widget_id = NULL;
+SELECT @widget_id := `id` FROM `twidget` WHERE `unique_name` = 'GisMap';
+INSERT IGNORE INTO `twidget` (`id`,`class_name`,`unique_name`,`description`,`options`,`page`) VALUES (@widget_id,'GisMap','GisMap','Gis map','','GisMap.php');
-ALTER TABLE `tusuario` CHANGE COLUMN `metaconsole_data_section` `metaconsole_data_section` TEXT NOT NULL DEFAULT '' ;
-
-ALTER TABLE `tmensajes` ADD COLUMN `icon_notification` VARCHAR(250) NULL DEFAULT NULL AFTER `url`;
+SET @class_name = 'ITSMIncidences';
+SET @unique_name = 'ITSMIncidences';
+SET @description = 'Pandora ITSM tickets';
+SET @page = 'ITSMIncidences.php';
+SET @widget_id = NULL;
+SELECT @widget_id := `id` FROM `twidget` WHERE `unique_name` = @unique_name;
+INSERT IGNORE INTO `twidget` (`id`,`class_name`,`unique_name`,`description`,`options`,`page`) VALUES (@widget_id,@class_name,@unique_name,@description,'',@page);
+-- Create SNMPv3 credentials for recon tasks and update them
+SET @creds_name = 'Recon-SNMP-creds-';
+INSERT IGNORE INTO `tcredential_store` (`identifier`, `id_group`, `product`, `extra_1`)
+ SELECT
+ CONCAT(@creds_name,`id_rt`) AS `identifier`,
+ `id_group`,
+ 'SNMP' AS `product`,
+ CONCAT(
+ '{',
+ '"community":"',`snmp_community`,'",',
+ '"version":"',`snmp_version`,'",',
+ '"securityLevelV3":"',`snmp_security_level`,'",',
+ '"authUserV3":"',`snmp_auth_user`,'",',
+ '"authMethodV3":"',`snmp_auth_method`,'",',
+ '"authPassV3":"',`snmp_auth_pass`,'",',
+ '"privacyMethodV3":"',`snmp_privacy_method`,'",',
+ '"privacyPassV3":"',`snmp_privacy_pass`,'"',
+ '}'
+ ) AS `extra1`
+ FROM `trecon_task` WHERE `snmp_version` = 3 AND `snmp_enabled` = 1
+;
+UPDATE `trecon_task` SET `auth_strings` = IF(`auth_strings` = '',CONCAT(@creds_name,`id_rt`),CONCAT(@creds_name,`id_rt`,',',`auth_strings`)) WHERE `snmp_version` = 3 AND `snmp_enabled` = 1;
COMMIT;
\ No newline at end of file
diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index 5ad89d8d31..e2573bd859 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -54,7 +54,7 @@ echo sprintf('
'.__('You can export resource templates in .ptr format.') - ); - - $table = new stdClass(); - $table->class = 'databox filter-table-adv'; - $table->id = 'resource_exportation_table'; - $table->style = []; - $table->style[0] = 'width: 30%'; - $table->style[1] = 'vertical-align: bottom;'; - $table->data = []; - $table->data[0][] = html_print_label_input_block( - __('Report'), - html_print_div( - [ - 'class' => 'flex-content-left', - 'content' => html_print_select_from_sql('SELECT id_report, name FROM treport', 'report', '', '', '', 0, true), - ], - true - ) - ); - $table->data[0][] = html_print_button(__('Export'), '', false, 'export_to_ptr("report");', '', true); - - $table->data[1][] = html_print_label_input_block( - __('Visual console'), - html_print_div( - [ - 'class' => 'flex-content-left', - 'content' => html_print_select_from_sql('SELECT id, name FROM tlayout', 'visual_console', '', '', '', 0, true), - ], - true - ) - ); - $table->data[1][] = html_print_button(__('Export'), '', false, 'export_to_ptr("visual_console");', '', true); - - if ($hook_enterprise === true) { - add_rows_for_enterprise($table->data); - } - - html_print_table($table); - - ?> - - $name) { - $values['id_report'] = $id; - $result = (bool) db_process_sql_insert('treport_content', $values); - - ui_print_result_message( - $result, - sprintf( - __("Success add '%s' item in report '%s'."), - $values['type'], - $name - ), - sprintf( - __("Error create '%s' item in report '%s'."), - $values['type'], - $name - ) - ); - } -} - - -function process_upload_xml_report($xml, $group_filter=0) -{ - foreach ($xml->xpath('/report') as $reportElement) { - $values = []; - - if (isset($reportElement->name)) { - $values['name'] = $reportElement->name; - - $posible_name = $values['name']; - $exist = true; - $loops = 30; - // Loops to exit or tries. - while ($exist && $loops > 0) { - $exist = (bool) db_get_row_filter( - 'treport', - ['name' => io_safe_input($posible_name)] - ); - - if ($exist) { - $loops--; - $posible_name = $values['name'].' ('.(30 - $loops).')'; - } - } - - if ($exist) { - ui_print_error_message( - sprintf( - __("Error create '%s' report, the name exist and there aren't free name."), - $reportElement->name - ) - ); - break; - } else if ($loops != 30) { - ui_print_warning_message( - sprintf( - __("Warning create '%s' report, the name exist, the report have a name %s."), - $reportElement->name, - $posible_name - ) - ); - } - - $values['name'] = io_safe_input($posible_name); - } else { - ui_print_error_message(__("Error the report haven't name.")); - break; - } - - if (isset($reportElement->group) === true - && empty($reportElement->group) === false - ) { - $id_group = db_get_value( - 'id_grupo', - 'tgrupo', - 'nombre', - $reportElement->group - ); - if ($id_group === false) { - ui_print_error_message(__("Error the report haven't group.")); - break; - } - } - - if (isset($reportElement->description) === true) { - $values['description'] = $reportElement->description; - } - - $id_report = db_process_sql_insert('treport', $values); - - ui_print_result_message( - $id_report, - sprintf(__("Success create '%s' report."), $posible_name), - sprintf(__("Error create '%s' report."), $posible_name) - ); - - if ($id_report) { - db_pandora_audit( - AUDIT_LOG_REPORT_MANAGEMENT, - 'Create report '.$id_report, - false, - false - ); - } else { - db_pandora_audit( - AUDIT_LOG_REPORT_MANAGEMENT, - 'Fail to create report', - false, - false - ); - break; - } - - foreach ($reportElement->item as $item) { - $item = (array) $item; - - $values = []; - $values['id_report'] = $id_report; - if (isset($item['description']) === true) { - $values['description'] = io_safe_input($item['description']); - } - - if (isset($item['period']) === true) { - $values['period'] = io_safe_input($item['period']); - } - - if (isset($item['type']) === true) { - $values['type'] = io_safe_input($item['type']); - } - - $agents_item = []; - if (isset($item['agent']) === true) { - $agents = agents_get_agents( - ['id_grupo' => $group_filter], - [ - 'id_agente', - 'alias', - ] - ); - - $agent_clean = str_replace( - [ - '[', - ']', - ], - '', - io_safe_output($item['agent']) - ); - $regular_expresion = ($agent_clean != $item['agent']); - - foreach ($agents as $agent) { - if ($regular_expresion) { - if ((bool) preg_match('/'.$agent_clean.'/', io_safe_output($agent['alias']))) { - $agents_item[$agent['id_agente']]['name'] = $agent['alias']; - } - } else { - if ($agent_clean == io_safe_output($agent['alias'])) { - $agents_item[$agent['id_agente']]['name'] = $agent['alias']; - } - } - } - } - - if (isset($item['module']) === true) { - $module_clean = str_replace(['[', ']'], '', $item['module']); - $regular_expresion = ($module_clean != $item['module']); - - foreach ($agents_item as $id => $agent) { - $modules = db_get_all_rows_filter( - 'tagente_modulo', - ['id_agente' => $id], - [ - 'id_agente_modulo', - 'nombre', - ] - ); - - $agents_item[$id]['modules'] = []; - - foreach ($modules as $module) { - if ($regular_expresion) { - if ((bool) preg_match('/'.$module_clean.'/', io_safe_output($module['nombre']))) { - $agents_item[$id]['modules'][$module['id_agente_modulo']]['name'] = $module['nombre']; - } - } else { - if ($module_clean == io_safe_output($module['nombre'])) { - $agents_item[$id]['modules'][$module['id_agente_modulo']]['name'] = $module['nombre']; - } - } - } - } - } - - switch ($item['type']) { - case 2: - case 'custom_graph': - case 'automatic_custom_graph': - $group = db_get_value('id_grupo', 'tgrupo', 'nombre', io_safe_input($item['graph'])); - $values['id_gs'] = $group; - break; - - case 3: - case 'SLA': - if (isset($item['only_display_wrong'])) { - $values['only_display_wrong'] = (string) $item['only_display_wrong']; - } - - if (isset($item['monday'])) { - $values['monday'] = (string) $item['monday']; - } - - if (isset($item['tuesday'])) { - $values['tuesday'] = (string) $item['tuesday']; - } - - if (isset($item['wednesday'])) { - $values['wednesday'] = (string) $item['wednesday']; - } - - if (isset($item['thursday'])) { - $values['thursday'] = (string) $item['thursday']; - } - - if (isset($item['friday'])) { - $values['friday'] = (string) $item['friday']; - } - - if (isset($item['saturday'])) { - $values['saturday'] = (string) $item['saturday']; - } - - if (isset($item['sunday'])) { - $values['sunday'] = (string) $item['sunday']; - } - - if (isset($item['time_from'])) { - $values['time_from'] = (string) $item['time_from']; - } - - if (isset($item['time_to'])) { - $values['time_to'] = (string) $item['time_to']; - } - - $slas = []; - if (!isset($item['sla'])) { - $item['sla'] = []; - } - - foreach ($item['sla'] as $sla_xml) { - if (isset($sla_xml->agent)) { - $agents = agents_get_agents(['id_grupo' => $group_filter], ['id_agente', 'nombre']); - - $agent_clean = str_replace(['[', ']'], '', $sla_xml->agent); - $regular_expresion = ($agent_clean != $sla_xml->agent); - - foreach ($agents as $agent) { - $id_agent = false; - if ($regular_expresion) { - if ((bool) preg_match('/'.$agent_clean.'/', io_safe_output($agent['nombre']))) { - $id_agent = $agent['id_agente']; - } else { - if ($agent_clean == io_safe_output($agent['nombre'])) { - $id_agent = $agent['id_agente']; - } - } - } - - if ($id_agent) { - if (isset($sla_xml->module)) { - $module_clean = str_replace(['[', ']'], '', $sla_xml->module); - $regular_expresion = ($module_clean != $sla_xml->module); - - $modules = db_get_all_rows_filter( - 'tagente_modulo', - ['id_agente' => $id_agent], - [ - 'id_agente_modulo', - 'nombre', - ] - ); - - foreach ($modules as $module) { - if ($regular_expresion) { - if ((bool) preg_match('/'.$module_clean.'/', io_safe_output($module['nombre']))) { - $slas[] = [ - 'id_agent_module' => $module['id_agente_modulo'], - 'sla_max' => (string) $sla_xml->sla_max, - 'sla_min' => (string) $sla_xml->sla_min, - 'sla_limit' => (string) $sla_xml->sla_limit, - ]; - } - } else { - if ($module_clean == io_safe_output($module['nombre'])) { - $slas[] = [ - 'id_agent_module' => $module['id_agente_modulo'], - 'sla_max' => (string) $sla_xml->sla_max, - 'sla_min' => (string) $sla_xml->sla_min, - 'sla_limit' => (string) $sla_xml->sla_limit, - ]; - } - } - } - } - } - } - } - } - break; - - case 'text': - $values['text'] = io_safe_input($item['text']); - break; - - case 'sql': - $values['header_definition'] = io_safe_input($item['header_definition']); - $values['external_source'] = io_safe_input($item['sql']); - break; - - case 'sql_graph_pie': - case 'sql_graph_vbar': - case 'sql_graph_hbar': - $values['header_definition'] = io_safe_input($item['header_definition']); - $values['external_source'] = io_safe_input($item['sql']); - break; - - case 'event_report_group': - $values['id_agent'] = db_get_value('id_grupo', 'tgrupo', 'nombre', io_safe_input($item->group)); - break; - - case 'url': - $values['external_source'] = io_safe_input($item['url']); - break; - - case 'database_serialized': - $values['header_definition'] = io_safe_input($item['header_definition']); - $values['line_separator'] = io_safe_input($item['line_separator']); - $values['column_separator'] = io_safe_input($item['column_separator']); - break; - - case 1: - case 'simple_graph': - case 'simple_baseline_graph': - case 6: - case 'monitor_report': - case 7: - case 'avg_value': - case 8: - case 'max_value': - case 9: - case 'min_value': - case 10: - case 'sumatory': - case 'event_report_module': - case 'alert_report_module': - case 'alert_report_agent': - case 'alert_report_group': - case 'agent_detailed_event': - case 'event_report_agent': - default: - // Do nothing. - break; - } - - if (empty($agents_item) === true) { - $id_content = db_process_sql_insert('treport_content', $values); - ui_print_result_message( - $id_content, - sprintf(__("Success add '%s' content."), $values['type']), - sprintf(__("Error add '%s' action."), $values['type']) - ); - - if ($item['type'] == 'SLA') { - foreach ($slas as $sla) { - $sla['id_report_content'] = $id_content; - $result = db_process_sql_insert('treport_content_sla_combined', $sla); - ui_print_result_message( - $result, - sprintf(__("Success add '%s' SLA."), $sla['id_agent_module']), - sprintf(__("Error add '%s' SLA."), $sla['id_agent_module']) - ); - } - } - } else { - foreach ($agents_item as $id_agent => $agent) { - if (empty($agent['modules'])) { - $values['id_agent'] = $id_agent; - $id_content = db_process_sql_insert('treport_content', $values); - ui_print_result_message( - $id_content, - sprintf(__("Success add '%s' content."), $values['type']), - sprintf(__("Error add '%s' action."), $values['type']) - ); - } else { - foreach ($agent['modules'] as $id_module => $module) { - $values['id_agent_module'] = $id_module; - $values['id_agent'] = $id_agent; - - $id_content = db_process_sql_insert('treport_content', $values); - ui_print_result_message( - $id_content, - sprintf(__("Success add '%s' content."), $values['type']), - sprintf(__("Error add '%s' action."), $values['type']) - ); - } - } - } - } - } - } -} - - -function process_upload_xml_visualmap($xml, $filter_group=0) -{ - global $config; - - foreach ($xml->xpath('/visual_map') as $visual_map) { - if (isset($visual_map->name)) { - $values['name'] = (string) $visual_map->name; - } else { - ui_print_error_message( - __("Error create '%s' visual map, lost tag name.") - ); - break; - } - - $values['id_group'] = 0; - if (isset($visual_map->group)) { - $id_group = db_get_value('id_grupo', 'tgrupo', 'nombre', io_safe_input($visual_map->group)); - if ($id_group !== false) { - $values['id_group'] = $id_group; - } - } - - if (isset($visual_map->background)) { - $values['background'] = (string) $visual_map->background; - } - - $values['width'] = 0; - if (isset($visual_map->width)) { - $values['width'] = (string) $visual_map->width; - } - - $values['height'] = 0; - if (isset($visual_map->height)) { - $values['height'] = (string) $visual_map->height; - } - - $posible_name = $values['name']; - $exist = true; - $loops = 30; - // Loops to exit or tries - while ($exist && $loops > 0) { - $exist = (bool) db_get_row_filter('tlayout', ['name' => io_safe_input($posible_name)]); - - if ($exist) { - $loops--; - $posible_name = $values['name'].' ('.(30 - $loops).')'; - } - } - - if ($exist) { - ui_print_error_message( - sprintf( - __("Error create '%s' visual map, the name exist and there aren't free name."), - $values['name'] - ) - ); - continue; - } else if ($loops != 30) { - ui_print_error_message( - sprintf( - __("Warning create '%s' visual map, the name exist, the report have a name %s."), - $values['name'], - $posible_name - ) - ); - } - - $values['name'] = io_safe_input($posible_name); - $id_visual_map = db_process_sql_insert('tlayout', $values); - - ui_print_result_message( - (bool) $id_visual_map, - sprintf(__("Success create '%s' visual map."), $posible_name), - sprintf(__("Error create '%s' visual map."), $posible_name) - ); - - if ($id_visual_map !== false) { - db_pandora_audit( - AUDIT_LOG_VISUAL_CONSOLE_MANAGEMENT, - sprintf('Create Visual Console #%s', $id_visual_map), - $config['id_user'] - ); - } else { - break; - } - - $relation_other_ids = []; - - foreach ($visual_map->item as $item) { - $no_agents = true; - - if (isset($item->agent)) { - $agent_clean = str_replace(['[', ']'], '', $item->agent); - $regular_expresion = ($agent_clean != $item->agent); - - $agents = agents_get_agents(['id_grupo' => $filter_group], ['id_agente', 'nombre']); - if ($agents === false) { - $agents = []; - } - - $temp = []; - foreach ($agents as $agent) { - $temp[$agent['id_agente']] = $agent['nombre']; - } - - $agents = $temp; - - $agents_in_item = []; - foreach ($agents as $id => $agent) { - if ($regular_expresion) { - if ((bool) preg_match('/'.$agent_clean.'/', io_safe_output($agent))) { - $agents_in_item[$id]['name'] = $agent; - $no_agents = false; - } - } else { - if ($agent_clean == io_safe_output($agent)) { - $agents_in_item[$id]['name'] = $agent; - $no_agents = false; - break; - } - } - } - } - - $no_modules = true; - if (isset($item->module)) { - $module_clean = str_replace(['[', ']'], '', $item->module); - $regular_expresion = ($module_clean != $item->module); - - foreach ($agents_in_item as $id => $agent) { - $modules = db_get_all_rows_filter( - 'tagente_modulo', - ['id_agente' => $id], - [ - 'id_agente_modulo', - 'nombre', - ] - ); - - $modules_in_item = []; - foreach ($modules as $module) { - if ($regular_expresion) { - if ((bool) preg_match('/'.$module_clean.'/', io_safe_output($module['nombre']))) { - $modules_in_item[$module['id_agente_modulo']] = $module['nombre']; - $no_modules = false; - } - } else { - if ($module_clean == io_safe_output($module['nombre'])) { - $modules_in_item[$module['id_agente_modulo']] = $module['nombre']; - $no_modules = false; - break; - } - } - } - - $agents_in_item[$id]['modules'] = $modules_in_item; - } - } - - $values = []; - - $values['id_layout'] = $id_visual_map; - if (isset($item->label)) { - $values['label'] = io_safe_input($item->label); - } - - if (isset($item->x)) { - $values['pos_x'] = (string) $item->x; - } - - if (isset($item->y)) { - $values['pos_y'] = (string) $item->y; - } - - if (isset($item->height)) { - $values['height'] = (string) $item->height; - } - - if (isset($item->width)) { - $values['width'] = (string) $item->width; - } - - if (isset($item->image)) { - $values['image'] = (string) $item->image; - } - - if (isset($item->period)) { - $values['period'] = (string) $item->period; - } - - if (isset($item->parent_item)) { - // Hack for link the items use the
'.__('Here you can upload a resource template in .ptr format.').'
'.__('Please refer to our documentation for more information on how to obtain and use %s resources.', get_product_name()).' '.'
'.__('You can get more resurces in our Public Resource Library') - ); - - $table = new stdClass(); - $table->class = 'databox filter-table-adv'; - $table->id = 'resource_registration_table'; - - $table->data = []; - - $table->data[0][] = html_print_label_input_block( - __('File to upload'), - html_print_input_file('resource_upload', true) - ); - - $table->data[0][] = html_print_label_input_block( - __('Group filter'), - html_print_select_groups(false, 'AW', true, 'group', '', '', __('All'), 0, true) - ); - - // Upload form. - echo ''; - /* - echo '
| "; - echo ' | '.__('Group filter: ').' | '; - echo ''; - html_print_select_groups(false, 'AW', true, 'group'); - echo ' | '; - echo ""; - echo ' | |
', $menuTypeClass);
// ======= Servers List ===============================================
if ((bool) check_acl($config['id_user'], 0, 'AW') !== false) {
$servers = [];
- $servers['all'] = (int) db_get_value('COUNT(id_server)', 'tserver');
+ $servers['all'] = (int) count((servers_get_info() ?? []));
if ($servers['all'] != 0) {
$servers['up'] = (int) servers_check_status();
$servers['down'] = ($servers['all'] - $servers['up']);
@@ -1021,11 +1021,14 @@ echo sprintf('
', $menuTypeClass);
modal: {
title: "",
cancel: '',
- ok: ''
+ ok: '',
+ overlay: true,
+ overlayExtraClass: 'welcome-overlay',
},
onshow: {
page: 'include/ajax/welcome_window',
method: 'loadWelcomeWindow',
+ width: 1000,
},
oncancel: {
page: 'include/ajax/welcome_window',
@@ -1043,6 +1046,34 @@ echo sprintf('
', $menuTypeClass);
}
})
}
+ },
+ onload: () => {
+ $(document).ready(function () {
+ var buttonpane = $("div[aria-describedby='welcome_modal_window'] .ui-dialog-buttonpane.ui-widget-content.ui-helper-clearfix");
+ $(buttonpane).append(`
+
+ `);
+
+ var closeWizard = $("button.close-wizard-button");
+
+ $(closeWizard).click(function (e) {
+ var close = $("div[aria-describedby='welcome_modal_window'] button.sub.ok.submit-next.ui-button");
+ var cancel = $("div[aria-describedby='welcome_modal_window'] button.sub.upd.submit-cancel.ui-button");
+ var checkbox = $("div[aria-describedby='welcome_modal_window'] .welcome-wizard-do-not-show:checked").length;
+
+ if (checkbox === 1) {
+ $(cancel).click();
+ } else {
+ $(close).click()
+ }
+ });
+ });
}
});
});
diff --git a/pandora_console/general/register.php b/pandora_console/general/register.php
index 759e319dbd..ed583c7ed4 100644
--- a/pandora_console/general/register.php
+++ b/pandora_console/general/register.php
@@ -100,7 +100,7 @@ if ($initial && users_is_admin()) {
);
}
-if (check_acl($config['id_user'], 0, 'AW')) {
+if (check_acl($config['id_user'], 0, 'AW') && empty($sec2)) {
$welcome = !$initial;
try {
$welcome_window = new WelcomeWindow($welcome);
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 4e62337547..18722508e9 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -357,7 +357,18 @@ if ($new_agent === false) {
$tableAgent->data['caption_name'][0] = __('Agent name');
$tableAgent->rowclass['name'] = 'w540px';
$tableAgent->cellstyle['name'][0] = 'width: 100%;';
- $tableAgent->data['name'][0] = html_print_input_text('agente', $nombre_agente, '', 76, 100, true, false, false, '', 'w100p');
+ $tableAgent->data['name'][0] = html_print_input_text(
+ 'agente',
+ $nombre_agente,
+ '',
+ 76,
+ 100,
+ true,
+ true,
+ false,
+ '',
+ 'w100p'
+ );
$tableAgent->data['name'][0] .= html_print_div(
[
'class' => 'moduleIdBox',
@@ -365,6 +376,29 @@ if ($new_agent === false) {
],
true
);
+
+ // Other than Linux, Solaris, AIX, BSD, HPUX, MacOs, and Windows.
+ if ($id_os !== LINUX && $id_os !== SOLARIS && $id_os !== AIX
+ && $id_os !== BSD && $id_os !== HPUX && $id_os !== MACOS
+ && $id_os !== WINDOWS
+ ) {
+ $tableAgent->data['name'][0] .= html_print_anchor(
+ [
+ 'content' => html_print_image(
+ 'images/edit.svg',
+ true,
+ [
+ 'border' => 0,
+ 'title' => __('Edit agent name'),
+ 'class' => 'main_menu_icon invert_filter after_input_icon forced_title clickable',
+ 'onclick' => 'editAgent()',
+ ]
+ ),
+ ],
+ true
+ );
+ }
+
// Agent options for QR code.
$agent_options_update = 'agent_options_update';
}
@@ -500,21 +534,42 @@ $tableAgent->data['primary_group'][0] .= ui_print_group_icon(
);
$tableAgent->data['primary_group'][0] .= '';
-$tableAgent->data['caption_interval'][0] = __('Interval');
-// $tableAgent->rowstyle['interval'] = 'width: 260px';
-$tableAgent->rowclass['interval'] = 'w540px';
-$tableAgent->data['interval'][0] = html_print_extended_select_for_time(
- 'intervalo',
- $intervalo,
- '',
- '',
- '0',
- 10,
- true,
- false,
- true,
- 'w33p'
-);
+$broker = false;
+if (enterprise_installed()) {
+ // CHECK BROKER FOR SHOW INTERVAL.
+ enterprise_include('include/functions_config_agents.php');
+ // Read configuration file.
+ $files = config_agents_get_agent_config_filenames($id_agente);
+ $file_name = $files['conf'];
+ if (empty($file_name) === false) {
+ $agent_config = file_get_contents($file_name);
+ $encoding = 'UTF-8';
+ $agent_config_utf8 = mb_convert_encoding($agent_config, 'UTF-8', $encoding);
+ if ($agent_config_utf8 !== false) {
+ $agent_config = $agent_config_utf8;
+ }
+
+ $broker = str_contains($agent_config, '#broker active');
+ }
+}
+
+if ($broker === false) {
+ $tableAgent->data['caption_interval'][0] = __('Interval');
+ // $tableAgent->rowstyle['interval'] = 'width: 260px';
+ $tableAgent->rowclass['interval'] = 'w540px';
+ $tableAgent->data['interval'][0] = html_print_extended_select_for_time(
+ 'intervalo',
+ $intervalo,
+ '',
+ '',
+ '0',
+ 10,
+ true,
+ false,
+ true,
+ 'w33p'
+ );
+}
if ($intervalo < SECONDS_5MINUTES) {
$tableAgent->data['interval'][0] .= clippy_context_help('interval_agent_min');
@@ -653,6 +708,19 @@ if (enterprise_installed()) {
}
}
+ if ($id_os === '1') {
+ $modules = $agent_plugin->getModules();
+ foreach ($modules as $key => $row) {
+ if (preg_match('/Syslog/', $row['raw']) === 1) {
+ if ($row['disabled'] === 1) {
+ $enable_log_collector = 0;
+ } else {
+ $enable_log_collector = 1;
+ }
+ }
+ }
+ }
+
if ($id_os === '9') {
$modules = $agent_plugin->getModules();
foreach ($modules as $key => $row) {
@@ -1457,7 +1525,6 @@ ui_require_jquery_file('bgiframe');
128
);
}
- $("#text-agente").prop('readonly', true);
$("#text-direccion").on('change',function(e){
@@ -1504,6 +1571,39 @@ ui_require_jquery_file('bgiframe');
}
}
+ function editAgent() {
+ $(`#text-agente`).attr(`readonly`, false);
+ const title = '';
+ const text = '';
+ const id = uniqId();
+ $("body").append('');
+ $("#" + id).empty();
+ $("#" + id).append(text);
+ $("#" + id).dialog({
+ height: 150,
+ width: 528,
+ opacity: 1,
+ modal: true,
+ position: {
+ my: "center",
+ at: "center",
+ of: window,
+ collision: "fit"
+ },
+ title: title,
+ closeOnEscape: true,
+ buttons: [{
+ text: "OK",
+ click: function() {
+ $(this).dialog("close");
+ }
+ }],
+ open: function(event, ui) {
+ $(".ui-dialog-titlebar-close").hide();
+ },
+ }).show();
+ }
+
function check_unique_ip() {
const direccion = $('#text-direccion').val();
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index c2e3a2f4f6..c6b5f2b691 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -949,6 +949,13 @@ if ($update_agent) {
$mssg_warning = 0;
$id_agente = (int) get_parameter_post('id_agente');
$nombre_agente = str_replace('`', '‘', (string) get_parameter_post('agente', ''));
+ $repeated_name = db_get_row_sql(
+ sprintf(
+ 'SELECT nombre FROM tagente WHERE id_agente <> %s AND nombre like "%s"',
+ $id_agente,
+ $nombre_agente
+ )
+ );
$alias_safe_output = strip_tags(io_safe_output(get_parameter('alias', '')));
$alias = io_safe_input(trim(preg_replace('/[\/\\\|%#&$]/', '', $alias_safe_output)));
$alias_as_name = (int) get_parameter_post('alias_as_name', 0);
@@ -1077,14 +1084,17 @@ if ($update_agent) {
}
}
+ // Verify if there is another agent with the same name but different ID.
+ if (empty($repeated_name) === false) {
+ ui_print_error_message(__('Agent with repeated name'));
+ }
+
if ($mssg_warning) {
ui_print_warning_message(__('The ip or dns name entered cannot be resolved'));
}
- // Verify if there is another agent with the same name but different ID.
if ($alias == '') {
ui_print_error_message(__('No agent alias specified'));
- // If there is an agent with the same name, but a different ID.
}
$old_group = agents_get_agent_group($id_agente);
@@ -1139,13 +1149,16 @@ if ($update_agent) {
'ignore_unknown' => $ignore_unknown,
];
+ if (empty($repeated_name) === true) {
+ $values['nombre'] = $nombre_agente;
+ }
+
if ($config['metaconsole_agent_cache'] == 1) {
$values['update_module_count'] = 1;
// Force an update of the agent cache.
}
- $result = db_process_sql_update('tagente', $values, ['id_agente' => $id_agente]);
-
+ $result = (bool) db_process_sql_update('tagente', $values, ['id_agente' => $id_agente]);
if ($result === false && $update_custom_result == false) {
ui_print_error_message(
__('There was a problem updating the agent')
@@ -1299,8 +1312,11 @@ if ($update_agent) {
}
$modules = $agent->getModules();
+
foreach ($modules as $key => $row) {
- if (preg_match('/PandoraAgent_log/', $row['raw']) === 1) {
+ if (preg_match('/PandoraAgent_log/', $row['raw']) === 1
+ || ($id_os === 1 && preg_match('/Syslog/', $row['raw']) === 1)
+ ) {
if ($enable_log_collector === 1) {
if ($row['disabled'] === 1) {
$agent->enableModule($row['module_name'], $row);
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index a7ee6bf4c0..b0f071c1b4 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -697,7 +697,7 @@ if ($agents !== false) {
$tableAgents->head = [];
$tableAgents->data = [];
// Header.
- $tableAgents->head[0] = ''.__('Agent name').'';
+ $tableAgents->head[0] = ''.__('Agent alias').'';
$tableAgents->head[0] .= ui_get_sorting_arrows($url_up_agente, $url_down_agente, $selectNameUp, $selectNameDown);
$tableAgents->head[1] = ''.__('R').'';
$tableAgents->head[1] .= ui_get_sorting_arrows($url_up_remote, $url_down_remote, $selectRemoteUp, $selectRemoteDown);
diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index b4cd0e2351..c3772c00d3 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -575,7 +575,7 @@ $where = sprintf('delete_pending = 0 AND id_agente = %s', $id_agente);
$search_string_entities = io_safe_input($search_string);
$basic_where = sprintf(
- "(REPLACE(nombre, ' ', ' ') LIKE '%%%s%%' OR REPLACE(nombre, ' ', ' ') LIKE '%%%s%%' OR REPLACE(descripcion, ' ', ' ') LIKE '%%%s%%' OR REPLACE(descripcion, ' ', ' ') LIKE '%%%s%%') AND",
+ "(nombre LIKE '%%%s%%' OR nombre LIKE '%%%s%%' OR descripcion LIKE '%%%s%%' OR descripcion LIKE '%%%s%%') AND",
$search_string,
$search_string_entities,
$search_string,
diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php
index 130f31c79d..543d241fc9 100644
--- a/pandora_console/godmode/agentes/module_manager_editor.php
+++ b/pandora_console/godmode/agentes/module_manager_editor.php
@@ -150,7 +150,7 @@ if (is_ajax()) {
$component = db_get_row('tlocal_component', 'id', $id_component);
foreach ($component as $index => $element) {
$component[$index] = html_entity_decode(
- $element,
+ (isset($element) === true) ? $element : '',
ENT_QUOTES,
'UTF-8'
);
diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index 47c843f2d9..a9d809d29f 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -505,7 +505,7 @@ $tableBasicThresholds->data['caption_switch_warning_inverse_string'][0] = html_p
$tableBasicThresholds->data['caption_warning_threshold'][0] .= '('.__('Str.').')';
$tableBasicThresholds->data['warning_threshold'][0] .= html_print_input_text(
'str_warning',
- str_replace('"', '', $str_warning),
+ str_replace('"', '', (isset($str_warning) === true) ? $str_warning : ''),
'',
10,
1024,
@@ -602,7 +602,7 @@ $tableBasicThresholds->data['switch_critical_threshold'][0] .= html_print_div(
$tableBasicThresholds->data['caption_critical_threshold'][0] .= '('.__('Str.').')';
$tableBasicThresholds->data['critical_threshold'][0] .= html_print_input_text(
'str_critical',
- str_replace('"', '', $str_critical),
+ str_replace('"', '', (isset($str_critical) === true) ? $str_critical : ''),
'',
10,
1024,
diff --git a/pandora_console/godmode/agentes/module_manager_editor_plugin.php b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
index 9b5d98c27d..abbbc4d9c1 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_plugin.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
@@ -60,7 +60,12 @@ $data[1] = html_print_select_from_sql(
$disabledBecauseInPolicy
);
// Store the macros in base64 into a hidden control to move between pages
-$data[1] .= html_print_input_hidden('macros', base64_encode($macros), true);
+$data[1] .= html_print_input_hidden(
+ 'macros',
+ (isset($macros) === true) ? base64_encode($macros) : '',
+ true
+);
+
$table_simple->colspan['plugin_1'][2] = 2;
if (!empty($id_plugin)) {
diff --git a/pandora_console/godmode/alerts/alert_view.php b/pandora_console/godmode/alerts/alert_view.php
index 7809742221..499bbded5e 100644
--- a/pandora_console/godmode/alerts/alert_view.php
+++ b/pandora_console/godmode/alerts/alert_view.php
@@ -308,13 +308,18 @@ $table->head[0] = __('Actions');
$table->style[0] = 'font-weight: bold; text-align: left;';
if (count($actions) == 1 && isset($actions[0])) {
- $table->head[1] = __('Every time that the alert is fired');
- $table->data[0][0] = $actions[0]['name'];
- $table->data[0][1] = html_print_image(
- 'images/tick.png',
- true,
- ['class' => 'invert_filter']
- );
+ if (!empty($actions[0]['name'])) {
+ $table->head[1] = __('Every time that the alert is fired');
+ $table->data[0][0] = $actions[0]['name'];
+ $table->data[0][1] = html_print_image(
+ 'images/tick.png',
+ true,
+ ['class' => 'invert_filter']
+ );
+ } else {
+ $table->colspan[0] = 2;
+ $table->data[0] = __('No action defined.');
+ }
} else {
foreach ($actions as $kaction => $action) {
$table->data[$kaction][0] = $action['name'];
diff --git a/pandora_console/godmode/events/event_responses.editor.php b/pandora_console/godmode/events/event_responses.editor.php
index ae31e10ad1..52d5a48ad1 100644
--- a/pandora_console/godmode/events/event_responses.editor.php
+++ b/pandora_console/godmode/events/event_responses.editor.php
@@ -285,20 +285,25 @@ if (enterprise_installed()) {
$data = [];
$data[0] = html_print_label_input_block(
'
'.__('Server to execute command').'
',
- ''.html_print_select(
+ '
'.html_print_select(
$servers_to_exec,
'server_to_exec',
$event_response['server_to_exec'],
'',
'',
'',
- true
+ true,
+ false,
+ true,
+ 'w100p',
+ false,
+ 'width: 100%'
).'
'
);
$data[1] = html_print_label_input_block(
''.__('Command timeout (s)'),
- '
'.html_print_input_text(
+ '
'.html_print_input_text(
'command_timeout',
$event_response['command_timeout'],
'',
@@ -358,18 +363,18 @@ $('#type').change(function() {
$('#new_window option[value="0"]')
.prop('selected', true);
$('#new_window').attr('disabled','disabled');
- $('#server_to_exec_label').css('display','');
- $('#server_to_exec_value').css('display','');
- $('#command_timeout_label').css('display','');
- $('#command_timeout_value').css('display','');
+ $('#server_to_exec_label').show();
+ $('#server_to_exec_value').show();
+ $('#command_timeout_label').show();
+ $('#command_timeout_value').show();
break;
case 'url':
$('#new_window').removeAttr('disabled');
- $('#server_to_exec_label').css('display','none');
- $('#server_to_exec_value').css('display','none');
- $('#command_timeout_label').css('display','none');
- $('#command_timeout_value').css('display','none');
+ $('#server_to_exec_label').hide();
+ $('#server_to_exec_value').hide();
+ $('#command_timeout_label').hide();
+ $('#command_timeout_value').hide();
break;
}
diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php
index 66717bc35b..f1b40867d9 100644
--- a/pandora_console/godmode/groups/group_list.php
+++ b/pandora_console/godmode/groups/group_list.php
@@ -560,13 +560,13 @@ if ($is_management_allowed === true && $update_group === true) {
}
}
+$id_group = (int) get_parameter('id_group');
+
// Delete group.
if ($is_management_allowed === true
&& $delete_group === true
- && ((bool) check_acl($config['id_user'], 0, 'PM') === true)
+ && ((bool) check_acl($config['id_user'], $id_group, 'PM') === true)
) {
- $id_group = (int) get_parameter('id_group');
-
$usedGroup = groups_check_used($id_group);
if (!$usedGroup['return']) {
@@ -880,6 +880,28 @@ if ($tab == 'tree') {
echo "";
+ if (users_can_manage_group_all('AR') === false) {
+ $user_groups_acl = users_get_groups(false, 'AR');
+ $groups_acl = implode('","', $user_groups_acl);
+ if (empty($groups_acl) === true) {
+ $is_management_allowed = false;
+ }
+ }
+
+ html_print_div(
+ [
+ 'content' => ui_print_info_message(
+ [
+ 'no_close' => true,
+ 'message' => __('There are no defined groups'),
+ ],
+ '',
+ true
+ ),
+ 'class' => 'invisible',
+ 'id' => 'message-tree-info',
+ ]
+ );
} else {
/*
* Group list view.
@@ -1246,7 +1268,7 @@ $tab = 'group_edition';
treeController.init({
recipient: $("div#tree-controller-recipient"),
page: parameters['page'],
- emptyMessage: "",
+ emptyMessage: $("#message-tree-info").html(),
foundMessage: "",
tree: data.tree,
baseURL: "",
diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php
index 82698266a1..9a57ef9d53 100755
--- a/pandora_console/godmode/massive/massive_edit_agents.php
+++ b/pandora_console/godmode/massive/massive_edit_agents.php
@@ -319,9 +319,8 @@ if ($update_agents) {
$secondary_groups_removed
);
- $agents_values = agents_get_agent((int) $array_id[1]);
+ $agents_values = db_get_row_filter('tagente', ['id_agente' => (int) $array_id[1]]);
$node->disconnect();
-
if (empty($values) === false) {
update_agents_in_metaconsole(
(int) $array_id[1],
diff --git a/pandora_console/godmode/massive/massive_edit_modules.php b/pandora_console/godmode/massive/massive_edit_modules.php
index 9b11b86916..2b8990c065 100755
--- a/pandora_console/godmode/massive/massive_edit_modules.php
+++ b/pandora_console/godmode/massive/massive_edit_modules.php
@@ -768,7 +768,7 @@ $table_critical->tdid[0][0] = 'edit1-3-min';
$table_critical->data[0][0] = html_print_label_input_block(
__('Min.'),
html_print_input_text(
- 'min_warning',
+ 'min_critical',
'',
'',
false,
@@ -781,7 +781,7 @@ $table_critical->tdid[0][1] = 'edit1-3-max';
$table_critical->data[0][1] = html_print_label_input_block(
__('Max.'),
html_print_input_text(
- 'max_warning',
+ 'max_critical',
'',
'',
false,
@@ -1500,7 +1500,7 @@ $table->data[39][0] = html_print_label_input_block(
'',
'',
true
- ).html_print_input_hidden('macros', base64_encode($macros), true)
+ ).html_print_input_hidden('macros', base64_encode(($macros ?? '')), true)
);
require_once $config['homedir'].'/include/class/CredentialStore.class.php';
diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index a77e63b95b..68d789cd74 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -208,6 +208,9 @@ if ($access_console_node === true) {
$sub['godmode/setup/os']['text'] = __('Operating systems');
$sub['godmode/setup/os']['id'] = 'edit_OS';
+
+ $sub['godmode/resources/resources_export_import']['text'] = __('Resources export/import');
+ $sub['godmode/resources/resources_export_import']['id'] = 'resources_export_import';
}
if ((bool) check_acl($config['id_user'], 0, 'AW') === true) {
@@ -518,7 +521,18 @@ if ($access_console_node === true) {
}
-if ((bool) check_acl($config['id_user'], 0, 'PM') === true || (bool) check_acl($config['id_user'], 0, 'DM') === true) {
+if ((bool) check_acl($config['id_user'], 0, 'AW') === true) {
+ $show_ipam = false;
+ $ipam = db_get_all_rows_sql('SELECT users_operator FROM tipam_network');
+ foreach ($ipam as $row) {
+ if (str_contains($row['users_operator'], '-1') || str_contains($row['users_operator'], $config['id_user'])) {
+ $show_ipam = true;
+ break;
+ }
+ }
+}
+
+if ((bool) check_acl($config['id_user'], 0, 'PM') === true || (bool) check_acl($config['id_user'], 0, 'DM') === true || $show_ipam === true) {
$menu_godmode['gextensions']['text'] = __('Admin tools');
$menu_godmode['gextensions']['sec2'] = 'godmode/extensions';
$menu_godmode['gextensions']['id'] = 'god-extensions';
@@ -535,8 +549,6 @@ if ((bool) check_acl($config['id_user'], 0, 'PM') === true || (bool) check_acl($
$sub['tools/diagnostics']['text'] = __('Diagnostic info');
$sub['tools/diagnostics']['id'] = 'diagnostic_info';
enterprise_hook('omnishell');
- enterprise_hook('ipam_submenu');
-
$sub['godmode/setup/news']['text'] = __('Site news');
$sub['godmode/setup/news']['id'] = 'site_news';
}
@@ -558,9 +570,15 @@ if ((bool) check_acl($config['id_user'], 0, 'PM') === true || (bool) check_acl($
}
}
- $sub['godmode/events/configuration_sounds']['text'] = __('Acoustic console setup');
- $sub['godmode/events/configuration_sounds']['id'] = 'Acoustic console setup';
- $sub['godmode/events/configuration_sounds']['pages'] = ['godmode/events/configuration_sounds'];
+ if (((bool) check_acl($config['id_user'], 0, 'PM') === true && $access_console_node === true) || $show_ipam === true) {
+ enterprise_hook('ipam_submenu');
+ }
+
+ if ((bool) check_acl($config['id_user'], 0, 'PM') === true || (bool) check_acl($config['id_user'], 0, 'DM') === true) {
+ $sub['godmode/events/configuration_sounds']['text'] = __('Acoustic console setup');
+ $sub['godmode/events/configuration_sounds']['id'] = 'Acoustic console setup';
+ $sub['godmode/events/configuration_sounds']['pages'] = ['godmode/events/configuration_sounds'];
+ }
$menu_godmode['gextensions']['sub'] = $sub;
}
@@ -638,16 +656,18 @@ if ($access_console_node === true) {
}
// Complete the submenu.
- $extension_view = [];
- $extension_view['godmode/extensions']['id'] = 'extension_manager_view';
- $extension_view['godmode/extensions']['text'] = __('Extension manager view');
- $extension_submenu = array_merge($extension_view, $sub2);
+ if (users_is_admin($config['id_user']) === true) {
+ $extension_view = [];
+ $extension_view['godmode/extensions']['id'] = 'extension_manager_view';
+ $extension_view['godmode/extensions']['text'] = __('Extension manager view');
+ $extension_submenu = array_merge($extension_view, $sub2);
- $sub['godmode/extensions']['sub2'] = $extension_submenu;
- $sub['godmode/extensions']['text'] = __('Extension manager');
- $sub['godmode/extensions']['id'] = 'extension_manager';
- $sub['godmode/extensions']['type'] = 'direct';
- $sub['godmode/extensions']['subtype'] = 'nolink';
+ $sub['godmode/extensions']['sub2'] = $extension_submenu;
+ $sub['godmode/extensions']['text'] = __('Extension manager');
+ $sub['godmode/extensions']['id'] = 'extension_manager';
+ $sub['godmode/extensions']['type'] = 'direct';
+ $sub['godmode/extensions']['subtype'] = 'nolink';
+ }
if (is_array($menu_godmode['gextensions']['sub']) === true) {
$submenu = array_merge($menu_godmode['gextensions']['sub'], $sub);
diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php
index 7a8d2df32c..6dbb6a1dbf 100644
--- a/pandora_console/godmode/reporting/map_builder.php
+++ b/pandora_console/godmode/reporting/map_builder.php
@@ -250,6 +250,12 @@ if ($delete_layout || $copy_layout) {
$result = db_process_sql_insert('tlayout', $values);
+ $auditMessage = ((bool) $result !== false) ? 'Copy visual console' : 'Fail try to copy visual console';
+ db_pandora_audit(
+ AUDIT_LOG_VISUAL_CONSOLE_MANAGEMENT,
+ sprintf('%s %s #%s', $auditMessage, $visualConsoleName, $id_layout)
+ );
+
$idNewVisualConsole = $result;
if ($result) {
diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 4eb6390fb2..b30f1d6c43 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -1058,7 +1058,11 @@ switch ($action) {
$resolution = $item['top_n'];
// Interval resolution.
$max_values = $item['top_n_value'];
- // Max values.
+ $es = json_decode($item['external_source'], true);
+ $top_n_type = $es['top_n_type'];
+ $display_graph = $es['display_graph'];
+ $display_summary = $es['display_summary'];
+ $display_data_table = $es['display_data_table'];
break;
case 'permissions_report':
@@ -1703,6 +1707,75 @@ if (is_metaconsole() === true) {
+
+
+ __('Show aggregate by destination port'),
+ 1 => __('Show InBound/Outbound traffic per SrcIP/DestIP'),
+ ];
+ html_print_select(
+ $types,
+ 'top_n_type',
+ $top_n_type,
+ ''
+ );
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php
index 39acc45c21..991ed52855 100644
--- a/pandora_console/godmode/servers/plugin.php
+++ b/pandora_console/godmode/servers/plugin.php
@@ -215,7 +215,7 @@ if ($create != '') {
// =====================================================================
if ($filemanager) {
if ($edit_file) {
- $location_file = get_parameter('location_file', '');
+ $location_file = io_safe_output(get_parameter('location_file', ''));
$filename = array_pop(explode('/', $location_file));
$file = file_get_contents($location_file);
echo '
+
+
+
+
+
+
+
+
+
+
+
+
';
- $html .= '
';
return $html;
@@ -1638,7 +1746,8 @@ function netflow_get_item_data(
string $type_netflow,
array $filter,
int $max_aggregates,
- string $connection_name
+ string $connection_name,
+ bool $extended=false
) {
$data = [];
@@ -1656,7 +1765,9 @@ function netflow_get_item_data(
$end_date,
$filter,
$max_aggregates,
- $connection_name
+ $connection_name,
+ $extended,
+ $data_summary['totalbytes']
);
$data = [
@@ -2293,3 +2404,50 @@ function netflow_build_map_data($start_date, $end_date, $top, $aggregate, $advan
array_merge($relations, $orphan_hosts)
);
}
+
+
+/**
+ * Run whois command and return all results as array.
+ *
+ * @param integer $ip Ip for search info with command whois.
+ *
+ * @return array
+ */
+function command_whois($ip)
+{
+ $command = 'whois '.$ip;
+ $result = '';
+ exec($command, $result);
+ if (empty($result) === false && is_array($result) === true) {
+ $resultArray = parse_whois_output($result);
+ } else {
+ $resultArray = [];
+ }
+
+ return $resultArray;
+}
+
+
+/**
+ * Parse the result of command whois to array.
+ *
+ * @param array $lines Lines result of command whois.
+ *
+ * @return array
+ */
+function parse_whois_output($lines)
+{
+ $resultArray = [];
+ if (is_array($lines) === true) {
+ foreach ($lines as $line) {
+ $parts = explode(':', $line, 2);
+ if (count($parts) === 2 && strpos($line, '#') !== 0) {
+ $key = trim($parts[0]);
+ $value = trim($parts[1]);
+ $resultArray[$key] = $value;
+ }
+ }
+ }
+
+ return $resultArray;
+}
diff --git a/pandora_console/include/functions_notifications.php b/pandora_console/include/functions_notifications.php
index 61330b66f7..f16e8fd25b 100644
--- a/pandora_console/include/functions_notifications.php
+++ b/pandora_console/include/functions_notifications.php
@@ -133,6 +133,7 @@ function notifications_get_subtypes(?string $source=null)
'NOTIF.PHP.INPUT_TIME',
'NOTIF.PHP.EXECUTION_TIME',
'NOTIF.PHP.UPLOAD_MAX_FILESIZE',
+ 'NOTIF.PHP.POST_MAX_SIZE',
'NOTIF.PHP.MEMORY_LIMIT',
'NOTIF.PHP.DISABLE_FUNCTIONS',
'NOTIF.PHP.CHROMIUM',
@@ -818,7 +819,7 @@ function notifications_print_global_source_configuration($source)
$html_checkboxes = '';
- $blacklist = json_decode($source['subtype_blacklist'], 1);
+ $blacklist = json_decode(($source['subtype_blacklist'] ?? ''), 1);
if (json_last_error() !== JSON_ERROR_NONE) {
$blacklist = [];
}
diff --git a/pandora_console/include/functions_profile.php b/pandora_console/include/functions_profile.php
index d97edf17aa..278d39f9a6 100644
--- a/pandora_console/include/functions_profile.php
+++ b/pandora_console/include/functions_profile.php
@@ -243,6 +243,7 @@ function profile_print_profile_table($id, $json_profile=false, $return=false, $c
$profile = json_decode($profile);
}
+ $result = [];
$result[] = [
'id_grupo' => $profile->group,
'id_perfil' => $profile->profile,
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index c8a794cc1d..c5c7090623 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -6981,6 +6981,20 @@ function reporting_netflow(
$filter['aggregate'] = 'dstport';
}
+ $es = json_decode($content['external_source'], true);
+
+ $extended = false;
+ $show_graph = false;
+ $show_summary = false;
+ $show_table = false;
+
+ if (empty($es) === false) {
+ $extended = ((int) $es['top_n_type'] === 1);
+ $show_graph = ((int) $es['display_graph'] === 1);
+ $show_summary = ((int) $es['display_summary'] === 1);
+ $show_table = ((int) $es['display_data_table'] === 1);
+ }
+
switch ($type) {
case 'dinamic':
case 'static':
@@ -6992,7 +7006,14 @@ function reporting_netflow(
$filter,
$content['top_n_value'],
$content['server_name'],
- (($pdf === true) ? 'PDF' : 'HTML')
+ (($pdf === true) ? 'PDF' : 'HTML'),
+ false,
+ false,
+ false,
+ $extended,
+ $show_graph,
+ $show_summary,
+ $show_table
);
break;
@@ -7015,11 +7036,15 @@ function reporting_netflow(
break;
}
- $return['subtitle'] = netflow_generate_subtitle_report(
- $filter['aggregate'],
- $content['top_n'],
- $type_netflow
- );
+ if ($extended === true) {
+ $return['subtitle'] = __('InBound/Outbound traffic per SrcIP/DestIP');
+ } else {
+ $return['subtitle'] = netflow_generate_subtitle_report(
+ $filter['aggregate'],
+ $content['top_n'],
+ $type_netflow
+ );
+ }
return reporting_check_structure_content($return);
}
@@ -12521,7 +12546,7 @@ function reporting_get_stats_indicators($data, $width=280, $height=20, $html=tru
$table_ind = html_get_predefined_table();
$servers = [];
- $servers['all'] = (int) db_get_value('COUNT(id_server)', 'tserver');
+ $servers['all'] = (int) count((servers_get_info() ?? []));
$servers['up'] = (int) servers_check_status();
$servers['down'] = ($servers['all'] - $servers['up']);
if ($servers['all'] == 0) {
@@ -12582,7 +12607,7 @@ function reporting_get_stats_indicators_mobile($data, $width=280, $height=20, $h
$table_ind = html_get_predefined_table();
$servers = [];
- $servers['all'] = (int) db_get_value('COUNT(id_server)', 'tserver');
+ $servers['all'] = (int) count((servers_get_info() ?? []));
$servers['up'] = (int) servers_check_status();
$servers['down'] = ($servers['all'] - $servers['up']);
if ($servers['all'] == 0) {
@@ -15969,8 +15994,8 @@ function reporting_translate_sla_status_for_graph($status)
*/
function reporting_header_table_for_pdf($title='', $description='')
{
- $result_pdf = '';
- $result_pdf .= '';
+ // $result_pdf = '
'.__('Edit file').' '.$filename.'
'; @@ -250,7 +250,7 @@ if ($filemanager) { echo ''; } else { if ($update_file) { - $location_file = get_parameter('location_file', ''); + $location_file = io_safe_output(get_parameter('location_file', '')); $contentFile = io_safe_output(get_parameter('content_file', '')); $compatibility = get_parameter('compatibility', 'unix'); $is_win_compatible = strpos($contentFile, "\r\n"); @@ -262,7 +262,12 @@ if ($filemanager) { $contentFile = str_replace("\n", "\r\n", $contentFile); } - $result = file_put_contents($location_file, $contentFile); + if (empty($location_file) === false + && strpos($location_file, realpath('attachment/plugin')) !== false + && file_exists($location_file) === true + ) { + $result = file_put_contents($location_file, $contentFile); + } } $id_plugin = (int) get_parameter('id_plugin', 0); diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php index 23a284caf9..1589f33fc9 100644 --- a/pandora_console/godmode/servers/servers.build_table.php +++ b/pandora_console/godmode/servers/servers.build_table.php @@ -115,7 +115,7 @@ foreach ($servers as $server) { $table->cellclass[] = [ 3 => 'progress_bar', - 8 => 'table_action_buttons', + 9 => 'table_action_buttons', ]; $data[0] = ''.strip_tags($server['name']).''; diff --git a/pandora_console/godmode/setup/os.builder.php b/pandora_console/godmode/setup/os.builder.php index 6313aa3edd..4f7b77099b 100644 --- a/pandora_console/godmode/setup/os.builder.php +++ b/pandora_console/godmode/setup/os.builder.php @@ -48,7 +48,7 @@ if ($idOS > 0) { } else { $name = io_safe_input(strip_tags(trim(io_safe_output((string) get_parameter('name'))))); $description = io_safe_input(strip_tags(io_safe_output((string) get_parameter('description')))); - $icon = get_parameter('icon', 0); + $icon = get_parameter('icon', 'os@svg.svg'); } $icon_upload = get_parameter('icon_upload', null); @@ -246,7 +246,7 @@ $iconData[] = html_print_select( 'icon', $icon, 'show_icon_OS();', - __('None'), + '', 0, true ); @@ -356,6 +356,8 @@ function get_list_os_icons_dir() } } + $return['os@svg.svg'] = __('None'); + return $return; } diff --git a/pandora_console/godmode/setup/os.php b/pandora_console/godmode/setup/os.php index dcfe95ecdb..403232c868 100644 --- a/pandora_console/godmode/setup/os.php +++ b/pandora_console/godmode/setup/os.php @@ -88,6 +88,14 @@ switch ($tab) { break; case 'manage_os': + $id_os = get_parameter('id_os', ''); + if ($id_os !== '') { + $headerTitle = __('Edit OS'); + } else { + $headerTitle = __('Create OS'); + } + break; + case 'list': if ($action === 'edit') { $headerTitle = __('Edit OS'); diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php index 46a91e27c6..3366fcc6f8 100644 --- a/pandora_console/godmode/setup/setup_general.php +++ b/pandora_console/godmode/setup/setup_general.php @@ -960,60 +960,6 @@ echo ''; ); echo ''; - - - /** - * Print the modal window for the summary of each alerts group - * - * @param string $id Id. - * - * @return void - */ - function print_email_test_modal_window($id) - { - // Email config table. - $table_mail_test = new stdClass(); - $table_mail_test->width = '100%'; - $table_mail_test->class = 'filter-table-adv'; - $table_mail_test->data = []; - - $table_mail_test->data[0][] = html_print_label_input_block( - __('Address'), - html_print_input_text( - 'email_test_address', - '', - '', - 35, - 100, - true - ) - ); - - $table_mail_test->data[1][] = ' Email sentEmail could not be sent'; - - // $table_mail_test->colspan[2][0] = 2; - $submitButton = html_print_div( - [ - 'class' => 'action-buttons-right-forced', - 'content' => html_print_button( - __('Send'), - 'email_test', - false, - '', - [ - 'icon' => 'cog', - 'mode' => 'mini', - ], - true - ), - ], - true - ); - - echo ''.html_print_table($table_mail_test, true).$submitButton.'
';
- }
-
-
?>
$other['data'][29],
'ff_type' => $other['data'][30],
'ignore_unknown' => $other['data'][32],
+ 'warning_time' => $other['data'][33],
];
if (! $values['descripcion']) {
@@ -3850,6 +3849,7 @@ function api_set_update_network_module($id_module, $thrash1, $other, $thrash3)
'policy_linked',
'ff_type',
'ignore_unknown',
+ 'warning_time',
];
$values = [];
@@ -3964,6 +3964,7 @@ function api_set_create_plugin_module($id, $thrash1, $other, $thrash3)
'warning_inverse' => $other['data'][34],
'ff_type' => $other['data'][35],
'ignore_unknown' => $other['data'][37],
+ 'warning_time' => $other['data'][38],
];
$plugin = db_get_row('tplugin', 'id', $values['id_plugin']);
@@ -4126,6 +4127,7 @@ function api_set_update_plugin_module($id_module, $thrash1, $other, $thrash3)
'policy_linked',
'ff_type',
'ignore_unknown',
+ 'warning_time',
];
$values = [];
@@ -4253,6 +4255,7 @@ function api_set_create_data_module($id, $thrash1, $other, $thrash3)
'warning_inverse' => $other['data'][25],
'ff_type' => $other['data'][26],
'ignore_unknown' => $other['data'][27],
+ 'warning_time' => $other['data'][28],
];
if (! $values['descripcion']) {
@@ -4776,6 +4779,7 @@ function api_set_update_data_module($id_module, $thrash1, $other, $thrash3)
'policy_linked',
'ff_type',
'ignore_unknown',
+ 'warning_time',
];
$values = [];
@@ -4917,6 +4921,7 @@ function api_set_create_snmp_module($id, $thrash1, $other, $thrash3)
'min_ff_event_critical' => $other['data'][33],
'ff_type' => $other['data'][34],
'ignore_unknown' => $other['data'][36],
+ 'warning_time' => $other['data'][37],
];
} else {
$values = [
@@ -4950,6 +4955,7 @@ function api_set_create_snmp_module($id, $thrash1, $other, $thrash3)
'min_ff_event_critical' => $other['data'][27],
'ff_type' => $other['data'][28],
'ignore_unknown' => $other['data'][29],
+ 'warning_time' => $other['data'][30],
];
}
@@ -5119,6 +5125,7 @@ function api_set_update_snmp_module($id_module, $thrash1, $other, $thrash3)
'policy_linked',
'ff_type',
'ignore_unknown',
+ 'warning_time',
];
} else {
$snmp_module_fields = [
@@ -5152,6 +5159,7 @@ function api_set_update_snmp_module($id_module, $thrash1, $other, $thrash3)
'policy_linked',
'ff_type',
'ignore_unknown',
+ 'warning_time',
];
}
@@ -7273,8 +7281,6 @@ function api_set_tag($id, $thrash1, $other, $thrash3)
*
* @param type of return json or csv.
*/
-
-
function api_get_all_planned_downtimes($thrash1, $thrash2, $other, $returnType='json')
{
global $config;
@@ -7337,8 +7343,6 @@ function api_get_all_planned_downtimes($thrash1, $thrash2, $other, $returnType='
*
* @param type of return json or csv.
*/
-
-
function api_get_planned_downtimes_items($thrash1, $thrash2, $other, $returnType='json')
{
global $config;
@@ -7430,8 +7434,6 @@ function api_get_planned_downtimes_items($thrash1, $thrash2, $other, $returnType
*
* @param type of return json or csv.
*/
-
-
function api_set_planned_downtimes_deleted($id, $thrash1, $thrash2, $returnType)
{
global $config;
@@ -8000,6 +8002,7 @@ function api_set_update_data_module_policy($id, $thrash1, $other, $thrash3)
'disabled_types_event',
'module_macros',
'ignore_unknown',
+ 'warning_time',
];
$cont = 0;
@@ -8242,6 +8245,7 @@ function api_set_update_network_module_policy($id, $thrash1, $other, $thrash3)
'disabled_types_event',
'module_macros',
'ignore_unknown',
+ 'warning_time',
];
$cont = 0;
@@ -8486,6 +8490,7 @@ function api_set_update_plugin_module_policy($id, $thrash1, $other, $thrash3)
'macros',
'module_macros',
'ignore_unknown',
+ 'warning_time',
];
$cont = 0;
@@ -8969,6 +8974,7 @@ function api_set_update_snmp_module_policy($id, $thrash1, $other, $thrash3)
'plugin_user',
'plugin_pass',
'ignore_unknown',
+ 'warning_time',
];
} else {
$fields_snmp_module = [
@@ -8994,6 +9000,7 @@ function api_set_update_snmp_module_policy($id, $thrash1, $other, $thrash3)
'custom_id',
'description',
'ignore_unknown',
+ 'warning_time',
];
}
@@ -12101,8 +12108,6 @@ function api_set_disable_module($agent_name, $module_name, $other, $thrash4)
* @param $thrash3 Don't use.
* @param $thrash4 Don't use.
*/
-
-
function api_set_enable_module($agent_name, $module_name, $other, $thrash4)
{
if (defined('METACONSOLE')) {
@@ -12169,8 +12174,6 @@ function api_set_enable_module($agent_name, $module_name, $other, $thrash4)
// http://localhost/pandora_console/include/api.php?op=set&op2=disable_alert&id=c2cea5860613e363e25f4ba185b54fe28f869ff8a5e8bb46343288337c903531&id2=Status&other=Warning%20condition
*/
-
-
function api_set_disable_alert($agent_name, $module_name, $template_name, $thrash4)
{
global $config;
@@ -12216,8 +12219,6 @@ function api_set_disable_alert($agent_name, $module_name, $template_name, $thras
// http://localhost/pandora_console/include/api.php?op=set&op2=disable_alert_alias&id=garfio&id2=Status&other=Warning%20condition
*/
-
-
function api_set_disable_alert_alias($agent_alias, $module_name, $template_name, $thrash4)
{
global $config;
@@ -12269,8 +12270,6 @@ function api_set_disable_alert_alias($agent_alias, $module_name, $template_name,
// http://localhost/pandora_console/include/api.php?op=set&op2=enable_alert&id=garfio&id2=Status&other=Warning%20condition
*/
-
-
function api_set_enable_alert($agent_name, $module_name, $template_name, $thrash4)
{
global $config;
@@ -12316,8 +12315,6 @@ function api_set_enable_alert($agent_name, $module_name, $template_name, $thrash
// http://localhost/pandora_console/include/api.php?op=set&op2=enable_alert_alias&id=garfio&id2=Status&other=Warning%20condition
*/
-
-
function api_set_enable_alert_alias($agent_alias, $module_name, $template_name, $thrash4)
{
global $config;
@@ -12369,8 +12366,6 @@ function api_set_enable_alert_alias($agent_alias, $module_name, $template_name,
// http://localhost/pandora_console/include/api.php?op=set&op2=disable_module_alerts&id=garfio&id2=Status
*/
-
-
function api_set_disable_module_alerts($agent_name, $module_name, $other, $thrash4)
{
global $config;
@@ -12449,8 +12444,6 @@ function api_set_disable_module_alerts($agent_name, $module_name, $other, $thras
* @param $thrash4 Don't use.
* // http://localhost/pandora_console/include/api.php?op=set&op2=enable_module_alerts&id=garfio&id2=Status
*/
-
-
function api_set_enable_module_alerts($agent_name, $module_name, $other, $thrash4)
{
global $config;
@@ -13184,7 +13177,7 @@ function api_set_create_event($id, $trash1, $other, $returnType)
if ($other['data'][21] != '') {
$values['event_custom_id'] = $other['data'][21];
- }else{
+ } else {
$values['event_custom_id'] = '';
}
@@ -13613,8 +13606,6 @@ function api_get_pandora_servers($trash1, $trash2, $other, $returnType)
*
* @param $thrash3 Don't use.
*/
-
-
function api_set_enable_disable_agent($id, $thrash2, $other, $thrash3)
{
if (defined('METACONSOLE')) {
@@ -13699,8 +13690,6 @@ function api_set_enable_disable_agent($id, $thrash2, $other, $thrash3)
*
* TODO: Add support to events.
*/
-
-
function api_set_pagerduty_webhook($type, $matchup_path, $tresh2, $return_type)
{
global $config;
@@ -16808,8 +16797,6 @@ function api_set_reset_agent_counts($id, $thrash1, $thrash2, $thrash3)
* api.php?op=get&op2=list_all_user&return_type=json&apipass=1234&user=admin&pass=pandora
* @return
*/
-
-
function api_get_list_all_user($thrash1, $thrash2, $other, $returnType)
{
global $config;
@@ -16884,8 +16871,6 @@ function api_get_list_all_user($thrash1, $thrash2, $other, $returnType)
*
* @return
*/
-
-
function api_get_info_user_name($thrash1, $thrash2, $other, $returnType)
{
global $config;
@@ -16960,8 +16945,6 @@ function api_get_info_user_name($thrash1, $thrash2, $other, $returnType)
*
* @return
*/
-
-
function api_get_filter_user_group($thrash1, $thrash2, $other, $returnType)
{
global $config;
@@ -17046,8 +17029,6 @@ function api_get_filter_user_group($thrash1, $thrash2, $other, $returnType)
*
* @return void
*/
-
-
function api_set_delete_user_permission($thrash1, $thrash2, $other, $returnType)
{
global $config;
@@ -17105,8 +17086,6 @@ function api_set_delete_user_permission($thrash1, $thrash2, $other, $returnType)
*
* @return void
*/
-
-
function api_set_add_permission_user_to_group($thrash1, $thrash2, $other, $returnType)
{
global $config;
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 9eb19be28d..268bfe45b4 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -104,6 +104,7 @@ function config_update_value($token, $value, $noticed=false, $password=false)
return true;
}
+ $prev_value = $config[$token];
$config[$token] = $value;
$value = io_safe_output($value);
@@ -117,13 +118,24 @@ function config_update_value($token, $value, $noticed=false, $password=false)
return true;
} else {
// Something in setup changes.
- if ($noticed === false) {
+ $value_token = (empty($config[$token]) === true) ? 0 : $config[$token];
+ $prev_value = (empty($prev_value) === true) ? 0 : $prev_value;
+ if (is_array($prev_value) === true) {
+ $prev_value = implode(';', $prev_value);
+ }
+
+ if ($noticed === true && $prev_value !== $value_token) {
db_pandora_audit(
AUDIT_LOG_SETUP,
'Setup has changed',
false,
false,
- sprintf('Token << %s >> updated.', $token)
+ sprintf(
+ 'Token << %s >> updated %s -> %s',
+ $token,
+ $prev_value,
+ $value_token
+ )
);
}
@@ -1624,6 +1636,10 @@ function config_update_config()
$error_update[] = __('Netflow max lifetime');
}
+ if (config_update_value('netflow_interval', (int) get_parameter('netflow_interval'), true) === false) {
+ $error_update[] = __('Netflow interval');
+ }
+
if (config_update_value('netflow_get_ip_hostname', (int) get_parameter('netflow_get_ip_hostname'), true) === false) {
$error_update[] = __('Name resolution for IP address');
}
@@ -2090,11 +2106,6 @@ function config_update_config()
} else {
$config['error_config_update_config'] = [];
$config['error_config_update_config']['correct'] = true;
-
- db_pandora_audit(
- AUDIT_LOG_SETUP,
- 'Setup has changed'
- );
}
if (count($errors) > 0) {
@@ -3060,6 +3071,10 @@ function config_process_config()
config_update_value('netflow_max_lifetime', '5');
}
+ if (!isset($config['netflow_interval'])) {
+ config_update_value('netflow_interval', 1800);
+ }
+
if (!isset($config['sflow_interval'])) {
config_update_value('sflow_interval', SECONDS_10MINUTES);
}
diff --git a/pandora_console/include/functions_cron_task.php b/pandora_console/include/functions_cron_task.php
index 042d79dad7..6c3d575dd0 100644
--- a/pandora_console/include/functions_cron_task.php
+++ b/pandora_console/include/functions_cron_task.php
@@ -426,6 +426,14 @@ function cron_task_run(
WHERE id=".$id_user_task;
}
+ db_pandora_audit(
+ AUDIT_LOG_CRON_TASK,
+ 'Executed cron task: '.$task['name'].' #'.$task['id'],
+ false,
+ false,
+ ''
+ );
+
db_process_sql($sql);
db_process_sql($sql2);
}
@@ -496,7 +504,7 @@ function cron_task_start_gotty(bool $restart_mode=true)
}
}
- if ($start_proc === true) {
+ if ($start_proc === true && file_exists('/usr/bin/pandora_gotty') === true) {
$logFilePath = $config['homedir'].'/log/gotty_cron_tmp.log';
shell_exec('touch '.$logFilePath);
@@ -519,7 +527,7 @@ function cron_task_start_gotty(bool $restart_mode=true)
while ((time() - $startTime) < $maxWaitTime) {
if ($start_proc === true) {
// Read command output.
- $log_content = file_get_contents($logFilePath);
+ $log_content = @file_get_contents($logFilePath);
}
if ($start_proc === true
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index cd22b55f1b..4e58ae5b4b 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -1177,14 +1177,18 @@ function events_get_all(
$array_search[] = 'lower(ta.alias)';
}
+ // Disregard repeated whitespaces in search string.
+ $collapsed_spaces_search = preg_replace('/( )+/', ' ', $filter['search']);
+
$sql_search = ' AND (';
foreach ($array_search as $key => $field) {
+ // Disregard repeated whitespaces in query searched string.
$sql_search .= sprintf(
- '%s %s %s like lower("%%%s%%")',
+ '%s REGEXP_REPLACE(%s, "( \\s*)+", " ") %s like lower("%%%s%%")',
($key === 0) ? '' : $nexo,
$field,
$not_search,
- $filter['search']
+ $collapsed_spaces_search
);
$sql_search .= ' ';
}
@@ -3804,7 +3808,7 @@ function events_get_response_target(
}
$event = db_get_row('tevento', 'id_evento', $event_id);
- $target = io_safe_output($event_response['target']);
+ $target = io_safe_output(db_get_value('target', 'tevent_response', 'id', $event_response['id']));
// Replace parameters response.
if (isset($response_parameters) === true
@@ -6468,10 +6472,10 @@ function event_print_graph(
$color[] = '#82b92f';
}
} else {
+ $interval_length = 0;
+
if ($num_intervals > 0) {
$interval_length = (int) ($period / $num_intervals);
- } else {
- $interval_length = 0;
}
$intervals = [];
diff --git a/pandora_console/include/functions_extensions.php b/pandora_console/include/functions_extensions.php
index f381484461..0a40a38e5a 100755
--- a/pandora_console/include/functions_extensions.php
+++ b/pandora_console/include/functions_extensions.php
@@ -440,7 +440,7 @@ function extensions_add_operation_menu_option($name, $fatherId=null, $icon=null,
$option_menu['acl'] = $acl;
$extension = &$config['extensions'][$extension_file];
- $option_menu['sec2'] = $extension['dir'].'/'.mb_substr($extension_file, 0, -4);
+ $option_menu['sec2'] = $extension['dir'].'/'.mb_substr(($extension_file ?? ''), 0, -4);
$option_menu['fatherId'] = $fatherId;
$option_menu['subfatherId'] = $subfatherId;
$option_menu['icon'] = $icon;
diff --git a/pandora_console/include/functions_forecast.php b/pandora_console/include/functions_forecast.php
index 540bbf7174..1f0d1e59d9 100644
--- a/pandora_console/include/functions_forecast.php
+++ b/pandora_console/include/functions_forecast.php
@@ -100,7 +100,7 @@ function forecast_projection_graph(
$data[0] = '';
$data[1] = $cont;
- $data[2] = date($config['date_format'], $row[0]);
+ $data[2] = date($config['date_format'], (int) $row[0]);
$data[3] = $row[0];
$data[4] = $row[1];
$data[5] = ($row[0] * $row[1]);
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index bb6a785812..3a4ca01ebb 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -183,8 +183,6 @@ function html_f2str($function, $params)
*
* @return string HTML code if return parameter is true.
*/
-
-
function html_print_side_layer($params)
{
global $config;
@@ -2738,8 +2736,8 @@ function html_print_input_text_extended(
if ($hide_div_eye !== false) {
echo "";
@@ -2756,9 +2754,11 @@ function html_print_input_text_extended(
];
foreach ($attrs as $attribute => $default) {
- if (array_key_exists($attribute, $attributes)) {
+ if (array_key_exists($attribute, $attributes)
+ || ($password === true && $attribute === 'value')
+ ) {
continue;
- } //end if
+ }
/*
* Remember, this next code have a $$ that for example there is a var as
@@ -2768,7 +2768,7 @@ function html_print_input_text_extended(
*
*/
- // Exact operator because we want to show "0" on the value
+ // Exact operator because we want to show "0" on the value.
if ($attribute !== '') {
$output .= $attribute.'="'.$$attribute.'" ';
} else if ($default != '') {
@@ -2799,6 +2799,12 @@ function html_print_input_text_extended(
],
true
);
+
+ echo "';
}
if (!$return) {
@@ -4584,8 +4590,6 @@ function html_print_checkbox_switch_extended(
*
* @return string HTML code if return parameter is true.
*/
-
-
function html_print_checkbox_switch($name, $value, $checked=false, $return=false, $disabled=false, $script='', $disabled_hidden=false, $class='')
{
$output = html_print_checkbox_switch_extended($name, $value, (bool) $checked, $disabled, $script, '', true, '', $class);
@@ -7687,3 +7691,52 @@ function html_print_wizard_diagnosis(
echo $output;
}
}
+
+
+/**
+ * Print the modal window for the summary of each alerts group
+ *
+ * @param string $id Id.
+ *
+ * @return void
+ */
+function print_email_test_modal_window($id)
+{
+ // Email config table.
+ $table_mail_test = new stdClass();
+ $table_mail_test->width = '100%';
+ $table_mail_test->class = 'filter-table-adv';
+ $table_mail_test->data = [];
+ $table_mail_test->data[0][] = html_print_label_input_block(
+ __('Address'),
+ html_print_input_text(
+ 'email_test_address',
+ '',
+ '',
+ 35,
+ 100,
+ true
+ )
+ );
+ $table_mail_test->data[1][] = ' Email sentEmail could not be sent';
+ // $table_mail_test->colspan[2][0] = 2;
+ $submitButton = html_print_div(
+ [
+ 'class' => 'action-buttons-right-forced',
+ 'content' => html_print_button(
+ __('Send'),
+ 'email_test',
+ false,
+ 'perform_email_test()',
+ [
+ 'icon' => 'cog',
+ 'mode' => 'mini',
+ ],
+ true
+ ),
+ ],
+ true
+ );
+
+ echo '
'.html_print_table($table_mail_test, true).$submitButton.'
';
+}
diff --git a/pandora_console/include/functions_io.php b/pandora_console/include/functions_io.php
index 445504b11c..cb6b5163ac 100755
--- a/pandora_console/include/functions_io.php
+++ b/pandora_console/include/functions_io.php
@@ -82,11 +82,11 @@ function io_safe_input($value)
return $value;
}
- if (! mb_check_encoding($value, 'UTF-8')) {
+ if (isset($value) === true && !mb_check_encoding($value, 'UTF-8')) {
$value = utf8_encode($value);
}
- $valueHtmlEncode = htmlentities($value, ENT_QUOTES, 'UTF-8', true);
+ $valueHtmlEncode = htmlentities(($value ?? ''), ENT_QUOTES, 'UTF-8', true);
// Replace the character '\' for the equivalent html entitie
$valueHtmlEncode = str_replace('\\', '\', $valueHtmlEncode);
@@ -561,10 +561,8 @@ function io_output_password($password, $wrappedBy='')
]
);
- $output = ($plaintext === ENTERPRISE_NOT_HOOK) ? $password : $plaintext;
-
// If password already decrypt return same password.
- $output = (empty($plaintext) === true) ? $password : $plaintext;
+ $output = (empty($plaintext) === true || $plaintext === ENTERPRISE_NOT_HOOK) ? $password : $plaintext;
return sprintf(
'%s%s%s',
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index ca67825da1..aa19f58ded 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -155,6 +155,8 @@ function menu_print_menu(&$menu)
}
} else if ($sec2 === 'godmode/users/configure_user') {
$sec2 = 'godmode/users/user_list';
+ } else if ($sec2 === 'godmode/modules/manage_inventory_modules_form') {
+ $sec2 = 'godmode/modules/manage_inventory_modules';
} else if ($sec2 === 'godmode/groups/configure_group') {
$sec2 = 'godmode/groups/group_list';
} else if ($sec2 === 'godmode/users/configure_profile') {
@@ -1228,6 +1230,22 @@ if (is_ajax()) {
'.$php_sys->data->memoryLimit->value.'
'.$php_sys->data->postMaxSize->name.'
+'.$php_sys->data->postMaxSize->value.'
+'.$php_sys->data->uploadMaxFilesize->name.'
+'.$php_sys->data->uploadMaxFilesize->value.'
+'.$php_sys->data->sessionLifetime->name.'
diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php index bc8495969f..9ed730af38 100644 --- a/pandora_console/include/functions_netflow.php +++ b/pandora_console/include/functions_netflow.php @@ -328,12 +328,13 @@ function netflow_data_table($data, $start_date, $end_date, $aggregate, $pdf=fals /** * Show a table with netflow top N data. * - * @param array $data Netflow data. - * @param integer $total_bytes Total bytes count to calculate percent data. + * @param array $data Netflow data. + * @param integer $total_bytes Total bytes count to calculate percent data. + * @param boolean $show_extended Display extended table. * * @return string HTML data table. */ -function netflow_top_n_table(array $data, int $total_bytes) +function netflow_top_n_table(array $data, int $total_bytes, bool $show_extended=false) { global $nfdump_date_format; @@ -344,31 +345,44 @@ function netflow_top_n_table(array $data, int $total_bytes) $table->data = []; $table->head = []; - $table->head[0] = ''.__('Source IP').''; - $table->head[1] = ''.__('Destination IP').''; - $table->head[2] = ''.__('Bytes').''; - $table->head[3] = ''.__('% Traffic').''; - $table->head[4] = ''.__('Avg. Throughput').''; - $table->style[0] = 'padding: 4px'; + if ($show_extended === false) { + $table->head[0] = ''.__('Source IP').''; + $table->head[1] = ''.__('Destination IP').''; + $table->head[2] = ''.__('Bytes').''; + $table->head[3] = ''.__('Packets').''; + $table->head[4] = ''.__('% Traffic').''; + $table->head[5] = ''.__('Avg. Throughput').''; + $table->style[0] = 'padding: 4px'; + } else { + $table->head[0] = ''.__('Source IP').''; + $table->head[1] = ''.__('Destination IP').''; + $table->head[2] = ''.__('Ingress bytes').''; + $table->head[3] = ''.__('Egress bytes').''; + $table->head[4] = ''.__('Ingress packets').''; + $table->head[5] = ''.__('Egress packets').''; + $table->head[6] = ''.__('% Traffic').''; + $table->head[7] = ''.__('Avg. Throughput').''; + $table->style[0] = 'padding: 4px'; + } $i = 0; foreach ($data as $value) { $table->data[$i][0] = $value['ip_src']; $table->data[$i][1] = $value['ip_dst']; - $table->data[$i][2] = network_format_bytes($value['bytes']); - $traffic = '-'; - - if ($total_bytes > 0) { - $traffic = sprintf( - '%.2f', - (($value['bytes'] / $total_bytes) * 100) - ); + if ($show_extended === true) { + $table->data[$i][2] = network_format_bytes($value['ibytes']); + $table->data[$i][3] = network_format_bytes($value['obytes']); + $table->data[$i][4] = (empty($value['ipackages']) === true) ? 0 : $value['ipackages']; + $table->data[$i][5] = (empty($value['opackages']) === true) ? 0 : $value['opackages']; + $table->data[$i][6] = $value['traffic'].' %'; + } else { + $table->data[$i][2] = network_format_bytes($value['bytes']); + $table->data[$i][3] = (empty($value['ipackages']) === true) ? 0 : $value['ipackages']; + $table->data[$i][4] = $value['traffic'].' %'; } - $table->data[$i][3] = $traffic.' %'; - $units = [ 'bps', 'Kbps', @@ -382,7 +396,11 @@ function netflow_top_n_table(array $data, int $total_bytes) $value['bps'] /= pow(1024, $pow); - $table->data[$i][4] = round($value['bps'], 2).' '.$units[$pow]; + if ($show_extended === true) { + $table->data[$i][7] = round($value['bps'], 2).' '.$units[$pow]; + } else { + $table->data[$i][5] = round($value['bps'], 2).' '.$units[$pow]; + } $i++; } @@ -481,7 +499,9 @@ function netflow_get_top_N( string $end_date, array $filter, int $max, - string $connection_name='' + string $connection_name='', + bool $extended_info=false, + int $total_bytes=0 ) { global $nfdump_date_format; @@ -496,7 +516,8 @@ function netflow_get_top_N( return json_decode($data, true); } - $options = '-o "fmt:%sap,%dap,%ibyt,%bps" -q -n '.$max.' -s record/bytes -t '.date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date); + $opts = ($extended_info === true) ? 'fmt:%sap,%dap,%ibyt,%obyt,%ipkt,%opkt,%bps' : 'fmt:%sap,%dap,%ibyt,%ipkt,%bps'; + $options = '-o "'.$opts.'" -q -n '.$max.' -s record/bytes -t '.date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date); $command = netflow_get_command($options, $filter, $start_date, $end_date); @@ -516,8 +537,29 @@ function netflow_get_top_N( $values[$i]['ip_src'] = $parsed_line[0]; $values[$i]['ip_dst'] = $parsed_line[1]; - $values[$i]['bytes'] = $parsed_line[2]; - $values[$i]['bps'] = $parsed_line[3]; + + $traffic = '-'; + if ($total_bytes > 0) { + $conn_bytes = $parsed_line[2]; + + $traffic = sprintf( + '%.2f', + (($conn_bytes / $total_bytes) * 100) + ); + } + + $values[$i]['traffic'] = $traffic; + + if ($extended_info === true) { + $values[$i]['ibytes'] = $parsed_line[2]; + $values[$i]['obytes'] = $parsed_line[3]; + $values[$i]['ipackets'] = $parsed_line[4]; + $values[$i]['opackets'] = $parsed_line[5]; + $values[$i]['bps'] = $parsed_line[6]; + } else { + $values[$i]['bytes'] = $parsed_line[2]; + $values[$i]['bps'] = $parsed_line[3]; + } $i++; } @@ -1341,7 +1383,11 @@ function netflow_draw_item( $output='HTML', $address_resolution=false, $width_content=false, - $height_content=false + $height_content=false, + $extended=false, + $show_graph=true, + $show_summary=true, + $show_table=true ) { $aggregate = $filter['aggregate']; $interval = ($end_date - $start_date); @@ -1496,7 +1542,9 @@ function netflow_draw_item( $end_date, $filter, $max_aggregates, - $connection_name + $connection_name, + $extended, + $data_summary['totalbytes'] ); if (empty($data_top_n) === true) { @@ -1505,16 +1553,76 @@ function netflow_draw_item( if ($output === 'HTML' || $output === 'PDF') { $html = '| "; - $html .= netflow_summary_table($data_summary); - $html .= ' | '; - $html .= '
| "; - $html .= netflow_top_n_table($data_top_n, $data_summary['totalbytes']); - $html .= ' | '; - $html .= '
";
+
+ if ($output === 'PDF') {
+ $html .= ' ';
+ } else {
+ $html .= $graph_output;
+ }
+
+ $html .= ' | ';
+ $html .= '
| "; + $html .= netflow_summary_table($data_summary); + $html .= ' | '; + $html .= '
| "; + $html .= netflow_top_n_table( + $data_top_n, + $data_summary['totalbytes'], + $extended + ); + $html .= ' | '; + $html .= '
| ';
$result_pdf .= $title;
@@ -16181,7 +16206,8 @@ function reporting_module_histogram_graph($report, $content, $pdf=0)
// Si viene de no iniciado busco el primer dato del modulo y si es de histórico.
$first_utimestamp = false;
$search_historydb = false;
- $extract_first_data = modules_get_first_date($content['id_agent_module'], 0);
+ // Limitamos el primer dato al rango de tiempo seleccionado por el usuario.
+ $extract_first_data = modules_get_first_date($content['id_agent_module'], $date_start);
if (empty($extract_first_data) === false) {
$first_utimestamp = $extract_first_data['first_utimestamp'];
$search_historydb = (isset($extract_first_data['search_historydb']) === true) ? $extract_first_data['search_historydb'] : false;
@@ -16286,7 +16312,8 @@ function reporting_module_histogram_graph($report, $content, $pdf=0)
$return['data_ok'] = $check_ok;
$return['data_total'] = $check_total;
if ($check_total > 0) {
- $return['percent_ok'] = (($time_ok * 100) / $content['period']);
+ $percent_ok = (($time_ok * 100) / $content['period']);
+ $return['percent_ok'] = ($percent_ok > 100) ? 100 : $percent_ok;
} else {
$return['percent_ok'] = 0;
}
diff --git a/pandora_console/include/functions_servers.php b/pandora_console/include/functions_servers.php
index bdc8a56fc9..8805998232 100644
--- a/pandora_console/include/functions_servers.php
+++ b/pandora_console/include/functions_servers.php
@@ -615,7 +615,7 @@ function servers_get_rate($avg_interval, $num_modules)
* This function will get all the server information in an array
* or a specific server.
*
- * @param integer $id_server An optional integer or array of integers
+ * @param integer|array $id_server An optional integer or array of integers
* to select specific servers.
*
* @return mixed False in case the server doesn't exist or an array with info.
@@ -624,28 +624,63 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
{
global $config;
- if (is_array($id_server)) {
- $select_id = ' WHERE id_server IN ('.implode(',', $id_server).')';
+ $select_id = '';
+ if (is_array($id_server) === true) {
+ $select_id = ' AND id_server IN ('.implode(',', $id_server).')';
} else if ($id_server > 0) {
- $select_id = ' WHERE id_server IN ('.(int) $id_server.')';
- } else {
- $select_id = '';
+ $select_id = ' AND id_server IN ('.(int) $id_server.')';
}
- $sql = '
- SELECT *
- FROM tserver '.$select_id.'
- ORDER BY server_type';
+ $types_sql = sprintf(
+ ' AND (
+ `server_type` != %d AND
+ `server_type` != %d
+ )',
+ SERVER_TYPE_AUTOPROVISION,
+ SERVER_TYPE_MIGRATION
+ );
+ if (is_metaconsole() === true && isset($config['ndbh']) === false) {
+ $types_sql = sprintf(
+ ' AND (
+ `server_type` = %d OR
+ `server_type` = %d OR
+ `server_type` = %d OR
+ `server_type` = %d
+ )',
+ SERVER_TYPE_AUTOPROVISION,
+ SERVER_TYPE_EVENT,
+ SERVER_TYPE_MIGRATION,
+ SERVER_TYPE_PREDICTION
+ );
+ }
+
+ $sql = sprintf(
+ 'SELECT *
+ FROM tserver
+ WHERE 1=1
+ %s
+ %s
+ ORDER BY server_type',
+ $select_id,
+ $types_sql
+ );
if ($sql_limit !== -1) {
- $sql = '
- SELECT *
- FROM tserver '.$select_id.'
- ORDER BY server_type'.$sql_limit;
+ $sql = sprintf(
+ 'SELECT *
+ FROM tserver
+ WHERE 1=1
+ %s
+ %s
+ ORDER BY server_type
+ %s',
+ $select_id,
+ $types_sql,
+ $sql_limit
+ );
}
$result = db_get_all_rows_sql($sql);
- $time = get_system_time();
if (empty($result)) {
return false;
@@ -1445,6 +1480,12 @@ function servers_get_server_string_name(int $server)
case SERVER_TYPE_NCM:
return __('NCM server');
+ case SERVER_TYPE_AUTOPROVISION:
+ return __('Autoprovision server');
+
+ case SERVER_TYPE_MIGRATION:
+ return __('Migration server');
+
default:
return __('N/A');
}
diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php
index 66dad24db6..ada7841ab7 100755
--- a/pandora_console/include/functions_treeview.php
+++ b/pandora_console/include/functions_treeview.php
@@ -1039,7 +1039,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
echo "
+
+
+ values['gis_map']);
+
+ $output .= '';
+ gis_print_map(
+ 'map_'.$this->cellId,
+ $map['zoom_level'],
+ $map['initial_latitude'],
+ $map['initial_longitude'],
+ $baselayers,
+ $controls
+ );
+ $output .= '';
+
+ if (empty($layers) === false) {
+ foreach ($layers as $layer) {
+ gis_make_layer(
+ $layer['layer_name'],
+ $layer['view_layer'],
+ null,
+ $layer['id_tmap_layer']
+ );
+
+ // Calling agents_get_group_agents with none to obtain the names in the same case as they are in the DB.
+ $agentNamesByGroup = [];
+ if ($layer['tgrupo_id_grupo'] >= 0) {
+ $agentNamesByGroup = agents_get_group_agents(
+ $layer['tgrupo_id_grupo'],
+ false,
+ 'none',
+ true,
+ true,
+ false
+ );
+ }
+
+ $agentNamesByLayer = gis_get_agents_layer($layer['id_tmap_layer']);
+
+ $groupsByAgentId = gis_get_groups_layer_by_agent_id($layer['id_tmap_layer']);
+ $agentNamesOfGroupItems = [];
+ foreach ($groupsByAgentId as $agentId => $groupInfo) {
+ $agentNamesOfGroupItems[$agentId] = $groupInfo['agent_name'];
+ }
+
+ $agentNames = array_unique($agentNamesByGroup + $agentNamesByLayer + $agentNamesOfGroupItems);
+
+ foreach ($agentNames as $key => $agentName) {
+ $idAgent = $key;
+ $coords = gis_get_data_last_position_agent($idAgent);
+
+ if ($coords === false) {
+ $coords['stored_latitude'] = $map['default_latitude'];
+ $coords['stored_longitude'] = $map['default_longitude'];
+ } else {
+ if ($show_history == 'y') {
+ $lastPosition = [
+ 'longitude' => $coords['stored_longitude'],
+ 'latitude' => $coords['stored_latitude'],
+ ];
+ gis_add_path($layer['layer_name'], $idAgent, $lastPosition);
+ }
+ }
+
+ $status = agents_get_status($idAgent, true);
+ $icon = gis_get_agent_icon_map($idAgent, true, $status);
+ $icon_size = getimagesize($icon);
+ $icon_width = $icon_size[0];
+ $icon_height = $icon_size[1];
+
+ // Is a group item.
+ if (empty($groupsByAgentId[$idAgent]) === false) {
+ $groupId = (int) $groupsByAgentId[$idAgent]['id'];
+ $groupName = $groupsByAgentId[$idAgent]['name'];
+
+ gis_add_agent_point(
+ $layer['layer_name'],
+ io_safe_output($groupName),
+ $coords['stored_latitude'],
+ $coords['stored_longitude'],
+ $icon,
+ $icon_width,
+ $icon_height,
+ $idAgent,
+ $status,
+ 'point_group_info',
+ $groupId
+ );
+ } else {
+ $parent = db_get_value('id_parent', 'tagente', 'id_agente', $idAgent);
+
+ gis_add_agent_point(
+ $layer['layer_name'],
+ io_safe_output($agentName),
+ $coords['stored_latitude'],
+ $coords['stored_longitude'],
+ $icon,
+ $icon_width,
+ $icon_height,
+ $idAgent,
+ $status,
+ 'point_agent_info',
+ $parent
+ );
+ }
+ }
+ }
+
+ gis_add_parent_lines();
+
+ $timestampLastOperation = db_get_value_sql('SELECT UNIX_TIMESTAMP()');
+
+ gis_activate_select_control();
+ gis_activate_ajax_refresh($layers, $timestampLastOperation);
+ }
+
+ return $output;
+ }
+
+
+ /**
+ * Get description.
+ *
+ * @return string.
+ */
+ public static function getDescription()
+ {
+ return __('GIS map');
+ }
+
+
+ /**
+ * Get Name.
+ *
+ * @return string.
+ */
+ public static function getName()
+ {
+ return 'GisMap';
+ }
+
+
+ /**
+ * Get size Modal Configuration.
+ *
+ * @return array
+ */
+ public function getSizeModalConfiguration(): array
+ {
+ $size = [
+ 'width' => 500,
+ 'height' => 300,
+ ];
+
+ return $size;
+ }
+
+
+}
diff --git a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
index e490135734..1bbcc3be33 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
@@ -115,6 +115,13 @@ class ModulesByStatus extends Widget
*/
protected $cellId;
+ /**
+ * Size
+ *
+ * @var array
+ */
+ public $size;
+
/**
* Construct.
@@ -200,6 +207,14 @@ class ModulesByStatus extends Widget
// Retrieve global - common inputs.
$values = parent::decoders($decoder);
+ if (isset($decoder['groupId']) === true) {
+ $values['groupId'] = $decoder['groupId'];
+ }
+
+ if (isset($decoder['search_agent']) === true) {
+ $values['search_agent'] = $decoder['search_agent'];
+ }
+
if (isset($decoder['search']) === true) {
$values['search'] = $decoder['search'];
}
@@ -240,9 +255,39 @@ class ModulesByStatus extends Widget
// Retrieve global - common inputs.
$inputs = parent::getFormInputs();
+ $return_all_group = false;
+ if (users_can_manage_group_all('RM') || $values['groupId'] == 0) {
+ $return_all_group = true;
+ }
+
+ // Groups.
+ $inputs[] = [
+ 'label' => __('Group'),
+ 'arguments' => [
+ 'type' => 'select_groups',
+ 'name' => 'groupId',
+ 'returnAllGroup' => $return_all_group,
+ 'privilege' => 'AR',
+ 'selected' => $values['groupId'],
+ 'return' => true,
+ ],
+ ];
+
+ // Search Agent.
+ $inputs[] = [
+ 'label' => __('Search agent').ui_print_help_tip(__('Search filter by Agent name field content'), true),
+ 'arguments' => [
+ 'name' => 'search_agent',
+ 'type' => 'text',
+ 'value' => $values['search_agent'],
+ 'return' => true,
+ 'size' => 0,
+ ],
+ ];
+
// Search.
$inputs[] = [
- 'label' => __('Free search').ui_print_help_tip(__('Search filter by Module name field content'), true),
+ 'label' => __('Search module').ui_print_help_tip(__('Search filter by Module name field content'), true),
'arguments' => [
'name' => 'search',
'type' => 'text',
@@ -373,7 +418,9 @@ class ModulesByStatus extends Widget
// Retrieve global - common inputs.
$values = parent::getPost();
+ $values['groupId'] = \get_parameter('groupId', 0);
$values['search'] = \get_parameter('search', '');
+ $values['search_agent'] = \get_parameter('search_agent', '');
$values['status'] = \get_parameter('status', '');
$values['limit'] = \get_parameter('limit', '');
$values['nodes'] = \get_parameter('nodes', '');
@@ -386,173 +433,73 @@ class ModulesByStatus extends Widget
/**
* Draw widget.
*
- * @return string;
+ * @return void Html output;
*/
public function load()
{
- $this->size = parent::getSize();
+ // Datatables list.
+ try {
+ $info_columns = $this->columns();
+ $column_names = $info_columns['column_names'];
+ $columns = $info_columns['columns'];
+ $hash = get_parameter('auth_hash', '');
+ $id_user = get_parameter('id_user', '');
- global $config;
-
- $output = '';
-
- if (is_metaconsole() === true) {
- $modules = [];
-
- $servers_ids = array_column(metaconsole_get_servers(), 'id');
-
- foreach ($servers_ids as $server_id) {
- try {
- $node = new Node((int) $server_id);
-
- $node->connect();
- $modules_tmp = $this->getInfoModules(
- $this->values['search'],
- $this->values['status'],
- $this->values['nodes']
- );
- $modules[$node->id()] = $modules_tmp[0];
- $node->disconnect();
- } catch (\Exception $e) {
- // Unexistent modules.
- $node->disconnect();
- }
- }
- } else {
- $modules = $this->getInfoModules(
- $this->values['search'],
- $this->values['status']
+ $tableId = 'ModuleByStatus_'.$this->dashboardId.'_'.$this->cellId;
+ // Load datatables user interface.
+ ui_print_datatable(
+ [
+ 'id' => $tableId,
+ 'class' => 'info_table align-left-important',
+ 'style' => 'width: 100%',
+ 'columns' => $columns,
+ 'column_names' => $column_names,
+ 'ajax_url' => 'include/ajax/module',
+ 'ajax_data' => [
+ 'get_data_ModulesByStatus' => 1,
+ 'table_id' => $tableId,
+ 'search_agent' => $this->values['search_agent'],
+ 'search' => $this->values['search'],
+ 'groupId' => $this->values['groupId'],
+ 'status' => $this->values['status'],
+ 'nodes' => $this->values['nodes'],
+ 'disabled_modules' => $this->values['disabled_modules'],
+ 'auth_hash' => $hash,
+ 'auth_class' => 'PandoraFMS\Dashboard\Manager',
+ 'id_user' => $id_user,
+ ],
+ 'default_pagination' => $this->values['limit'],
+ 'order' => [
+ 'field' => 'last_status_change',
+ 'direction' => 'desc',
+ ],
+ 'csv' => 0,
+ 'pagination_options' => [
+ [
+ 5,
+ 10,
+ 25,
+ 100,
+ 200,
+ 500,
+ 1000,
+ ],
+ [
+ 5,
+ 10,
+ 25,
+ 100,
+ 200,
+ 500,
+ 1000,
+ ],
+ ],
+ 'dom_elements' => 'frtilp',
+ ]
);
+ } catch (\Exception $e) {
+ echo $e->getMessage();
}
-
- if ($modules !== false && empty($modules) === false) {
- // Datatables list.
- try {
- $info_columns = $this->columns();
- $column_names = $info_columns['column_names'];
- $columns = $info_columns['columns'];
- $hash = get_parameter('auth_hash', '');
- $id_user = get_parameter('id_user', '');
-
- $tableId = 'ModuleByStatus_'.$this->dashboardId.'_'.$this->cellId;
- // Load datatables user interface.
- ui_print_datatable(
- [
- 'id' => $tableId,
- 'class' => 'info_table align-left-important',
- 'style' => 'width: 100%',
- 'columns' => $columns,
- 'column_names' => $column_names,
- 'ajax_url' => 'include/ajax/module',
- 'ajax_data' => [
- 'get_data_ModulesByStatus' => 1,
- 'table_id' => $tableId,
- 'search' => $this->values['search'],
- 'status' => $this->values['status'],
- 'nodes' => $this->values['nodes'],
- 'disabled_modules' => $this->values['disabled_modules'],
- 'auth_hash' => $hash,
- 'auth_class' => 'PandoraFMS\Dashboard\Manager',
- 'id_user' => $id_user,
- ],
- 'default_pagination' => $this->values['limit'],
- 'order' => [
- 'field' => 'last_status_change',
- 'direction' => 'desc',
- ],
- 'csv' => 0,
- 'pagination_options' => [
- [
- 5,
- 10,
- 25,
- 100,
- 200,
- 500,
- 1000,
- ],
- [
- 5,
- 10,
- 25,
- 100,
- 200,
- 500,
- 1000,
- ],
- ],
- 'dom_elements' => 'frtilp',
- ]
- );
- } catch (\Exception $e) {
- echo $e->getMessage();
- }
- } else {
- $output = '';
- $output .= ' ';
- $output .= \ui_print_info_message(
- __('Not found modules'),
- '',
- true
- );
- $output .= ' ';
-
- return $output;
- }
- }
-
-
- /**
- * Get info modules.
- *
- * @param string $search Free search.
- * @param string $status Modules status.
- *
- * @return array Data.
- */
- private function getInfoModules(string $search, string $status): array
- {
- if (empty($search) === false) {
- $where = 'tagente_modulo.nombre LIKE "%%'.$search.'%%" AND ';
- }
-
- if (str_contains($status, '6') === true) {
- $expl = explode(',', $status);
- $exist = array_search('6', $expl);
- if (isset($exist) === true) {
- unset($expl[$exist]);
- }
-
- array_push($expl, '1', '2');
-
- $status = implode(',', $expl);
- }
-
- $where .= sprintf(
- 'tagente_estado.estado IN (%s)
- AND tagente_modulo.delete_pending = 0',
- $status
- );
-
- $sql = sprintf(
- 'SELECT
- COUNT(*) AS "modules"
- FROM tagente_modulo
- INNER JOIN tagente
- ON tagente_modulo.id_agente = tagente.id_agente
- INNER JOIN tagente_estado
- ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
- WHERE %s',
- $where
- );
-
- $modules = db_get_all_rows_sql($sql);
-
- if ($modules === false) {
- $modules = [];
- }
-
- return $modules;
}
@@ -579,7 +526,10 @@ class ModulesByStatus extends Widget
'nombre',
'alias',
'server_name',
- 'last_status_change',
+ [
+ 'text' => 'last_status_change',
+ 'class' => '',
+ ],
'estado',
];
} else {
@@ -593,7 +543,10 @@ class ModulesByStatus extends Widget
$columns = [
'nombre',
'alias',
- 'last_status_change',
+ [
+ 'text' => 'last_status_change',
+ 'class' => '',
+ ],
'estado',
];
}
@@ -642,12 +595,12 @@ class ModulesByStatus extends Widget
$height_counter = (((int) count($nodes_fields)) * 20);
$size = [
- 'width' => 450,
+ 'width' => 470,
'height' => (520 + $height_counter),
];
} else {
$size = [
- 'width' => 450,
+ 'width' => 470,
'height' => 480,
];
}
diff --git a/pandora_console/include/lib/Dashboard/Widgets/agent_module.php b/pandora_console/include/lib/Dashboard/Widgets/agent_module.php
index 56ab854375..f5c4ff5a96 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/agent_module.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/agent_module.php
@@ -355,7 +355,7 @@ class AgentModuleWidget extends Widget
*/
public function getIdCacheAgent($id_agents)
{
- $target_agents = explode(',', $id_agents);
+ $target_agents = explode(',', ($id_agents ?? ''));
$cache_id_agents = [];
foreach ($target_agents as $agent_id) {
if (str_contains($agent_id, '|') === false) {
diff --git a/pandora_console/include/lib/Dashboard/Widgets/events_list.php b/pandora_console/include/lib/Dashboard/Widgets/events_list.php
index a50cab93e4..beb7a92b5f 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/events_list.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/events_list.php
@@ -111,6 +111,20 @@ class EventsListWidget extends Widget
*/
protected $publicLink;
+ /**
+ * Overflow scrollbar.
+ *
+ * @var boolean
+ */
+ public $overflow_scrollbars;
+
+ /**
+ * Position
+ *
+ * @var array
+ */
+ public $position;
+
/**
* Construct.
diff --git a/pandora_console/include/lib/Dashboard/Widgets/heatmap.php b/pandora_console/include/lib/Dashboard/Widgets/heatmap.php
index e199a80ad8..ada804bedb 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/heatmap.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/heatmap.php
@@ -271,7 +271,7 @@ class HeatmapWidget extends Widget
'name' => 'groups[]',
'returnAllGroup' => true,
'privilege' => 'AR',
- 'selected' => explode(',', $values['groups'][0]),
+ 'selected' => (isset($values['groups'][0]) === true) ? explode(',', $values['groups'][0]) : [],
'return' => true,
'multiple' => true,
],
@@ -305,7 +305,7 @@ class HeatmapWidget extends Widget
'type' => 'select',
'fields' => $tags,
'name' => 'tags[]',
- 'selected' => explode(',', $values['tags'][0]),
+ 'selected' => (isset($values['tags'][0]) === true) ? explode(',', $values['tags'][0]) : [],
'return' => true,
'multiple' => true,
],
@@ -332,7 +332,7 @@ class HeatmapWidget extends Widget
'type' => 'select',
'fields' => $module_groups,
'name' => 'module_groups[]',
- 'selected' => explode(',', $values['module_groups'][0]),
+ 'selected' => (isset($values['module_groups'][0]) === true) ? explode(',', $values['module_groups'][0]) : [],
'return' => true,
'multiple' => true,
'nothing' => __('Not assigned'),
diff --git a/pandora_console/include/lib/Dashboard/Widgets/security_hardening.php b/pandora_console/include/lib/Dashboard/Widgets/security_hardening.php
index 9f7d726677..88e37c58b5 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/security_hardening.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/security_hardening.php
@@ -446,7 +446,7 @@ class SecurityHardening extends Widget
{
global $config;
- $id_groups = explode(',', $group);
+ $id_groups = explode(',', ($group ?? ''));
if (in_array(0, $id_groups) === true) {
$id_groups = array_keys(users_get_groups($config['id_user'], 'AR', false));
}
diff --git a/pandora_console/include/lib/TacticalView/GeneralTacticalView.php b/pandora_console/include/lib/TacticalView/GeneralTacticalView.php
index e00bc8fcf8..06e27e4fd6 100644
--- a/pandora_console/include/lib/TacticalView/GeneralTacticalView.php
+++ b/pandora_console/include/lib/TacticalView/GeneralTacticalView.php
@@ -224,18 +224,33 @@ class GeneralTacticalView
$zone_location = $date_zone->getLocation();
$latitude = $zone_location['latitude'];
- $emojiOptions = [
- 'have_good_day' => __('Have a good day %s ✌', $name),
- 'welcome_back' => __('Welcome back! %s 👋', $name),
- 'merry_christmas' => __('Welcome back! %s 🎅', $name),
- 'good_morning' => __('Good morning, %s! ☕', $name),
- 'good_evening' => __('Good evening, %s 🌇', $name),
- 'good_night' => __('Good night, %s 🌕', $name),
- 'happy_summer' => __('Happy summer, %s 🌞', $name),
- 'happy_winter' => __('Happy winter, %s ⛄', $name),
- 'happy_autumn' => __('Happy autumn, %s 🍂', $name),
- 'happy_spring' => __('Happy spring, %s 🌻', $name),
- ];
+ if ($name !== '') {
+ $emojiOptions = [
+ 'have_good_day' => __('Have a good day %s ✌', $name),
+ 'welcome_back' => __('Welcome back! %s 👋', $name),
+ 'merry_christmas' => __('Welcome back! %s 🎅', $name),
+ 'good_morning' => __('Good morning, %s! ☕', $name),
+ 'good_evening' => __('Good evening, %s 🌇', $name),
+ 'good_night' => __('Good night, %s 🌕', $name),
+ 'happy_summer' => __('Happy summer, %s 🌞', $name),
+ 'happy_winter' => __('Happy winter, %s ⛄', $name),
+ 'happy_autumn' => __('Happy autumn, %s 🍂', $name),
+ 'happy_spring' => __('Happy spring, %s 🌻', $name),
+ ];
+ } else {
+ $emojiOptions = [
+ 'have_good_day' => __('Have a good day ✌'),
+ 'welcome_back' => __('Welcome back! 👋'),
+ 'merry_christmas' => __('Welcome back! 🎅'),
+ 'good_morning' => __('Good morning! ☕'),
+ 'good_evening' => __('Good evening 🌇'),
+ 'good_night' => __('Good night 🌕'),
+ 'happy_summer' => __('Happy summer 🌞'),
+ 'happy_winter' => __('Happy winter ⛄'),
+ 'happy_autumn' => __('Happy autumn 🍂'),
+ 'happy_spring' => __('Happy spring 🌻'),
+ ];
+ }
// Welcome back.
$user_last_connect = $user['last_connect'];
diff --git a/pandora_console/include/lib/TacticalView/elements/SnmpTraps.php b/pandora_console/include/lib/TacticalView/elements/SnmpTraps.php
index f606893429..9e1de4d891 100644
--- a/pandora_console/include/lib/TacticalView/elements/SnmpTraps.php
+++ b/pandora_console/include/lib/TacticalView/elements/SnmpTraps.php
@@ -83,7 +83,11 @@ class SnmpTraps extends Element
{
if ($this->isEnabled() === true) {
$value = $this->valueMonitoring('snmp_trap_queue');
- $total = round($value[0]['data']);
+ if (isset($value[0]['data']) === true) {
+ $total = round($value[0]['data']);
+ } else {
+ $total = __('N/A');
+ }
} else {
$total = __('N/A');
}
@@ -109,7 +113,11 @@ class SnmpTraps extends Element
{
if ($this->isEnabled() === true) {
$value = $this->valueMonitoring('total_trap');
- $total = round($value[0]['data']);
+ if (isset($value[0]['data']) === true) {
+ $total = round($value[0]['data']);
+ } else {
+ $total = __('N/A');
+ }
} else {
$total = __('N/A');
}
diff --git a/pandora_console/include/rest-api/models/VisualConsole/View.php b/pandora_console/include/rest-api/models/VisualConsole/View.php
index 9ff824c242..e2e28f419a 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/View.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/View.php
@@ -637,6 +637,7 @@ class View extends \HTML
* Returns a popup for networkLink viewer.
*
* @return void
+ *
* phpcs:disable Squiz.Commenting.FunctionCommentThrowTag.Missing
*/
public function networkLinkPopup()
diff --git a/pandora_console/include/styles/dashboards.css b/pandora_console/include/styles/dashboards.css
index 8786faa843..00a780be6d 100644
--- a/pandora_console/include/styles/dashboards.css
+++ b/pandora_console/include/styles/dashboards.css
@@ -977,3 +977,19 @@ input.resize_button {
.event-cardboard-widget td {
cursor: pointer;
}
+
+.datatable-container-info-massage:not(:has(.invisible_important)) {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ height: 100%;
+ width: 100%;
+}
+
+.info_box_information.datatable-info-massage.info_box_container
+ .info_box.info.textodialogo {
+ display: flex;
+ width: 100%;
+ justify-content: center;
+}
diff --git a/pandora_console/include/styles/events.css b/pandora_console/include/styles/events.css
index 9a69ea8c56..c3c6f73f5d 100644
--- a/pandora_console/include/styles/events.css
+++ b/pandora_console/include/styles/events.css
@@ -505,10 +505,10 @@ div.multi-response-buttons {
justify-content: flex-start;
}
-td:has(div#server_to_exec_label),
+/*td:has(div#server_to_exec_label),
td:has(div#server_to_exec_value) {
padding: 0px;
-}
+}*/
table#save_filter_form,
table#load_filter_form {
@@ -569,3 +569,23 @@ div.container-filter-buttons {
.ui-dialog.modal-sound .ui-widget-header {
display: flex !important;
}
+
+.responsive_button_sound_events {
+ margin-right: 25% !important;
+}
+
+@media (max-width: 1640px) {
+ .responsive_button_sound_events {
+ margin-right: 10% !important;
+ }
+}
+
+@media (max-width: 1420px) {
+ .responsive_button_sound_events {
+ margin-right: 10px !important;
+ }
+}
+
+#button-start-search {
+ width: 115px;
+}
diff --git a/pandora_console/include/styles/jquery.tag-editor.css b/pandora_console/include/styles/jquery.tag-editor.css
index 5d535dba1e..31040fca45 100644
--- a/pandora_console/include/styles/jquery.tag-editor.css
+++ b/pandora_console/include/styles/jquery.tag-editor.css
@@ -108,9 +108,7 @@
cursor: default;
font-size: 14px;
}
-.ui-front {
- z-index: 9999;
-}
+
.ui-menu {
list-style: none;
padding: 1px;
diff --git a/pandora_console/include/styles/js/jquery-ui_custom.css b/pandora_console/include/styles/js/jquery-ui_custom.css
index 440540ab05..5bf343ee60 100644
--- a/pandora_console/include/styles/js/jquery-ui_custom.css
+++ b/pandora_console/include/styles/js/jquery-ui_custom.css
@@ -61,15 +61,11 @@
}
.ui-dialog .ui-dialog-titlebar-disengage {
- position: absolute !important;
- right: 50px;
- top: -3px;
- width: 40px;
margin: 0px 0 0 0;
padding: 1px;
- height: 40px;
+ height: 20px;
bottom: 30%;
- background-color: #fff !important;
+ background-color: white;
}
.ui-dialog .ui-dialog-titlebar-disengage:hover {
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 8a361b187b..b94418b090 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -776,6 +776,10 @@ select:-internal-list-box {
width: 80%;
}
+.w85p {
+ width: 85%;
+}
+
.w88p {
width: 88%;
}
@@ -1036,6 +1040,10 @@ select:-internal-list-box {
padding-bottom: 5px;
}
+.padding-bottom-25px {
+ padding-bottom: 25px;
+}
+
.padding-right-2 {
padding-right: 2em;
}
@@ -10946,6 +10954,18 @@ div.status_dot {
-webkit-mask: url(../../images/status_dot.svg) no-repeat center / contain;
}
+button div.import {
+ mask: url(../../images/import.svg) no-repeat center / contain;
+ -webkit-mask: url(../../images/import.svg) no-repeat center / contain;
+ height: 1.5rem;
+}
+
+button div.export {
+ mask: url(../../images/export.svg) no-repeat center / contain;
+ -webkit-mask: url(../../images/export.svg) no-repeat center / contain;
+ height: 1.5rem;
+}
+
.status_dot.ok {
background-color: #82b92e;
}
@@ -12116,6 +12136,10 @@ div.relative > div > div#ui-datepicker-div {
width: 400px;
}
+.container-div-input-password {
+ display: block !important;
+}
+
#message_dialog_connection {
height: auto !important;
}
@@ -12807,9 +12831,9 @@ div.agents_custom_fields #datatables_wrapper div.bottom {
.actions-sound-modal .buttons-sound-modal button.play,
.actions-sound-modal .buttons-sound-modal input[type="button"].play {
- background: url(../../images/play-white.png), transparent !important;
+ /*background: url(../../images/play-white.png), transparent !important;
background-repeat: no-repeat !important;
- background-position: 82px 14px !important;
+ background-position: 82px 14px !important;*/
color: #ffffff;
padding-left: 20px;
border: 0;
@@ -12884,6 +12908,34 @@ tr.shown td.details-control {
background-color: #81b92e3b !important;
}
+@media screen and (min-width: 1190px) and (max-width: 1290px) {
+ #api_qrcode_display {
+ left: 580px;
+ }
+}
+
+@media screen and (min-width: 1143px) and (max-width: 1189px) {
+ #api_qrcode_display {
+ left: 528px;
+ }
+}
+
+@media screen and (min-width: 860px) and (max-width: 1142px) {
+ #api_qrcode_display {
+ left: 356px;
+ top: 120px;
+ }
+
+ .font-title-font {
+ line-height: 0;
+ }
+
+ #qr_code_agent_view > img {
+ width: 250px;
+ height: 250px;
+ }
+}
+
.ui-dialog .tips_header.ui-dialog-titlebar {
height: fit-content !important;
}
@@ -13464,3 +13516,71 @@ tr.shown td.details-control {
mask: url(../../images/minimizar.svg) no-repeat right / contain;
-webkit-mask: url(../../images/minimizar.svg) no-repeat right / contain;
}
+
+/* Import/export */
+.div-import-export {
+ display: flex;
+ flex-direction: row;
+}
+
+.form-import {
+ width: 48%;
+ height: auto;
+ margin-right: 40px;
+}
+
+.div-import {
+ background-color: #ffffff;
+ border: 1px solid #e5e9ed;
+ border-radius: 8px;
+ width: 100%;
+ height: 180px;
+ display: flex;
+ flex-direction: row;
+ align-items: normal;
+ padding-top: 20px;
+ padding-left: 20px;
+ margin-bottom: 20px;
+}
+
+.div-export {
+ background-color: #ffffff;
+ border: 1px solid #e5e9ed;
+ border-radius: 8px;
+ width: 48%;
+ height: 180px;
+ display: flex;
+ flex-direction: row;
+ align-items: normal;
+ padding-top: 20px;
+ padding-left: 20px;
+ margin-bottom: 20px;
+}
+
+@media (max-width: 1300px) {
+ .div-import-export {
+ display: flex;
+ flex-direction: column;
+ }
+
+ .div-export {
+ width: calc(100% - 20px);
+ }
+
+ .form-import {
+ width: calc(100% - 20px);
+ }
+}
+
+.input-file-style::file-selector-button {
+ background-color: #ffffff;
+ border: 1px solid #979797;
+ border-radius: 4px;
+ width: 120px;
+ height: 32px;
+}
+
+button.disabled {
+ background: #c0ccdc !important;
+ border: 0px;
+}
diff --git a/pandora_console/include/styles/sound_events.css b/pandora_console/include/styles/sound_events.css
index a572c219f3..a8068a8308 100644
--- a/pandora_console/include/styles/sound_events.css
+++ b/pandora_console/include/styles/sound_events.css
@@ -1,9 +1,6 @@
/*
* Css Modal Sound events.
*/
-div.container-button-play > button#button-start-search {
- transition: none !important;
-}
.wizard {
text-align: left;
}
@@ -217,9 +214,9 @@ div.container-button-play > button#button-start-search {
.actions-sound-modal .buttons-sound-modal button.play,
.actions-sound-modal .buttons-sound-modal input[type="button"].play {
- background: url(../../images/play-white.png), transparent !important;
+ /*background: url(../../images/play-white.png), transparent !important;
background-repeat: no-repeat !important;
- background-position: 82px 14px !important;
+ background-position: 82px 14px !important;*/
color: #ffffff !important;
padding-left: 20px;
border: 0;
@@ -263,11 +260,6 @@ button#button-no-alerts.silence-alerts:hover {
background-position: 138px 4px !important;
}
-.actions-sound-modal .container-button-play {
- background-color: var(--primary-color);
- border-radius: 8px;
-}
-
.actions-sound-modal .container-button-alert.fired {
background: #ee2132;
border-radius: 8px;
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 6d491a85cb..0f60b2f62e 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
';
ui_require_css_file('cluetip', 'include/styles/js/');
ui_require_jquery_file('cluetip');
-$system_higher = false;
-$modules_agent = db_get_all_rows_sql(sprintf('SELECT id_agente FROM tagente_modulo WHERE id_agente = %s', $id_agente));
-if (is_array($modules_agent)) {
- $all_modules = db_get_all_rows_sql('SELECT id_agente FROM tagente_modulo');
- $all_agents = db_get_all_rows_sql('SELECT id_agente FROM tagente');
- if (is_array($all_modules) && is_array($all_agents)) {
- if ((count($all_modules) / count($all_agents)) >= 200) {
- $system_higher = true;
+if (isset($id_agente)) {
+ $system_higher = false;
+ $modules_agent = db_get_all_rows_sql(sprintf('SELECT id_agente FROM tagente_modulo WHERE id_agente = %s', $id_agente));
+ if (is_array($modules_agent)) {
+ $all_modules = db_get_all_rows_sql('SELECT id_agente FROM tagente_modulo');
+ $all_agents = db_get_all_rows_sql('SELECT id_agente FROM tagente');
+ if (is_array($all_modules) && is_array($all_agents)) {
+ if ((count($all_modules) / count($all_agents)) >= 200) {
+ $system_higher = true;
+ }
}
}
-}
-echo ' ';
$inputs[] = $in;
// REGEX search datatable.
-$in = ' '.__('Your system has a much higher rate of modules per agent than recommended (200 modules per agent). This implies performance problems in the system, please consider reducing the number of modules in this agent.').''.__('Your system has a much higher rate of modules per agent than recommended (200 modules per agent). This implies performance problems in the system, please consider reducing the number of modules in this agent.').'';
+$in = ' ';
@@ -572,6 +604,13 @@ html_print_div(
'style' => 'position: initial;',
]
);
+
+html_print_div(
+ [
+ 'id' => 'modal_whois',
+ 'class' => 'invisible',
+ ]
+);
?>
diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php
index 4bc5a05b61..fdd950575c 100755
--- a/pandora_console/operation/reporting/reporting_viewer.php
+++ b/pandora_console/operation/reporting/reporting_viewer.php
@@ -428,6 +428,13 @@ echo '';
ui_include_time_picker();
ui_require_jquery_file('ui.datepicker-'.get_user_language(), 'include/javascript/i18n/');
+db_pandora_audit(
+ AUDIT_LOG_REPORT_MANAGEMENT,
+ sprintf('Report visualized %s #%s.', $report['name'], $report['id_report']),
+ false,
+ false
+);
+
?>
';
$in .= html_print_input_text('regex', $regex, '', '', 255, true);
$in .= ' ';
$inputs[] = $in;
@@ -2819,7 +2833,7 @@ try {
'extra_html' => $active_filters_div.$graph_div,
'pagination_options' => [
[
- $config['block_size'],
+ (int) $config['block_size'],
10,
25,
100,
@@ -2827,7 +2841,7 @@ try {
500,
],
[
- $config['block_size'],
+ (int) $config['block_size'],
10,
25,
100,
@@ -2835,6 +2849,7 @@ try {
500,
],
],
+ 'pagination_options_order' => 'true',
'order' => [
'field' => 'timestamp',
'direction' => 'desc',
@@ -2951,8 +2966,8 @@ if (check_acl(
false,
'openSoundEventsDialog("'.$data_sound.'")',
[
+ 'class' => 'responsive_button_sound_events',
'icon' => 'sound',
- 'style' => 'margin-right: 25% !important',
'minimize-arrow' => true,
'span_style' => 'width: 100%',
],
diff --git a/pandora_console/operation/gis_maps/render_view.php b/pandora_console/operation/gis_maps/render_view.php
index e6cfaaee99..d826095a50 100644
--- a/pandora_console/operation/gis_maps/render_view.php
+++ b/pandora_console/operation/gis_maps/render_view.php
@@ -304,23 +304,7 @@ if ($layers != false) {
gis_add_parent_lines();
- switch ($config['dbtype']) {
- case 'mysql':
- $timestampLastOperation = db_get_value_sql('SELECT UNIX_TIMESTAMP()');
- break;
-
- case 'postgresql':
- $timestampLastOperation = db_get_value_sql(
- "SELECT ceil(date_part('epoch', CURRENT_TIMESTAMP))"
- );
- break;
-
- case 'oracle':
- $timestampLastOperation = db_get_value_sql(
- "SELECT ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (".SECONDS_1DAY.')) FROM dual'
- );
- break;
- }
+ $timestampLastOperation = db_get_value_sql('SELECT UNIX_TIMESTAMP()');
gis_activate_select_control();
gis_activate_ajax_refresh($layers, $timestampLastOperation);
diff --git a/pandora_console/operation/inventory/inventory.php b/pandora_console/operation/inventory/inventory.php
index 43296a1b26..a841c53266 100755
--- a/pandora_console/operation/inventory/inventory.php
+++ b/pandora_console/operation/inventory/inventory.php
@@ -382,7 +382,7 @@ ui_print_standard_header(
$inventory_id_agent = (int) get_parameter('agent_id', -1);
$inventory_agent = (string) get_parameter('agent', '');
-if (strlen($inventory_agent) == 0) {
+if (strlen(($inventory_agent ?? '')) == 0) {
$inventory_id_agent = -1;
$inventory_agent = __('All');
} else if ($inventory_agent == __('All')) {
diff --git a/pandora_console/operation/network/network_report.php b/pandora_console/operation/network/network_report.php
index 66847f4c1b..bc72602fd0 100644
--- a/pandora_console/operation/network/network_report.php
+++ b/pandora_console/operation/network/network_report.php
@@ -41,7 +41,10 @@ if (! check_acl($config['id_user'], 0, 'AR')) {
// Ajax callbacks.
if (is_ajax() === true) {
+ include_once $config['homedir'].'/include/functions_netflow.php';
$get_filter_values = get_parameter('get_filter_values', 0);
+ $whois = (bool) get_parameter('whois', 0);
+
// Get values of the current network filter.
if ($get_filter_values) {
$id = get_parameter('id');
@@ -51,6 +54,34 @@ if (is_ajax() === true) {
echo json_encode($filter_values);
}
+ if ($whois) {
+ $ip = get_parameter('ip');
+ $info = command_whois($ip);
+ $output = '';
+ if (is_array($info) === true && count($info) > 0) {
+ $table = new \stdClass();
+ $table->class = 'details_table dataTable info_table';
+ $table->data = [];
+ $row = 0;
+ foreach ($info as $key => $value) {
+ $table->data[$row][0] = $key;
+ $table->data[$row][1] = $value;
+ $row++;
+ }
+
+ $output = html_print_table($table, true);
+ } else {
+ $output = ui_print_info_message(__('No data found'));
+ }
+
+ html_print_div(
+ [
+ 'content' => $output,
+ 'style' => 'max-height: 600px;',
+ ],
+ );
+ }
+
return;
}
@@ -462,6 +493,7 @@ foreach ($data as $item) {
array_merge($hidden_main_link, ['main_value' => $item['host']]),
'image'
);
+ $row['main'] .= html_print_input_image('whois', 'images/eye.png', 'whois', '', true, ['onclick' => 'whois(\''.$item['host'].'\')']);
}
$row['main'] .= ' |
|---|