From a4f07557b4fae0811fbfbc3dcd32abc6a3fab61d Mon Sep 17 00:00:00 2001 From: Ermal Date: Fri, 11 Jun 2010 11:59:29 +0000 Subject: [PATCH] Ticket #642. Fix logic for the wizard code to unset and arraynum usage. --- usr/local/www/wizard.php | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/usr/local/www/wizard.php b/usr/local/www/wizard.php index 8c2ae36d15..6e8c4f772c 100755 --- a/usr/local/www/wizard.php +++ b/usr/local/www/wizard.php @@ -129,11 +129,13 @@ function update_config_field($field, $updatetext, $unset, $arraynum, $field_type $field_conv .= "['" . $f . "']"; if($field_conv == "") return; + if ($arraynum <> "") + $field_conf .= "[" . $arraynum . "]"; if(($field_type == "checkbox" and $updatetext <> "on") || $updatetext == "") { /* - item is a checkbox, it should have the value "on" - if it was checked - */ + * item is a checkbox, it should have the value "on" + * if it was checked + */ $text = "unset(\$config" . $field_conv . ");"; eval($text); return; @@ -150,16 +152,9 @@ function update_config_field($field, $updatetext, $unset, $arraynum, $field_type if($unset <> "") { $text = "unset(\$config" . $field_conv . ");"; eval($text); - $text = "\$config" . $field_conv . "[" . $arraynum . "] = \"" . $updatetext . "\";"; - eval($text); - } else { - if($arraynum <> "") { - $text = "\$config" . $field_conv . "[" . $arraynum . "] = \"" . $updatetext . "\";"; - } else { - $text = "\$config" . $field_conv . " = \"" . $updatetext . "\";"; - } - eval($text); } + $text = "\$config" . $field_conv . " = \"" . $updatetext . "\";"; + eval($text); } // handle before form display event.