From ca3cbda865d9bb0ac220f90263ddafe2eb471d71 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 17 Apr 2015 18:17:02 +0200
Subject: [PATCH] captive portal: avoid redirect loop on status vs. service

Some users may not have service privileges so that creates an
endless redirect loop.  This indicates that there's not much
use of the current ACL in the wild or it is not used in a way
to decouple captive portal administraion and operation.
---
 src/www/status_captiveportal_expire.php        | 5 +++--
 src/www/status_captiveportal_test.php          | 5 +++--
 src/www/status_captiveportal_voucher_rolls.php | 3 ++-
 src/www/status_captiveportal_vouchers.php      | 5 +++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/www/status_captiveportal_expire.php b/src/www/status_captiveportal_expire.php
index 3c908ea19..722954997 100644
--- a/src/www/status_captiveportal_expire.php
+++ b/src/www/status_captiveportal_expire.php
@@ -1,6 +1,7 @@
 <?php
+
 /*
-	Copyright (C) 2014-2015 Deciso B.V.
+    Copyright (C) 2014-2015 Deciso B.V.
     Copyright (C) 2007 Marcel Wiget <mwiget@mac.com>.
     All rights reserved.
 
@@ -38,7 +39,7 @@ if (isset($_POST['zone']))
 	$cpzone = $_POST['zone'];
 
 if (empty($cpzone)) {
-	header("Location: services_captiveportal_zones.php");
+	header("Location: status_captiveportal.php");
 	exit;
 }
 
diff --git a/src/www/status_captiveportal_test.php b/src/www/status_captiveportal_test.php
index 5de9944ff..e4066c858 100644
--- a/src/www/status_captiveportal_test.php
+++ b/src/www/status_captiveportal_test.php
@@ -1,6 +1,7 @@
 <?php
+
 /*
-	Copyright (C) 2014 Deciso B.V.
+    Copyright (C) 2014 Deciso B.V.
     Copyright (C) 2007 Marcel Wiget <mwiget@mac.com>.
     All rights reserved.
 
@@ -38,7 +39,7 @@ if (isset($_POST['zone']))
         $cpzone = $_POST['zone'];
 
 if (empty($cpzone)) {
-        header("Location: services_captiveportal_zones.php");
+        header("Location: status_captiveportal.php");
         exit;
 }
 
diff --git a/src/www/status_captiveportal_voucher_rolls.php b/src/www/status_captiveportal_voucher_rolls.php
index fa6a59a08..cf5090a16 100644
--- a/src/www/status_captiveportal_voucher_rolls.php
+++ b/src/www/status_captiveportal_voucher_rolls.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2007 Marcel Wiget <mwiget@mac.com>.
@@ -38,7 +39,7 @@ if (isset($_POST['zone']))
 	$cpzone = $_POST['zone'];
 
 if (empty($cpzone)) {
-	header("Location: services_captiveportal_zones.php");
+	header("Location: status_captiveportal.php");
 	exit;
 }
 
diff --git a/src/www/status_captiveportal_vouchers.php b/src/www/status_captiveportal_vouchers.php
index 1b2c87435..635b82800 100644
--- a/src/www/status_captiveportal_vouchers.php
+++ b/src/www/status_captiveportal_vouchers.php
@@ -1,6 +1,7 @@
 <?php
+
 /*
-	Copyright (C) 2014-2015 Deciso B.V.
+    Copyright (C) 2014-2015 Deciso B.V.
     Copyright (C) 2007 Marcel Wiget <mwiget@mac.com>.
     All rights reserved.
 
@@ -38,7 +39,7 @@ if (isset($_POST['zone']))
 	$cpzone = $_POST['zone'];
 
 if (empty($cpzone)) {
-	header("Location: services_captiveportal_zones.php");
+	header("Location: status_captiveportal.php");
 	exit;
 }