Project

General

Profile

« Previous | Next » 

Revision c7ac47fd

Added by Jim Pingle about 14 years ago

Misc fixes to make the openvpn wizard stop re-creating a CA previously made via the wizard if you re-ran the wizard and chose a CA instead. Fixes #1512

View differences:

usr/local/www/wizards/openvpn_wizard.inc
177 177

  
178 178
	if (isset($_POST['next'])) {
179 179
		$_POST['uselist'] = "";
180
		unset($config['ovpnserver']['step6']['uselist']);
180 181
		$stepid++;
181 182
	} else {
182 183
		$config['ovpnserver']['step6']['uselist'] = "on";
......
228 229
}
229 230

  
230 231
function step8_submitphpaction() {
231
	global $stepid, $_POST;
232
	global $stepid, $config, $_POST;
232 233

  
233 234
	if (isset($_POST['next'])) {
234 235
		$_POST['uselist'] = "";
236
		unset($config['ovpnserver']['step9']['uselist']);
235 237
		$stepid++;
238
	} else {
239
		$config['ovpnserver']['step6']['uselist'] = "on";
240
		$_POST['uselist'] = "on";
236 241
	}
237 242
}
238 243

  
......
502 507
			$config['cert'] = array();
503 508

  
504 509
		$config['cert'][] = $cert;
505
	} else if (!isset($pconfig['step6']['uselist']) && empty($pconfig['step9']['authcertname'])) {
510
	} else if (!isset($pconfig['step9']['uselist']) && empty($pconfig['step9']['authcertname'])) {
506 511
		$message = "Please choose a Certificate.";
507 512
		header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=7&message={$message}");
508 513
		exit;

Also available in: Unified diff