From db95c2d855b98225c91c23f3d7ea64b18f1db873 Mon Sep 17 00:00:00 2001
From: bechaire <bechairepaulom@fahor.edu.br>
Date: Thu, 25 Jul 2019 17:03:41 -0300
Subject: [PATCH] Only redirects the user to the default page if no specific
 page page was set in the querystring

(cherry picked from commit 57b2f31714a77d86e51e09758e20da372c224826)
---
 src/usr/local/captiveportal/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/usr/local/captiveportal/index.php b/src/usr/local/captiveportal/index.php
index d5459a8097..d9e98201a2 100644
--- a/src/usr/local/captiveportal/index.php
+++ b/src/usr/local/captiveportal/index.php
@@ -93,12 +93,12 @@ if ((!empty($cpsession)) && (! $_POST['logout_id']) && (!empty($cpcfg['page']['l
 	return;
 }
 
-if (!empty($cpcfg['redirurl'])) {
-	$redirurl = $cpcfg['redirurl'];
-} elseif (preg_match("/redirurl=(.*)/", $orig_request, $matches)) {
+if (preg_match("/redirurl=(.*)/", $orig_request, $matches)) {
 	$redirurl = urldecode($matches[1]);
 } elseif ($_REQUEST['redirurl']) {
 	$redirurl = $_REQUEST['redirurl'];
+} elseif (!empty($cpcfg['redirurl'])) {
+	$redirurl = $cpcfg['redirurl'];
 }
 
 $macfilter = !isset($cpcfg['nomacfilter']);