mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-29 16:55:05 +02:00
Merge branch 'ent-6738-modules-ifInErrors-ifOutErrors-snmp-interface-wizard' into 'develop'
Solve OIDs issues and malfunction of some modules Closes pandora_enterprise#6738 See merge request artica/pandorafms!3633
This commit is contained in:
commit
beaf311eed
@ -1,5 +1,4 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Agent Wizard for SNMP and WMI
|
||||
*
|
||||
@ -1468,10 +1467,16 @@ class AgentWizard extends HTML
|
||||
$result[$value]['name'] = $data['module-default_name-'.$key];
|
||||
} else if (empty(preg_match('/module-description-set/', $k)) === false) {
|
||||
$result[$value]['description'] = $data['module-default_description-'.$key];
|
||||
} else if (empty(preg_match('/module-value/', $k)) === false) {
|
||||
$result[$value]['value'] = $data['module-value-'.$key];
|
||||
}
|
||||
|
||||
preg_match('/^(.*)-.*?_(\d-\d)$/', $k, $matches);
|
||||
preg_match('/^(.*)-.*?_(\d+-\d+)$/', $k, $matches);
|
||||
$k = $matches[1].'-0_'.$matches[2];
|
||||
} else {
|
||||
if (empty(preg_match('/module-value/', $k)) === false) {
|
||||
$result[$value]['value'] = $data[$k];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1495,7 +1500,7 @@ class AgentWizard extends HTML
|
||||
$result[$value]['scan_type'] = (int) $data[$k];
|
||||
} else if (empty(preg_match('/module-execution_type/', $k)) === false) {
|
||||
$result[$value]['execution_type'] = (int) $data[$k];
|
||||
} else if (empty(preg_match('/module-value/', $k)) === false) {
|
||||
} else if (($data['wizard_section'] !== 'snmp_interfaces_explorer') && (empty(preg_match('/module-value/', $k)) === false)) {
|
||||
$result[$value]['value'] = $data[$k];
|
||||
} else if (empty(preg_match('/module-macros/', $k)) === false) {
|
||||
$result[$value]['macros'] = $data[$k];
|
||||
|
Loading…
x
Reference in New Issue
Block a user