Fix some variable re-use and other issues to correct the OpenVPN wizard behavior when using pre-existing CAs and Certs

2 files changed, 9 insertions, 9 deletions

diff --git a/src/usr/local/www/wizard.php b/src/usr/local/www/wizard.php
index b0beb35..c47db6c 100644
--- a/src/usr/local/www/wizard.php
+++ b/src/usr/local/www/wizard.php
@@ -665,21 +665,21 @@ if ($pkg['step'][$stepid]['fields']['field'] != "") {
 				}
 
 				foreach ($config['ca'] as $ca) {
-					$name = htmlspecialchars($ca['descr']);
+					$caname = htmlspecialchars($ca['descr']);
 
-					if ($value == $name)
+					if ($value == $caname)
 						$selected = $value;
 
 					$canecho = 0;
 					if ($field['certca_filter'] != "") {
-						if (stristr($name, $field['certca_filter']) == true) {
+						if (stristr($caname, $field['certca_filter']) == true) {
 							$canecho = 1;
 						}
 					} else {
 						$canecho = 1;
 					}
 					if ($canecho == 1) {
-						$options[$ca['refid']] = $name;
+						$options[$ca['refid']] = $caname;
 					}
 				}
 
@@ -713,16 +713,16 @@ if ($pkg['step'][$stepid]['fields']['field'] != "") {
 						continue;
 					}
 
-					$name = htmlspecialchars($ca['descr']);
+					$caname = htmlspecialchars($ca['descr']);
 
-					if ($value == $name) {
+					if ($value == $caname) {
 						array_push($selected, $value);
 					}
 
 
 					$canecho = 0;
 					if ($field['cert_filter'] != "") {
-						if (stristr($name, $field['cert_filter']) == true) {
+						if (stristr($caname, $field['cert_filter']) == true) {
 							$canecho = 1;
 						}
 					} else {
@@ -730,7 +730,7 @@ if ($pkg['step'][$stepid]['fields']['field'] != "") {
 					}
 
 					if ($canecho == 1) {
-						$options[$ca['refid']] = $name;
+						$options[$ca['refid']] = $caname;
 					}
 				}
 
diff --git a/src/usr/local/www/wizards/openvpn_wizard.inc b/src/usr/local/www/wizards/openvpn_wizard.inc
index 5450bc9..c0cdd58 100644
--- a/src/usr/local/www/wizards/openvpn_wizard.inc
+++ b/src/usr/local/www/wizards/openvpn_wizard.inc
@@ -243,7 +243,7 @@ function step8_submitphpaction() {
 		unset($config['ovpnserver']['step9']['uselist']);
 		$stepid++;
 	} else {
-		$config['ovpnserver']['step6']['uselist'] = "on";
+		$config['ovpnserver']['step9']['uselist'] = "on";
 		$_POST['uselist'] = "on";
 	}
 }