From f9d480ff0b4a0cbd569a600ba6087770226ddba5 Mon Sep 17 00:00:00 2001 From: Ermal Date: Tue, 28 May 2013 08:26:25 +0000 Subject: Fixes #3001, Check the protocol of the webgui to determine if https is being used for custom ports. --- etc/inc/voucher.inc | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'etc/inc/voucher.inc') 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}"; -- cgit v1.1