From 0d50ea94dbfad78923919526ff0dd1ba58b8bee0 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Tue, 18 May 2021 13:27:06 +0200 Subject: [PATCH 1/4] Ensure oid starts with dot - braa requriements --- pandora_console/include/class/AgentWizard.class.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pandora_console/include/class/AgentWizard.class.php b/pandora_console/include/class/AgentWizard.class.php index e7486c3cd8..e572fd67ed 100644 --- a/pandora_console/include/class/AgentWizard.class.php +++ b/pandora_console/include/class/AgentWizard.class.php @@ -1582,6 +1582,10 @@ class AgentWizard extends HTML if ($candidate['execution_type'] === 0 || $candidate['execution_type'] === EXECUTION_TYPE_NETWORK ) { + if (substr($candidate['value'], 0, 1) !== '.') { + $candidate['value'] = '.'.$candidate['value']; + } + if ($this->serverType === SERVER_TYPE_ENTERPRISE_SATELLITE) { $values['id_module'] = MODULE_DATA; $values['module_interval'] = 1; From 876e3dd1917d6333bed760267edfd780916dfcbf Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Tue, 18 May 2021 13:27:56 +0200 Subject: [PATCH 2/4] Minor fix - linter return type in comments set to mixed --- pandora_console/include/functions_db.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index f7d264d0c4..26a46eae7b 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -374,7 +374,7 @@ function db_get_value_filter($field, $table, $filter, $where_join='AND', $search * * @param string SQL select statement to execute. * - * @return the first value of the first row of a table result from query. + * @return mixed the first value of the first row of a table result from query. */ function db_get_value_sql($sql, $dbconnection=false) { From e5ebc523568a0921b7c83cd3da8c1047889623c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Tue, 4 May 2021 13:48:13 +0200 Subject: [PATCH 3/4] Fixed missed parameter --- pandora_console/include/class/AgentWizard.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/class/AgentWizard.class.php b/pandora_console/include/class/AgentWizard.class.php index e572fd67ed..d42538187a 100644 --- a/pandora_console/include/class/AgentWizard.class.php +++ b/pandora_console/include/class/AgentWizard.class.php @@ -2090,7 +2090,7 @@ class AgentWizard extends HTML $tmp->id_modulo(MODULE_PLUGIN); if ($this->wizardSection === 'snmp_interfaces_explorer' - && empty($candidate['macros']) === true + && empty($candidate['macros']) === false ) { // Use definition provided. $tmp->id_plugin($candidate['id_plugin']); From 50242d3030eb120684e4667091ab86ff37a76ec7 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Wed, 26 May 2021 17:55:30 +0200 Subject: [PATCH 4/4] OID fixes while retrieving from remote Satellite server --- pandora_console/include/class/AgentWizard.class.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pandora_console/include/class/AgentWizard.class.php b/pandora_console/include/class/AgentWizard.class.php index d42538187a..bcc7719c23 100644 --- a/pandora_console/include/class/AgentWizard.class.php +++ b/pandora_console/include/class/AgentWizard.class.php @@ -1951,6 +1951,10 @@ class AgentWizard extends HTML || $candidate['execution_type'] === EXECUTION_TYPE_NETWORK ) { if ($this->serverType === SERVER_TYPE_ENTERPRISE_SATELLITE) { + if (substr($candidate['value'], 0, 1) !== '.') { + $candidate['value'] = '.'.$candidate['value']; + } + $tmp->module_interval(300); $tmp->id_modulo(MODULE_DATA); $tmp->updateConfigurationData(