summaryrefslogtreecommitdiffstats
path: root/usr/local/www/services_captiveportal_vouchers.php
diff options
context:
space:
mode:
authorbcyrill <cyrill@bannwart.info>2013-01-27 22:57:47 +0100
committerbcyrill <cyrill@bannwart.info>2013-01-27 22:57:47 +0100
commit6c18a8100187726cd8b479dde34902ca55328c83 (patch)
tree93df035b3e28002749ec70c4945c39d7ea7480e1 /usr/local/www/services_captiveportal_vouchers.php
parent9ab4af9074a359ac977fbed06409e5e41cc4cddf (diff)
downloadpfsense-6c18a8100187726cd8b479dde34902ca55328c83.zip
pfsense-6c18a8100187726cd8b479dde34902ca55328c83.tar.gz
Change order of cpzone check
Diffstat (limited to 'usr/local/www/services_captiveportal_vouchers.php')
-rw-r--r--usr/local/www/services_captiveportal_vouchers.php18
1 files changed, 9 insertions, 9 deletions
diff --git a/usr/local/www/services_captiveportal_vouchers.php b/usr/local/www/services_captiveportal_vouchers.php
index d6919f6..3462ad6 100644
--- a/usr/local/www/services_captiveportal_vouchers.php
+++ b/usr/local/www/services_captiveportal_vouchers.php
@@ -36,15 +36,6 @@
##|*MATCH=services_captiveportal_vouchers.php*
##|-PRIV
-$cpzone = $_GET['zone'];
-if (isset($_POST['zone']))
- $cpzone = $_POST['zone'];
-
-if (empty($cpzone) || empty($config['captiveportal'][$cpzone])) {
- header("Location: services_captiveportal_zones.php");
- exit;
-}
-
if ($_POST['postafterlogin'])
$nocsrf= true;
@@ -55,6 +46,15 @@ require("shaper.inc");
require("captiveportal.inc");
require_once("voucher.inc");
+$cpzone = $_GET['zone'];
+if (isset($_POST['zone']))
+ $cpzone = $_POST['zone'];
+
+if (empty($cpzone) || empty($config['captiveportal'][$cpzone])) {
+ header("Location: services_captiveportal_zones.php");
+ exit;
+}
+
if($_REQUEST['generatekey']) {
exec("/usr/local/bin/openssl genrsa 64 > /tmp/key64.private");
exec("/usr/local/bin/openssl rsa -pubout < /tmp/key64.private > /tmp/key64.public");
OpenPOWER on IntegriCloud