Fixed interfaces wizard modules genartion wit hypen

This commit is contained in:
Luis 2021-03-17 16:29:07 +00:00 committed by Daniel Rodriguez
parent c8bc516b5d
commit e667bdd2e8

View File

@ -1344,12 +1344,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) {
@ -1423,8 +1421,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];