diff options
| author | Chris Buechler <cmb@pfsense.org> | 2012-12-30 15:21:23 -0800 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2012-12-30 15:21:23 -0800 |
| commit | 2455ebd637bb54b25e7c68e4ac75363e8fd6780a (patch) | |
| tree | 7fab0b23d7f8102b3afaffb56f385836e8867de6 | |
| parent | 9d2a2c4d43dbc0ed70601553eebe9698390a5f04 (diff) | |
| parent | c2a6cda0d064cf00b87950d7899276c8a9e13ef2 (diff) | |
| download | pfsense-2455ebd637bb54b25e7c68e4ac75363e8fd6780a.zip pfsense-2455ebd637bb54b25e7c68e4ac75363e8fd6780a.tar.gz | |
Merge pull request #301 from bcyrill/cp_patch3
Fix: Voucher Sync
| -rw-r--r-- | etc/inc/voucher.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/etc/inc/voucher.inc b/etc/inc/voucher.inc index 3356a1a..ea723ca 100644 --- a/etc/inc/voucher.inc +++ b/etc/inc/voucher.inc @@ -51,7 +51,7 @@ function xmlrpc_sync_voucher_expire($vouchers, $syncip, $port, $password, $usern require_once('/etc/inc/captiveportal.inc'); require_once('/etc/inc/voucher.inc'); \$cpzone = $cpzone; - voucher_expire(\$vouchers); + voucher_expire($vouchers); EOF; @@ -94,13 +94,15 @@ function xmlrpc_sync_voucher_disconnect($dbent, $syncip, $port, $password, $user $url = "http://{$syncip}"; /* Construct code that is run on remote machine */ + $dbent_str = serialize($dbent); $method = 'pfsense.exec_php'; $execcmd = <<<EOF require_once('/etc/inc/captiveportal.inc'); require_once('/etc/inc/voucher.inc'); \$cpzone = $cpzone; \$radiusservers = captiveportal_get_radius_servers(); - captiveportal_disconnect(\$dbent, \$radiusservers, \$term_cause, \$stop_time); + \$dbent = unserialize($dbent_str); + captiveportal_disconnect(\$dbent, \$radiusservers, $term_cause, $stop_time); EOF; |
