tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-6760-interfaces-con-guion-nombre-no-generan-correctamente' into 'develop' 

Fixed interfaces wizard modules genartion wit hypen

See merge request artica/pandorafms!3694
This commit is contained in:
Daniel Rodriguez 2021-03-17 16:29:07 +00:00
parent 0c99745c37 e667bdd2e8
commit 372d367b8e
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1356,12 +1356,10 @@ class AgentWizard extends HTML
$generalInterface = false; $generalInterface = false;
// Lets catch all values. // Lets catch all values.
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
if (empty(preg_match('/module-active/', $key)) === false if (empty(preg_match('/module-active-(.*)/m', $key, $tmpModules)) === false
&& (int) $value === 1 && (int) $value === 1
) { ) {
$tmpModules = explode('-', $key); $keyData = $tmpModules[1];
$keyData = $tmpModules[2].'-'.$tmpModules[3];
$modulesActivated[] = $keyData; $modulesActivated[] = $keyData;
} else if (empty(preg_match('/interfaz_select_/', $key)) === false) { } else if (empty(preg_match('/interfaz_select_/', $key)) === false) {
@ -1435,8 +1433,8 @@ class AgentWizard extends HTML
$result[$value]['value'] = $data['module-value-'.$key]; $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]; $k = $matches[1].'_'.$matches[2].'-'.$matches[3];
} else { } else {
if (empty(preg_match('/module-value/', $k)) === false) { if (empty(preg_match('/module-value/', $k)) === false) {
$result[$value]['value'] = $data[$k]; $result[$value]['value'] = $data[$k];