diff options
| author | Ermal <eri@pfsense.org> | 2013-05-28 08:26:25 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2013-05-28 08:26:25 +0000 |
| commit | f9d480ff0b4a0cbd569a600ba6087770226ddba5 (patch) | |
| tree | dc9d03a0b26fa5b4d0f9ac204f74478c784e1420 | |
| parent | e434d5c690219298ba4cf8c6af683b2180e44c54 (diff) | |
| download | pfsense-f9d480ff0b4a0cbd569a600ba6087770226ddba5.zip pfsense-f9d480ff0b4a0cbd569a600ba6087770226ddba5.tar.gz | |
Fixes #3001, Check the protocol of the webgui to determine if https is being used for custom ports.
| -rw-r--r-- | etc/inc/voucher.inc | 21 | ||||
| -rw-r--r-- | usr/local/www/services_captiveportal_vouchers.php | 7 |
2 files changed, 24 insertions, 4 deletions
diff --git a/etc/inc/voucher.inc b/etc/inc/voucher.inc index 5b392bb..e19e121 100644 --- a/etc/inc/voucher.inc +++ b/etc/inc/voucher.inc @@ -40,7 +40,12 @@ if(!function_exists('captiveportal_syslog')) function xmlrpc_sync_voucher_expire($vouchers, $syncip, $port, $password, $username) { global $g, $config, $cpzone; require_once("xmlrpc.inc"); - if ($port == "443") + + $protocol = "http"; + if (is_array($config['system']) && is_array($config['system']['webgui']) && !empty($config['system']['webgui']['protocol']) && + $config['system']['webgui']['protocol'] == "https") + $protocol = "https"; + if ($protocol == "https" || $port == "443") $url = "https://{$syncip}"; else $url = "http://{$syncip}"; @@ -88,7 +93,12 @@ EOF; function xmlrpc_sync_voucher_disconnect($dbent, $syncip, $port, $password, $username, $term_cause = 1, $stop_time = null) { global $g, $config, $cpzone; require_once("xmlrpc.inc"); - if ($port == "443") + + $protocol = "http"; + if (is_array($config['system']) && is_array($config['system']['webgui']) && !empty($config['system']['webgui']['protocol']) && + $config['system']['webgui']['protocol'] == "https") + $protocol = "https"; + if ($protocol == "https" || $port == "443") $url = "https://{$syncip}"; else $url = "http://{$syncip}"; @@ -140,7 +150,12 @@ EOF; function xmlrpc_sync_used_voucher($voucher_received, $syncip, $port, $password, $username) { global $g, $config, $cpzone; require_once("xmlrpc.inc"); - if ($port == "443") + + $protocol = "http"; + if (is_array($config['system']) && is_array($config['system']['webgui']) && !empty($config['system']['webgui']['protocol']) && + $config['system']['webgui']['protocol'] == "https") + $protocol = "https"; + if ($protocol == "https" || $port == "443") $url = "https://{$syncip}"; else $url = "http://{$syncip}"; diff --git a/usr/local/www/services_captiveportal_vouchers.php b/usr/local/www/services_captiveportal_vouchers.php index c2f154f..4490b1b 100644 --- a/usr/local/www/services_captiveportal_vouchers.php +++ b/usr/local/www/services_captiveportal_vouchers.php @@ -274,7 +274,12 @@ if ($_POST) { $newvoucher['vouchersyncport'] && $newvoucher['vouchersyncdbip']) { // Synchronize the voucher DB from the master node require_once("xmlrpc.inc"); - if($newvoucher['vouchersyncport'] == "443") + + $protocol = "http"; + if (is_array($config['system']) && is_array($config['system']['webgui']) && !empty($config['system']['webgui']['protocol']) && + $config['system']['webgui']['protocol'] == "https") + $protocol = "https"; + if ($protocol == "https" || $newvoucher['vouchersyncport'] == "443") $url = "https://{$newvoucher['vouchersyncdbip']}"; else $url = "http://{$newvoucher['vouchersyncdbip']}"; |
