diff options
author | Phil Davis <phil.davis@inf.org> | 2017-01-25 12:51:17 +0545 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2017-01-30 10:26:10 -0200 |
commit | a6caa27eb615dbfb298553249fecb8f2734c9339 (patch) | |
tree | bf67b07404d2329a4f0860daa14191e8a2e00322 /src | |
parent | 57965f9b79ed0971cf2bf17161d7c0ec7af9f937 (diff) | |
download | pfsense-a6caa27eb615dbfb298553249fecb8f2734c9339.zip pfsense-a6caa27eb615dbfb298553249fecb8f2734c9339.tar.gz |
Required fields for Captive Portal
(cherry picked from commit c06865be6de6b164d06ee9bb1768dfe6829d783c)
Diffstat (limited to 'src')
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 27747d9..f58dc0a 100644 --- a/src/usr/local/www/services_captiveportal.php +++ b/src/usr/local/www/services_captiveportal.php @@ -583,7 +583,7 @@ $section->addInput(new Form_Checkbox( $section->addInput(new Form_Select( 'cinterface', - 'Interfaces', + '*Interfaces', explode(",", $pconfig['cinterface']), get_configured_interface_with_descr(), true @@ -729,7 +729,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', @@ -764,7 +764,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( @@ -806,7 +806,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', @@ -1064,7 +1064,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 ' . @@ -1073,7 +1073,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 > 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 3dbe419..6b2b9d2 100644 --- a/src/usr/local/www/services_captiveportal_hostname_edit.php +++ b/src/usr/local/www/services_captiveportal_hostname_edit.php @@ -205,7 +205,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). ' . @@ -213,7 +213,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 c1508de..196c0a0 100644 --- a/src/usr/local/www/services_captiveportal_ip_edit.php +++ b/src/usr/local/www/services_captiveportal_ip_edit.php @@ -249,7 +249,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); @@ -262,7 +262,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 0261d23..57eb0ea 100644 --- a/src/usr/local/www/services_captiveportal_mac_edit.php +++ b/src/usr/local/www/services_captiveportal_mac_edit.php @@ -231,7 +231,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.'); @@ -253,7 +253,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 f3e3f73..9572935 100644 --- a/src/usr/local/www/services_captiveportal_vouchers_edit.php +++ b/src/usr/local/www/services_captiveportal_vouchers_edit.php @@ -120,7 +120,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); @@ -213,21 +213,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 16e8d22..b84a1f8 100644 --- a/src/usr/local/www/services_captiveportal_zones_edit.php +++ b/src/usr/local/www/services_captiveportal_zones_edit.php @@ -118,7 +118,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( |