Merge pull request pfsense#170 from bcyrill/cp_restart

Fix Captive Portal SSL

Author: jim-p

etc/inc/captiveportal.inc

@@ -476,7 +476,7 @@ function captiveportal_init_webgui_zone($cpcfg) {
 	$res = mwexec("/usr/local/sbin/lighttpd -f {$g['varetc_path']}/lighty-{$cpzone}-CaptivePortal.conf");
 
 	/* fire up https instance */
-	if (isset($cpcfg['httpslogin']) && $cpcfg['httpslogin'])
+	if (isset($cpcfg['httpslogin']))
 		$res = mwexec("/usr/local/sbin/lighttpd -f {$g['varetc_path']}/lighty-{$cpzone}-CaptivePortal-SSL.conf");
 }
 

usr/local/www/services_captiveportal.php

@@ -257,7 +257,10 @@
 		$newcp['radmac_enable'] = $_POST['radmac_enable'] ? true : false;
 		$newcp['radmac_secret'] = $_POST['radmac_secret'] ? $_POST['radmac_secret'] : false;
 		$newcp['reauthenticateacct'] = $_POST['reauthenticateacct'];
-		$newcp['httpslogin'] = $_POST['httpslogin_enable'] ? true : false;
+		if (isset($_POST['httpslogin_enable']))
+			$newcp['httpslogin'] = true;
+		else
+			unset($newcp['httpslogin']);
 		$newcp['httpsname'] = $_POST['httpsname'];
 		$newcp['preauthurl'] = $_POST['preauthurl'];
 		$newcp['peruserbw'] = $_POST['peruserbw'] ? true : false;