From 156487ed7db7f8a08d6063001a37d9cdf54cdd3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20Lu=E7i?= <eri@pfsense.org>
Date: Tue, 30 Jun 2009 10:37:21 +0000
Subject: [PATCH] Fix various issues reported on
 http://forum.pfsense.org/index.php/topic,8672.0.html.

---
 etc/inc/captiveportal.inc                       | 1 +
 etc/inc/voucher.inc                             | 3 ++-
 usr/local/www/status_captiveportal_vouchers.php | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index e653500fc9..41b386b259 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -40,6 +40,7 @@ require_once("util.inc");
 require_once("radius_authentication.inc");
 require_once("radius_accounting.inc");
 require_once("radius.inc");
+require_once("voucher.inc");
 
 $lockfile = "{$g['varrun_path']}/captiveportal.lock";
 
diff --git a/etc/inc/voucher.inc b/etc/inc/voucher.inc
index 34f4f77b76..e782594f3f 100644
--- a/etc/inc/voucher.inc
+++ b/etc/inc/voucher.inc
@@ -28,6 +28,7 @@
     
 /* include all configuration functions */
 require_once("config.inc");
+$dirtyfile = "{$g['varrun_path']}/voucher.dirty";
 
 /* 
  *Authenticate a voucher and return the remaining time credit in minutes
@@ -397,8 +398,8 @@ function voucher_save_db_to_config() {
         }
         $rollent['active'] = $db;
     }
-    unlock($voucherlck);
     unlink($dirtyfile);
+    unlock($voucherlck);
     write_config();
     return;
 }
diff --git a/usr/local/www/status_captiveportal_vouchers.php b/usr/local/www/status_captiveportal_vouchers.php
index 8587942434..5599c3748f 100644
--- a/usr/local/www/status_captiveportal_vouchers.php
+++ b/usr/local/www/status_captiveportal_vouchers.php
@@ -53,7 +53,7 @@ foreach($a_roll as $rollent) {
     $minutes = $rollent['minutes'];
     $active_vouchers = file("{$g['vardb_path']}/voucher_active_$roll.db", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
     foreach($active_vouchers as $voucher => $line) {
-        list($timestamp, $minutes) = explode(",", $line);
+        list($voucher,$timestamp, $minutes) = explode(",", $line);
         $remaining = (($timestamp + 60*$minutes) - time());
         if ($remaining > 0) {
             $dbent[0] = $voucher;