lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-16 01:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

(legacy) cleanups voucher.inc

Browse Source
This commit is contained in:
Ad Schellevis 2015-07-09 18:18:47 +00:00
parent e225795ab3
commit eea2a96c03
3 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/etc/inc/voucher.inc
View File

@ -276,7 +276,7 @@ function voucher_configure($sync = false)
$ret = true;
if (!is_array($config['voucher'])) {
if (!isset($config['voucher']) || !is_array($config['voucher'])) {
return $ret;
}
@ -427,25 +427,6 @@ function voucher_write_active_db($roll, $active) {
}
}
/* return how many vouchers are marked used on a roll */
function voucher_used_count($roll) {
global $g, $cpzone;
$bitstring = voucher_read_used_db($roll);
$max = strlen($bitstring) * 8;
$used = 0;
for ($i = 1; $i <= $max; $i++) {
// check if ticket already used or not.
$pos = $i >> 3; // divide by 8 -> octet
$mask = 1 << ($i % 8); // mask to test bit in octet
if (ord($bitstring[$pos]) & $mask)
$used++;
}
unset($bitstring);
return $used;
}
function voucher_read_used_db($roll)
{
global $cpzone;
@ -464,13 +445,6 @@ function voucher_read_used_db($roll)
return base64_decode($vdb);
}
function voucher_unlink_db($roll)
{
global $cpzone;
@unlink("/var/db/voucher_{$cpzone}_used_{$roll}.db");
@unlink("/var/db/voucher_{$cpzone}_active_{$roll}.db");
}
/* we share the log with captiveportal for now */
function voucher_log($priority, $message)

9
src/www/services_captiveportal_vouchers.php
View File

@ -37,6 +37,15 @@ require_once('filter.inc');
require_once('captiveportal.inc');
require_once('voucher.inc');
function voucher_unlink_db($roll)
{
global $cpzone;
@unlink("/var/db/voucher_{$cpzone}_used_{$roll}.db");
@unlink("/var/db/voucher_{$cpzone}_active_{$roll}.db");
}
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_captiveportal_vouchers.php');
$cpzone = $_GET['zone'];

21
src/www/status_captiveportal_voucher_rolls.php
View File

@ -33,6 +33,27 @@ require_once("filter.inc");
require_once("captiveportal.inc");
require_once("voucher.inc");
/* return how many vouchers are marked used on a roll */
function voucher_used_count($roll) {
global $g, $cpzone;
$bitstring = voucher_read_used_db($roll);
$max = strlen($bitstring) * 8;
$used = 0;
for ($i = 1; $i <= $max; $i++) {
// check if ticket already used or not.
$pos = $i >> 3; // divide by 8 -> octet
$mask = 1 << ($i % 8); // mask to test bit in octet
if (ord($bitstring[$pos]) & $mask)
$used++;
}
unset($bitstring);
return $used;
}
$cpzone = $_GET['zone'];
if (isset($_POST['zone'])) {
$cpzone = $_POST['zone'];