diff options
| author | Jim P <jim@pingle.org> | 2012-07-05 17:11:53 -0700 |
|---|---|---|
| committer | Jim P <jim@pingle.org> | 2012-07-05 17:11:53 -0700 |
| commit | 98c5d647ec5d24a2d3266827ab50f9c08a9702f9 (patch) | |
| tree | f885541b97cb4df92bf77cd68f0f65b512492a0c | |
| parent | b7fb885c4a12e3969063272abfc20333f3172d7c (diff) | |
| parent | 20789ec9f8a19e5ef16e7df03162fd8fd675839e (diff) | |
| download | pfsense-98c5d647ec5d24a2d3266827ab50f9c08a9702f9.zip pfsense-98c5d647ec5d24a2d3266827ab50f9c08a9702f9.tar.gz | |
Merge pull request #170 from bcyrill/cp_restart
Fix Captive Portal SSL
| -rw-r--r-- | etc/inc/captiveportal.inc | 2 | ||||
| -rwxr-xr-x | usr/local/www/services_captiveportal.php | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index 1ee71ef..12df424 100644 --- a/etc/inc/captiveportal.inc +++ b/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"); } diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php index c49ea1a..bfd7079 100755 --- a/usr/local/www/services_captiveportal.php +++ b/usr/local/www/services_captiveportal.php @@ -257,7 +257,10 @@ if ($_POST) { $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; |
