From d0dab7f6d587d7bc3d16aa6496bdaebb3bbe9816 Mon Sep 17 00:00:00 2001 From: jim-p Date: Wed, 14 Jun 2017 10:28:21 -0400 Subject: [PATCH] Restore the captive portal feature to view the captive portal page directly from the portal web server. Add this as an additional button so both methods are possible. Fixes #7646 --- src/usr/local/www/services_captiveportal.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/usr/local/www/services_captiveportal.php b/src/usr/local/www/services_captiveportal.php index 4b52f1d951..dab442e433 100644 --- a/src/usr/local/www/services_captiveportal.php +++ b/src/usr/local/www/services_captiveportal.php @@ -1126,9 +1126,16 @@ if ($pconfig['httpslogin_enable']) { if ($pconfig['page']['htmltext']) { $group = new Form_Group('Current Portal Page'); + $group->add(new Form_Button( + 'btnliveview', + 'Live View', + $href, + 'fa-file-text-o' + ))->addClass('btn btn-info btn-xs')->setAttribute("target", "_blank"); + $group->add(new Form_Button( 'btnview', - 'View', + 'View Page Contents', '?zone=' . $cpzone . '&act=viewhtml', 'fa-file-text-o' ))->addClass('btn btn-info btn-xs')->setAttribute("target", "_blank"); @@ -1162,7 +1169,7 @@ if ($pconfig['page']['errtext']) { $group = new Form_Group('Current Auth Error Page'); $group->add(new Form_Button( 'btnview', - 'View', + 'View Page Contents', '?zone=' . $cpzone . '&act=viewerrhtml', 'fa-file-text-o' ))->addClass('btn btn-info btn-xs')->setAttribute("target", "_blank"); @@ -1194,7 +1201,7 @@ if ($pconfig['page']['logouttext']) { $group = new Form_Group('Current Logout Page'); $group->add(new Form_Button( 'btnview', - 'View', + 'View Page Contents', '?zone=' . $cpzone . '&act=viewlogouthtml', 'fa-file-text-o' ))->addClass('btn btn-info btn-xs')->setAttribute("target", "_blank");