'',
+ 'content' => '
To detect and find systems on your network we will need access credentials. The SNMP community for network devices, and at least one set of credentials for Linux and Windows environments (they do not need to be super administrators, but they do need to be able to connect remotely). Without the credentials, we will only be able to detect if the devices are connected to the network.
',
+ ],
+ true
+ );
+
+ // SNMP Communities
+ echo html_print_label_input_block(
+ __('SNMP communities to try with').ui_print_help_tip(
+ __(
+ 'You can specify several values, separated by commas, for example: public,mysecret,1234'
+ ),
+ true
+ ),
+ html_print_input(
+ [
+ 'name' => 'community',
+ 'type' => 'text',
+ 'value' => 'public',
+ 'size' => 25,
+ 'return' => true,
+ ],
+ 'div',
+ true
+ ),
+ ['div_id' => 'snmp-communities-div']
+ );
+ ui_require_jquery_file('tag-editor.min', 'include/javascript/', true);
+ ui_require_jquery_file('caret.min', 'include/javascript/', true);
+ ui_require_css_file('jquery.tag-editor', 'include/styles/', true);
+
+ echo '
';
+
+ $spacing = '';
+ for ($i = 0; $i < 12; $i++) {
+ $spacing .= ' ';
+ }
+
+ // WMI Credentials
+ echo '
';
+ echo ''.__('WMI credentials').' ';
+ echo html_print_div(
+ [
+ 'id' => 'wmi-creds',
+ 'content' => '',
+ ],
+ true
+ );
+ echo html_print_div(
+ [
+ 'id' => 'wmi-cred-form',
+ 'hidden' => true,
+ 'style' => 'margin: 10px; display: flex; align-items: center;',
+ 'content' => html_print_div(
+ [
+ 'id' => 'wmi-cred-user-div',
+ 'style' => 'width: 260px;',
+ 'content' => html_print_label_input_block(
+ __('User').' ',
+ html_print_input_text(
+ 'wmi-cred-user',
+ '',
+ '',
+ false,
+ 50,
+ // Max length
+ true,
+ false,
+ true,
+ '',
+ 'w100p',
+ '',
+ 'off',
+ false,
+ '',
+ '',
+ '',
+ false,
+ '',
+ 'Username'
+ ),
+ ['div_style' => 'display: flex; align-items: center;']
+ ),
+ ],
+ true
+ ).html_print_div(
+ [
+ 'id' => 'wmi-cred-pass-div',
+ 'style' => 'width: 260px;',
+ 'content' => html_print_label_input_block(
+ $spacing.__('Password').' ',
+ html_print_input_password(
+ 'wmi-cred-pass',
+ '',
+ '',
+ false,
+ 50,
+ // Max length
+ true,
+ false,
+ true,
+ 'w100p',
+ 'off',
+ false,
+ ''
+ ),
+ ['div_style' => 'display: flex; align-items: center;']
+ ),
+ ],
+ true
+ ).html_print_div(
+ [
+ 'id' => 'wmi-cred-namespace-div',
+ 'style' => 'width: 260px;',
+ 'content' => html_print_label_input_block(
+ $spacing.__('Namespace').' ',
+ html_print_input_text(
+ 'wmi-cred-namespace',
+ '',
+ '',
+ false,
+ 50,
+ // Max length
+ true,
+ false,
+ true,
+ '',
+ 'w100p',
+ '',
+ 'off',
+ false,
+ '',
+ '',
+ '',
+ false,
+ '',
+ 'Namespace'
+ ),
+ ['div_style' => 'display: flex; align-items: center;']
+ ),
+ ],
+ true
+ ).''.html_print_image(
+ 'images/delete.svg',
+ true,
+ [
+ 'title' => __('Delete'),
+ 'style' => 'cursor: pointer;',
+ 'class' => 'main_menu_icon invert_filter',
+ ]
+ ).' ',
+ ],
+ true
+ );
+ echo '
';
+ echo html_print_button(
+ __('Add'),
+ 'add-wmi-cred',
+ false,
+ 'add_discovery_credential("wmi-cred-form","wmi-creds");',
+ [
+ 'icon' => 'plus',
+ 'mode' => 'secondary',
+ 'class' => 'mini',
+ ],
+ true,
+ false,
+ false,
+ ''
+ );
+ echo ' ';
+
+ echo '
';
+
+ // RCM Credentials
+ echo '
';
+ echo ''.__('Remote commands credentials').' ';
+ echo html_print_div(
+ [
+ 'id' => 'rcmd-creds',
+ 'content' => '',
+ ],
+ true
+ );
+ echo html_print_div(
+ [
+ 'id' => 'rcmd-cred-form',
+ 'hidden' => true,
+ 'style' => 'margin: 10px; display: flex; align-items: center;',
+ 'content' => html_print_div(
+ [
+ 'id' => 'rcmd-cred-user-div',
+ 'style' => 'width: 260px;',
+ 'content' => html_print_label_input_block(
+ __('User').' ',
+ html_print_input_text(
+ 'rcmd-cred-user',
+ '',
+ '',
+ false,
+ 50,
+ // Max length
+ true,
+ false,
+ true,
+ '',
+ 'w100p',
+ '',
+ 'off',
+ false,
+ '',
+ '',
+ '',
+ false,
+ '',
+ 'Username'
+ ),
+ ['div_style' => 'display: flex; align-items: center;']
+ ),
+ ],
+ true
+ ).html_print_div(
+ [
+ 'id' => 'rcmd-cred-pass-div',
+ 'style' => 'width: 260px;',
+ 'content' => html_print_label_input_block(
+ $spacing.__('Password').' ',
+ html_print_input_password(
+ 'rcmd-cred-pass',
+ '',
+ '',
+ false,
+ 50,
+ // Max length
+ true,
+ false,
+ true,
+ 'w100p',
+ 'off',
+ false,
+ ''
+ ),
+ ['div_style' => 'display: flex; align-items: center;']
+ ),
+ ],
+ true
+ ).''.html_print_image(
+ 'images/delete.svg',
+ true,
+ [
+ 'title' => __('Delete'),
+ 'style' => 'cursor: pointer;',
+ 'class' => 'main_menu_icon invert_filter',
+ ]
+ ).' ',
+ ],
+ true
+ );
+ echo '
';
+ echo html_print_button(
+ __('Add'),
+ 'add-rcmd-cred',
+ false,
+ 'add_discovery_credential("rcmd-cred-form","rcmd-creds");',
+ [
+ 'icon' => 'plus',
+ 'mode' => 'secondary',
+ 'class' => 'mini',
+ ],
+ true,
+ false,
+ false,
+ ''
+ );
+ echo ' ';
+
echo html_print_submit_button(__('Create'), 'basic_net', false, ['icon' => 'next', 'style' => 'margin-top:15px; float:right;']);
?>
+
$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 .= ' ';
}
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 3a4ca01ebb..a06845064f 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -2931,6 +2931,7 @@ function html_print_anchor(
'class',
'title',
'onClick',
+ 'target',
];
$output .= (isset($options['href']) === true) ? 'href="'.io_safe_input_html($options['href']).'"' : ui_get_full_url();
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_notifications.php b/pandora_console/include/functions_notifications.php
index 141d3ae8cc..f16e8fd25b 100644
--- a/pandora_console/include/functions_notifications.php
+++ b/pandora_console/include/functions_notifications.php
@@ -819,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 7534cb5e23..c5c7090623 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -12546,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) {
@@ -12607,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) {
@@ -16206,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;
@@ -16311,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 .= '