diff options
| author | Ermal <eri@pfsense.org> | 2013-02-06 20:03:07 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2013-02-06 20:03:07 +0000 |
| commit | d6e569ae4f8ce5ccff19f5097e35de38405aa481 (patch) | |
| tree | 16e21d905668be656154804da72f121ffc8af587 /etc/inc/voucher.inc | |
| parent | 472c5dc9962dd0b30eeed8b3e904ee6d048c5bdd (diff) | |
| download | pfsense-d6e569ae4f8ce5ccff19f5097e35de38405aa481.zip pfsense-d6e569ae4f8ce5ccff19f5097e35de38405aa481.tar.gz | |
Actually let xmlrpc construct the url internally from the passed info it is doing same checks
Diffstat (limited to 'etc/inc/voucher.inc')
| -rw-r--r-- | etc/inc/voucher.inc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/etc/inc/voucher.inc b/etc/inc/voucher.inc index 88b599b..5b392bb 100644 --- a/etc/inc/voucher.inc +++ b/etc/inc/voucher.inc @@ -42,10 +42,8 @@ function xmlrpc_sync_voucher_expire($vouchers, $syncip, $port, $password, $usern require_once("xmlrpc.inc"); if ($port == "443") $url = "https://{$syncip}"; - else if ($port == "80") - $url = "http://{$syncip}"; else - $url = "http://{$syncip}:{$port}"; + $url = "http://{$syncip}"; /* Construct code that is run on remote machine */ $method = 'pfsense.exec_php'; @@ -92,10 +90,8 @@ function xmlrpc_sync_voucher_disconnect($dbent, $syncip, $port, $password, $user require_once("xmlrpc.inc"); if ($port == "443") $url = "https://{$syncip}"; - else if ($port == "80") - $url = "http://{$syncip}"; else - $url = "http://{$syncip}:{$port}"; + $url = "http://{$syncip}"; /* Construct code that is run on remote machine */ $dbent_str = serialize($dbent); @@ -146,10 +142,8 @@ function xmlrpc_sync_used_voucher($voucher_received, $syncip, $port, $password, require_once("xmlrpc.inc"); if ($port == "443") $url = "https://{$syncip}"; - else if ($port == "80") - $url = "http://{$syncip}"; else - $url = "http://{$syncip}:{$port}"; + $url = "http://{$syncip}"; /* Construct code that is run on remote machine */ $method = 'pfsense.exec_php'; |
