Merge pull request #3441 from phil-davis/required-fields7

6 files changed, 17 insertions, 17 deletions

diff --git a/src/usr/local/www/services_captiveportal.php b/src/usr/local/www/services_captiveportal.php
index ee0c632..54db037 100644
--- a/src/usr/local/www/services_captiveportal.php
+++ b/src/usr/local/www/services_captiveportal.php
@@ -540,7 +540,7 @@ $section->addInput(new Form_Checkbox(
 
 $section->addInput(new Form_Select(
 	'cinterface',
-	'Interfaces',
+	'*Interfaces',
 	explode(",", $pconfig['cinterface']),
 	get_configured_interface_with_descr(),
 	true
@@ -686,7 +686,7 @@ $form->add($section);
 $section = new Form_Section('Authentication');
 $section->addClass('Authentication');
 
-$group = new Form_Group('Authentication method');
+$group = new Form_Group('*Authentication method');
 
 $group->add(new Form_Checkbox(
 	'auth_method',
@@ -721,7 +721,7 @@ $section->addInput(new Form_Checkbox(
 	$pconfig['localauth_priv']
 ));
 
-$group = new Form_Group('RADIUS protocol');
+$group = new Form_Group('*RADIUS protocol');
 $group->addClass("radiusproto");
 
 $group->add(new Form_Checkbox(
@@ -763,7 +763,7 @@ $form->add($section);
 $section = new Form_Section('Primary Authentication Source');
 $section->addClass('Primary');
 
-$group = new Form_Group('Primary RADIUS server');
+$group = new Form_Group('*Primary RADIUS server');
 
 $group->add(new Form_IpAddress(
 	'radiusip',
@@ -1021,7 +1021,7 @@ $section->addInput(new Form_Checkbox(
 
 $section->addInput(new Form_Input(
 	'httpsname',
-	'HTTPS server name',
+	'*HTTPS server name',
 	'text',
 	$pconfig['httpsname']
 ))->setHelp('This name will be used in the form action for the HTTPS POST and should match the Common Name (CN) in the certificate ' .
@@ -1030,7 +1030,7 @@ $section->addInput(new Form_Input(
 
 $section->addInput(new Form_Select(
 	'certref',
-	'SSL Certificate',
+	'*SSL Certificate',
 	$pconfig['certref'],
 	build_cert_list()
 ))->setHelp('If no certificates are defined, one may be defined here: ' . '<a href="system_certmanager.php">System &gt; Cert. Manager</a>');
diff --git a/src/usr/local/www/services_captiveportal_hostname_edit.php b/src/usr/local/www/services_captiveportal_hostname_edit.php
index dbf3e25..28a3de7 100644
--- a/src/usr/local/www/services_captiveportal_hostname_edit.php
+++ b/src/usr/local/www/services_captiveportal_hostname_edit.php
@@ -174,7 +174,7 @@ $section = new Form_Section('Captive Portal Hostname Settings');
 
 $section->addInput(new Form_Select(
 	'dir',
-	'Direction',
+	'*Direction',
 	strtolower($pconfig['dir']),
 	build_dir_list()
 ))->setHelp('Use "From" to always allow a Hostname through the captive portal (without authentication). ' .
@@ -182,7 +182,7 @@ $section->addInput(new Form_Select(
 
 $section->addInput(new Form_Input(
 	'hostname',
-	'Hostname',
+	'*Hostname',
 	'text',
 	$pconfig['hostname']
 ));
diff --git a/src/usr/local/www/services_captiveportal_ip_edit.php b/src/usr/local/www/services_captiveportal_ip_edit.php
index 4e398db..9bf83d6 100644
--- a/src/usr/local/www/services_captiveportal_ip_edit.php
+++ b/src/usr/local/www/services_captiveportal_ip_edit.php
@@ -221,7 +221,7 @@ $section = new Form_Section('Edit Captive Portal IP Rule');
 
 $section->addInput(new Form_IpAddress(
 	'ip',
-	'IP Address',
+	'*IP Address',
 	$pconfig['ip']
 ))->addMask(sn, $pconfig['sn'], 32);
 
@@ -234,7 +234,7 @@ $section->addInput(new Form_Input(
 
 $section->addInput(new Form_Select(
 	'dir',
-	'Direction',
+	'*Direction',
 	strtolower($pconfig['dir']),
 	build_dir_list()
 ))->setHelp('Use "From" to always allow access to an address through the captive portal (without authentication). ' .
diff --git a/src/usr/local/www/services_captiveportal_mac_edit.php b/src/usr/local/www/services_captiveportal_mac_edit.php
index 50e45d7..4cd30a3 100644
--- a/src/usr/local/www/services_captiveportal_mac_edit.php
+++ b/src/usr/local/www/services_captiveportal_mac_edit.php
@@ -200,7 +200,7 @@ $section = new Form_Section('Edit MAC Address Rules');
 
 $section->addInput(new Form_Select(
 	'action',
-	'Action',
+	'*Action',
 	strtolower($pconfig['action']),
 	array('pass' => gettext('Pass'), 'block' => gettext('Block'))
 ))->setHelp('Choose what to do with packets coming from this MAC address.');
@@ -222,7 +222,7 @@ $btnmymac = new Form_Button(
 
 $btnmymac->setAttribute('type','button')->removeClass('btn-primary')->addClass('btn-success btn-sm');
 
-$group = new Form_Group('MAC Address');
+$group = new Form_Group('*MAC Address');
 $group->add($macaddress);
 $group->add($btnmymac);
 $group->setHelp('6 hex octets separated by colons');
diff --git a/src/usr/local/www/services_captiveportal_vouchers_edit.php b/src/usr/local/www/services_captiveportal_vouchers_edit.php
index 100cc78..87afc48 100644
--- a/src/usr/local/www/services_captiveportal_vouchers_edit.php
+++ b/src/usr/local/www/services_captiveportal_vouchers_edit.php
@@ -89,7 +89,7 @@ if ($_POST) {
 
 	/* input validation */
 	$reqdfields = explode(" ", "number count minutes");
-	$reqdfieldsn = array(gettext("Number"), gettext("Count"), gettext("minutes"));
+	$reqdfieldsn = array(gettext("Roll #"), gettext("Count"), gettext("Minutes per ticket"));
 
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 
@@ -182,21 +182,21 @@ $section = new Form_Section('Voucher Rolls');
 
 $section->addInput(new Form_Input(
 	'number',
-	'Roll #',
+	'*Roll #',
 	'text',
 	$pconfig['number']
 ))->setHelp('Enter the Roll# (0..%d) found on top of the generated/printed vouchers', [$maxnumber]);
 
 $section->addInput(new Form_Input(
 	'minutes',
-	'Minutes per ticket',
+	'*Minutes per ticket',
 	'text',
 	$pconfig['minutes']
 ))->setHelp('Defines the time in minutes that a user is allowed access. The clock starts ticking the first time a voucher is used for authentication.');
 
 $section->addInput(new Form_Input(
 	'count',
-	'Count',
+	'*Count',
 	'text',
 	$pconfig['count']
 ))->setHelp('Enter the number of vouchers (1..%d) found on top of the generated/printed vouchers. WARNING: Changing this number for an existing Roll will mark all vouchers as unused again', [$maxcount]);
diff --git a/src/usr/local/www/services_captiveportal_zones_edit.php b/src/usr/local/www/services_captiveportal_zones_edit.php
index 2aa2dfe..2d71251 100644
--- a/src/usr/local/www/services_captiveportal_zones_edit.php
+++ b/src/usr/local/www/services_captiveportal_zones_edit.php
@@ -87,7 +87,7 @@ $section = new Form_Section('Add Captive Portal Zone');
 
 $section->addInput(new Form_Input(
 	'zone',
-	'Zone name'
+	'*Zone name'
 ))->setPattern('^[A-Za-z_][0-9A-Za-z_]+')->setHelp('Zone name. Can only contain letters, digits, and underscores (_) and may not start with a digit.');
 
 $section->addInput(new Form_Input(