captive portal: forwardport to adapt to backported changes...

src/opnsense/mvc/app/models/OPNsense/CaptivePortal/Menu/Menu.xml

@@ -3,7 +3,7 @@
     <Services order="4" cssClass="glyphicon glyphicon-cog">
         <CaptivePortal VisibleName="Captive Portal" cssClass="fa fa-paper-plane-o">
             <Settings url="/services_captiveportal_zones.php">
-                <Edit url="/services_captiveportal.php?zone=*"/>
+                <Edit url="/services_captiveportal.php*"/>
                 <Edit2 url="/services_captiveportal_zones_edit.php*"/>
                 <IP url="/services_captiveportal_ip.php?zone=*"/>
                 <IP_edit url="/services_captiveportal_ip_edit.php?zone=*"/>
@@ -14,10 +14,11 @@
                 </Settings>
             <Status url="/status_captiveportal.php">
                 <All url="/status_captiveportal.php*"/>
-		<Voucher url="/status_captiveportal_vouchers.php*"/>
-		<Rolls url="/status_captiveportal_voucher_rolls.php*"/>
-		<Test url="/status_captiveportal_test.php*"/>
-		<Expire url="/status_captiveportal_expire.php*"/>
+                <Voucher url="/status_captiveportal_vouchers.php*"/>
+                <Edit url="services_captiveportal_vouchers_edit.php*"/>
+                <Rolls url="/status_captiveportal_voucher_rolls.php*"/>
+                <Test url="/status_captiveportal_test.php*"/>
+                <Expire url="/status_captiveportal_expire.php*"/>
             </Status>
             <Log order="99"  VisibleName="Log File" url="/diag_logs_auth.php"/>
         </CaptivePortal>

src/www/services_captiveportal.php

@@ -55,7 +55,6 @@ if (!is_array($config['captiveportal']))
 	$config['captiveportal'] = array();
 $a_cp =& $config['captiveportal'];
 
-$pgtitle = array(gettext("Services"),gettext("Captive portal"), $a_cp[$cpzone]['zone']);
 $shortcut_section = "captiveportal";
 
 if ($_GET['act'] == "viewhtml") {

src/www/services_captiveportal_filemanager.php

@@ -62,7 +62,6 @@ if (!is_array($config['captiveportal'])) {
 }
 $a_cp =& $config['captiveportal'];
 
-$pgtitle = array(gettext("Services"),gettext("Captive portal"), $a_cp[$cpzone]['zone']);
 $shortcut_section = "captiveportal";
 
 if (!is_array($a_cp[$cpzone]['element'])) {

src/www/services_captiveportal_ip.php

@@ -46,7 +46,6 @@ if (!is_array($config['captiveportal'])) {
 }
 $a_cp =& $config['captiveportal'];
 
-$pgtitle = array(gettext("Services"),gettext("Captive portal"), $a_cp[$cpzone]['zone']);
 $shortcut_section = "captiveportal";
 
 if ($_GET['act'] == "del") {

src/www/services_captiveportal_ip_edit.php

@@ -45,7 +45,6 @@ function allowedips_sort()
     usort($config['captiveportal'][$cpzone]['allowedip'], "allowedipscmp");
 }
 
-$pgtitle = array(gettext("Services"),gettext("Captive portal"),gettext("Edit allowed IP address"));
 $shortcut_section = "captiveportal";
 
 $cpzone = $_GET['zone'];

src/www/services_captiveportal_mac.php

@@ -49,8 +49,6 @@ if (!is_array($config['captiveportal'])) {
     $config['captiveportal'] = array();
 }
 $a_cp =& $config['captiveportal'];
-
-$pgtitle = array(gettext("Services"),gettext("Captive portal"), $a_cp[$cpzone]['zone']);
 $shortcut_section = "captiveportal";
 
 if ($_POST) {

src/www/services_captiveportal_mac_edit.php

@@ -46,7 +46,6 @@ function passthrumacs_sort()
 global $cpzone;
 global $cpzoneid;
 
-$pgtitle = array(gettext("Services"),gettext("Captive portal"),gettext("Edit MAC address rules"));
 $shortcut_section = "captiveportal";
 
 $cpzone = $_GET['zone'];

src/www/services_captiveportal_vouchers.php

@@ -90,8 +90,6 @@ if (empty($a_cp[$cpzone])) {
     exit;
 }
 
-
-$pgtitle = array(gettext("Services"), gettext("Captive portal"), gettext("Vouchers"), $a_cp[$cpzone]['zone']);
 $shortcut_section = "captiveportal-vouchers";
 
 if (!is_array($config['voucher'][$cpzone]['roll'])) {

src/www/services_captiveportal_vouchers_edit.php

@@ -30,7 +30,6 @@ require_once("guiconfig.inc");
 require_once("captiveportal.inc");
 require_once("services.inc");
 
-$pgtitle = array(gettext("Services"), gettext("Captive portal"), gettext("Edit Voucher Rolls"));
 $shortcut_section = "captiveportal-vouchers";
 
 $cpzone = $_GET['zone'];

src/www/services_captiveportal_zones.php

@@ -55,7 +55,6 @@ if ($_GET['act'] == "del" && !empty($_GET['zone'])) {
     }
 }
 
-$pgtitle = array(gettext("Captiveportal"),gettext("Zones"));
 $shortcut_section = "captiveportal";
 include("head.inc");
 

src/www/services_captiveportal_zones_edit.php

@@ -31,7 +31,6 @@ require_once("captiveportal.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
 
-$pgtitle = array(gettext("Services"),gettext("Captive portal"),gettext("Edit Zones"));
 $shortcut_section = "captiveportal";
 
 if (!is_array($config['captiveportal'])) {

src/www/status_captiveportal.php

@@ -43,7 +43,6 @@ if ($_GET['act'] == "del" && !empty($cpzone)) {
 	exit;
 }
 
-$pgtitle = array(gettext("Status: Captive portal"));
 $shortcut_section = "captiveportal";
 
 if (!is_array($config['captiveportal']))

src/www/status_captiveportal_expire.php

@@ -45,8 +45,6 @@ if (!is_array($config['captiveportal'])) {
 }
 $a_cp =& $config['captiveportal'];
 
-$pgtitle = array(gettext("Status"), gettext("Captive portal"), gettext("Expire Vouchers"), $a_cp[$cpzone]['zone']);
-
 include("head.inc");
 ?>
 

src/www/status_captiveportal_test.php

@@ -45,8 +45,6 @@ if (!is_array($config['captiveportal'])) {
         $config['captiveportal'] = array();
 }
 $a_cp =& $config['captiveportal'];
-
-$pgtitle = array(gettext("Status"), gettext("Captive portal"), gettext("Test Vouchers"), $a_cp[$cpzone]['zone']);
 $shortcut_section = "captiveportal-vouchers";
 
 include("head.inc");

src/www/status_captiveportal_voucher_rolls.php

@@ -66,7 +66,6 @@ if (!is_array($config['captiveportal'])) {
     $config['captiveportal'] = array();
 }
 $a_cp =& $config['captiveportal'];
-$pgtitle = array(gettext("Status"), gettext("Captive portal"), gettext("Voucher Rolls"), $a_cp[$cpzone]['zone']);
 $shortcut_section = "captiveportal-vouchers";
 
 if (!is_array($config['voucher'][$cpzone]['roll'])) {

src/www/status_captiveportal_vouchers.php

@@ -45,7 +45,6 @@ if (!is_array($config['captiveportal'])) {
     $config['captiveportal'] = array();
 }
 $a_cp =& $config['captiveportal'];
-$pgtitle = array(gettext("Status"), gettext("Captive portal"), gettext("Vouchers"), $a_cp[$cpzone]['zone']);
 $shortcut_section = "captiveportal-vouchers";
 
 function clientcmp($a, $b)