Add page to allow manual vouchers expiration

5 files changed, 107 insertions, 0 deletions

diff --git a/usr/local/www/status_captiveportal.php b/usr/local/www/status_captiveportal.php
index 942cd77..2e303b6 100755
--- a/usr/local/www/status_captiveportal.php
+++ b/usr/local/www/status_captiveportal.php
@@ -107,6 +107,7 @@ if (!empty($cpzone)) {
         $tab_array[] = array(gettext("Active Vouchers"), false, "status_captiveportal_vouchers.php?zone={$cpzone}");
         $tab_array[] = array(gettext("Voucher Rolls"), false, "status_captiveportal_voucher_rolls.php?zone={$cpzone}");
         $tab_array[] = array(gettext("Test Vouchers"), false, "status_captiveportal_test.php?zone={$cpzone}");
+	$tab_array[] = array(gettext("Expire Vouchers"), false, "status_captiveportal_expire.php?zone={$cpzone}");
         display_top_tabs($tab_array);
 ?> 
 </td></tr>
diff --git a/usr/local/www/status_captiveportal_expire.php b/usr/local/www/status_captiveportal_expire.php
new file mode 100644
index 0000000..8d19832
--- /dev/null
+++ b/usr/local/www/status_captiveportal_expire.php
@@ -0,0 +1,103 @@
+<?php
+/*
+    Copyright (C) 2007 Marcel Wiget <mwiget@mac.com>.
+    All rights reserved.
+    
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+    
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+    
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+*/
+/*	
+	pfSense_MODULE:	captiveportal
+*/
+
+##|+PRIV
+##|*IDENT=page-status-captiveportal-expire
+##|*NAME=Status: Captive portal Expire Vouchers page
+##|*DESCR=Allow access to the 'Status: Captive portal Expire Vouchers' page.
+##|*MATCH=status_captiveportal_expire.php*
+##|-PRIV
+
+require("guiconfig.inc");
+require("functions.inc");
+require("filter.inc");
+require("shaper.inc");
+require("captiveportal.inc");
+require_once("voucher.inc");
+
+$pgtitle = array(gettext("Status"), gettext("Captive portal"), gettext("Expire Vouchers"));
+
+include("head.inc");
+include("fbegin.inc");
+?>
+
+<form action="status_captiveportal_expire.php" method="post" enctype="multipart/form-data" name="iform" id="iform">
+<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="tab pane">
+<tr><td class="tabnavtbl">
+<?php 
+	$tab_array = array();
+        $tab_array[] = array(gettext("Active Users"), false, "status_captiveportal.php");
+        $tab_array[] = array(gettext("Active Vouchers"), false, "status_captiveportal_vouchers.php");
+        $tab_array[] = array(gettext("Voucher Rolls"), false, "status_captiveportal_voucher_rolls.php");
+        $tab_array[] = array(gettext("Test Vouchers"), false, "status_captiveportal_test.php");
+        $tab_array[] = array(gettext("Expire Vouchers"), true, "status_captiveportal_expire.php");
+        display_top_tabs($tab_array);
+?> 
+</td></tr>
+<tr>
+<td class="tabcont">
+
+<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="content pane">
+  <tr>
+    <td valign="top" class="vncellreq"><?=gettext("Voucher(s)"); ?></td>
+    <td class="vtable">
+    <textarea name="vouchers" cols="65" rows="3" type="text" id="vouchers" class="formpre"><?=htmlspecialchars($_POST['vouchers']);?></textarea>
+    <br>
+<?=gettext("Enter multiple vouchers separated by space or newline. All valid vouchers will be marked as expired"); ?>.</td>      
+  </tr>      
+  <tr>
+    <td width="22%" valign="top">&nbsp;</td>
+    <td width="78%">
+    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Submit"); ?>">
+    </td>
+  </tr>
+</table>
+</td></tr></table>
+</form>
+<p>
+<?php
+if ($_POST) {
+    if ($_POST['vouchers']) {
+        $result = voucher_expire($_POST['vouchers']);
+        echo "<p><table border=\"0\" cellspacing=\"0\" cellpadding=\"4\" width=\"100%\">\n";
+        if ( $result) {
+            echo "<tr><td bgcolor=\"#D9DEE8\"><img src=\"/themes/{$g['theme']}/images/icons/icon_pass.gif\"></td>";
+            echo "<td bgcolor=\"#D9DEE8\">Success</td></tr>";
+        } else {
+            echo "<tr><td bgcolor=\"#FFD9D1\"><img src=\"/themes/{$g['theme']}/images/icons/icon_block.gif\"></td>";
+            echo "<td bgcolor=\"#FFD9D1\">Error</td></tr>";
+        }
+        echo "</table></p>";
+    }
+}
+
+include("fend.inc");
+?>
+
diff --git a/usr/local/www/status_captiveportal_test.php b/usr/local/www/status_captiveportal_test.php
index c53227e..1a80446 100644
--- a/usr/local/www/status_captiveportal_test.php
+++ b/usr/local/www/status_captiveportal_test.php
@@ -72,6 +72,7 @@ include("fbegin.inc");
         $tab_array[] = array(gettext("Active Vouchers"), false, "status_captiveportal_vouchers.php?zone={$cpzone}");
         $tab_array[] = array(gettext("Voucher Rolls"), false, "status_captiveportal_voucher_rolls.php?zone={$cpzone}");
         $tab_array[] = array(gettext("Test Vouchers"), true, "status_captiveportal_test.php?zone={$cpzone}");
+	$tab_array[] = array(gettext("Expire Vouchers"), false, "status_captiveportal_expire.php?zone={$cpzone}");
         display_top_tabs($tab_array);
 ?> 
 </td></tr>
diff --git a/usr/local/www/status_captiveportal_voucher_rolls.php b/usr/local/www/status_captiveportal_voucher_rolls.php
index 33eae70..7ad778f 100644
--- a/usr/local/www/status_captiveportal_voucher_rolls.php
+++ b/usr/local/www/status_captiveportal_voucher_rolls.php
@@ -75,6 +75,7 @@ include("fbegin.inc");
         $tab_array[] = array(gettext("Active Vouchers"), false, "status_captiveportal_vouchers.php?zone={$cpzone}");
         $tab_array[] = array(gettext("Voucher Rolls"), true, "status_captiveportal_voucher_rolls.php?zone={$cpzone}");
         $tab_array[] = array(gettext("Test Vouchers"), false, "status_captiveportal_test.php?zone={$cpzone}");
+	$tab_array[] = array(gettext("Expire Vouchers"), false, "status_captiveportal_expire.php?zone={$cpzone}");
         display_top_tabs($tab_array);
 ?> 
 </td></tr>
diff --git a/usr/local/www/status_captiveportal_vouchers.php b/usr/local/www/status_captiveportal_vouchers.php
index 82daedf..e8c8ca9 100644
--- a/usr/local/www/status_captiveportal_vouchers.php
+++ b/usr/local/www/status_captiveportal_vouchers.php
@@ -105,6 +105,7 @@ include("fbegin.inc");
         $tab_array[] = array(gettext("Active Vouchers"), true, "status_captiveportal_vouchers.php?zone={$cpzone}");
         $tab_array[] = array(gettext("Voucher Rolls"), false, "status_captiveportal_voucher_rolls.php?zone={$cpzone}");
         $tab_array[] = array(gettext("Test Vouchers"), false, "status_captiveportal_test.php?zone={$cpzone}");
+	$tab_array[] = array(gettext("Expire Vouchers"), false, "status_captiveportal_expire.php?zone={$cpzone}");
         display_top_tabs($tab_array);
 ?> 
 </td></tr>