mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update some code to be more readble and more compliant to php5

Browse Source
This commit is contained in:
Ermal 2011-05-25 11:02:53 +00:00
parent b7475a811c
commit f6f1c84748
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etc/inc/voucher.inc
View File

@ -164,8 +164,7 @@ function voucher_auth($voucher_received, $test = 0) {
$tickets_per_roll = array();
$minutes_per_roll = array();
if (is_array($config['voucher']['roll'])) {
$a_roll = &$config['voucher']['roll'];
foreach ($a_roll as $rollent) {
foreach ($config['voucher']['roll'] as $rollent) {
$tickets_per_roll[$rollent['number']] = $rollent['count'];
$minutes_per_roll[$rollent['number']] = $rollent['minutes'];
}
@ -192,7 +191,7 @@ function voucher_auth($voucher_received, $test = 0) {
list($status, $roll, $nr) = explode(" ", $result);
if ($status == "OK") {
if (!$first_voucher) {
// store first voucher. Thats the one we give the timecredit
// store first voucher. Thats the one we give the timecredit
$first_voucher = $voucher;
$first_voucher_roll = $roll;
}
@ -352,11 +351,10 @@ function voucher_configure($sync = false) {
if (($g['booting'] || $sync == true) && is_array($config['voucher']['roll'])) {
// create active and used DB per roll on ramdisk from config
$a_roll = &$config['voucher']['roll'];
$voucherlck = lock('voucher', LOCK_EX);
foreach ($a_roll as $rollent) {
// create active and used DB per roll on ramdisk from config
foreach ($config['voucher']['roll'] as $rollent) {
$roll = $rollent['number'];
voucher_write_used_db($roll, $rollent['used']);

3
usr/local/www/services_captiveportal_vouchers.php
View File

@ -116,9 +116,8 @@ if ($_GET['act'] == "del") {
exit;
}
}
/* print all vouchers of the selected roll */
if ($_GET['act'] == "csv") {
else if ($_GET['act'] == "csv") {
$privkey = base64_decode($config['voucher']['privatekey']);
if (strstr($privkey,"BEGIN RSA PRIVATE KEY")) {
$fd = fopen("{$g['varetc_path']}/voucher.private","w");