diff options
Diffstat (limited to 'src/usr/local/www')
-rw-r--r-- | src/usr/local/www/system.php | 8 | ||||
-rw-r--r-- | src/usr/local/www/system_advanced_sysctl.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/system_authservers.php | 48 | ||||
-rw-r--r-- | src/usr/local/www/system_camanager.php | 26 | ||||
-rw-r--r-- | src/usr/local/www/system_certmanager.php | 54 | ||||
-rw-r--r-- | src/usr/local/www/system_crlmanager.php | 12 | ||||
-rw-r--r-- | src/usr/local/www/system_gateway_groups_edit.php | 8 | ||||
-rw-r--r-- | src/usr/local/www/system_gateways_edit.php | 6 | ||||
-rw-r--r-- | src/usr/local/www/system_groupmanager.php | 6 | ||||
-rw-r--r-- | src/usr/local/www/system_groupmanager_addprivs.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/system_routes_edit.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/system_update_settings.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/system_usermanager.php | 10 | ||||
-rw-r--r-- | src/usr/local/www/system_usermanager_addprivs.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/system_usermanager_passwordmg.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/system_usermanager_settings.php | 2 |
16 files changed, 111 insertions, 87 deletions
diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php index b754f11..e0604df 100644 --- a/src/usr/local/www/system.php +++ b/src/usr/local/www/system.php @@ -460,7 +460,7 @@ $form = new Form; $section = new Form_Section('System'); $section->addInput(new Form_Input( 'hostname', - 'Hostname', + '*Hostname', 'text', $pconfig['hostname'], ['placeholder' => 'pfSense'] @@ -468,7 +468,7 @@ $section->addInput(new Form_Input( $section->addInput(new Form_Input( 'domain', - 'Domain', + '*Domain', 'text', $pconfig['domain'], ['placeholder' => 'mycorp.com, home, office, private, etc.'] @@ -576,7 +576,7 @@ $section = new Form_Section('Localization'); $section->addInput(new Form_Select( 'timezone', - 'Timezone', + '*Timezone', $pconfig['timezone'], array_combine($timezonelist, $timezonedesc) ))->setHelp('Select the timezone or location within the timezone to be used by this system. '. @@ -592,7 +592,7 @@ $section->addInput(new Form_Input( $section->addInput(new Form_Select( 'language', - 'Language', + '*Language', $pconfig['language'], get_locale_list() ))->setHelp('Choose a language for the webConfigurator'); diff --git a/src/usr/local/www/system_advanced_sysctl.php b/src/usr/local/www/system_advanced_sysctl.php index 01dbb87..e482858 100644 --- a/src/usr/local/www/system_advanced_sysctl.php +++ b/src/usr/local/www/system_advanced_sysctl.php @@ -233,14 +233,14 @@ if ($act != "edit"): ?> $section->addInput(new Form_Input( 'tunable', - 'Tunable', + '*Tunable', 'text', $pconfig['tunable'] ))->setWidth(4); $section->addInput(new Form_Input( 'value', - 'Value', + '*Value', 'text', $pconfig['value'] ))->setWidth(4); diff --git a/src/usr/local/www/system_authservers.php b/src/usr/local/www/system_authservers.php index 84f4f2a..528104e 100644 --- a/src/usr/local/www/system_authservers.php +++ b/src/usr/local/www/system_authservers.php @@ -515,14 +515,14 @@ $section = new Form_Section('Server Settings'); $section->addInput($input = new Form_Input( 'name', - 'Descriptive name', + '*Descriptive name', 'text', $pconfig['name'] )); $section->addInput($input = new Form_Select( 'type', - 'Type', + '*Type', $pconfig['type'], $auth_server_types ))->toggles(); @@ -538,7 +538,7 @@ if (!isset($pconfig['type']) || $pconfig['type'] == 'ldap') $section->addInput(new Form_Input( 'ldap_host', - 'Hostname or IP address', + '*Hostname or IP address', 'text', $pconfig['ldap_host'] ))->setHelp('NOTE: When using SSL or STARTTLS, this hostname MUST match the Common Name '. @@ -546,14 +546,14 @@ $section->addInput(new Form_Input( $section->addInput(new Form_Input( 'ldap_port', - 'Port value', + '*Port value', 'number', $pconfig['ldap_port'] )); $section->addInput(new Form_Select( 'ldap_urltype', - 'Transport', + '*Transport', $pconfig['ldap_urltype'], array_combine(array_keys($ldap_urltypes), array_keys($ldap_urltypes)) )); @@ -583,7 +583,7 @@ else $section->addInput(new Form_Select( 'ldap_protver', - 'Protocol version', + '*Protocol version', $pconfig['ldap_protver'], array_combine($ldap_protvers, $ldap_protvers) )); @@ -600,7 +600,7 @@ $group = new Form_Group('Search scope'); $SSF = new Form_Select( 'ldap_scope', - 'Level', + '*Level', $pconfig['ldap_scope'], $ldap_scopes ); @@ -621,7 +621,7 @@ $section->addInput(new Form_StaticText( $group = new Form_Group('Authentication containers'); $group->add(new Form_Input( 'ldapauthcontainers', - 'Containers', + '*Containers', 'text', $pconfig['ldap_authcn'] ))->setHelp('Note: Semi-Colon separated. This will be prepended to the search '. @@ -663,7 +663,7 @@ $section->addInput(new Form_Checkbox( $pconfig['ldap_anon'] )); -$group = new Form_Group('Bind credentials'); +$group = new Form_Group('*Bind credentials'); $group->addClass('ldapanon'); $group->add(new Form_Input( @@ -698,21 +698,21 @@ if (!isset($id)) { $section->addInput(new Form_Input( 'ldap_attr_user', - 'User naming attribute', + '*User naming attribute', 'text', $pconfig['ldap_attr_user'] )); $section->addInput(new Form_Input( 'ldap_attr_group', - 'Group naming attribute', + '*Group naming attribute', 'text', $pconfig['ldap_attr_group'] )); $section->addInput(new Form_Input( 'ldap_attr_member', - 'Group member attribute', + '*Group member attribute', 'text', $pconfig['ldap_attr_member'] )); @@ -758,21 +758,21 @@ $section->addClass('toggle-radius collapse'); $section->addInput(new Form_Input( 'radius_host', - 'Hostname or IP address', + '*Hostname or IP address', 'text', $pconfig['radius_host'] )); $section->addInput(new Form_Input( 'radius_secret', - 'Shared Secret', + '*Shared Secret', 'password', $pconfig['radius_secret'] )); $section->addInput(new Form_Select( 'radius_srvcs', - 'Services offered', + '*Services offered', $pconfig['radius_srvcs'], $radius_srvcs )); @@ -919,6 +919,19 @@ events.push(function() { $('#ldap_port').val('389'); } + function set_required_port_fields() { + if (document.getElementById("radius_srvcs").value == 'auth') { + setRequired('radius_auth_port', true); + setRequired('radius_acct_port', false); + } else if (document.getElementById("radius_srvcs").value == 'acct') { + setRequired('radius_auth_port', false); + setRequired('radius_acct_port', true); + } else { // both + setRequired('radius_auth_port', true); + setRequired('radius_acct_port', true); + } + } + // Hides all elements of the specified class. This will usually be a section function hideClass(s_class, hide) { if (hide) @@ -953,6 +966,7 @@ events.push(function() { hideClass('ldapanon', $('#ldap_anon').prop('checked')); hideClass('extended', !$('#ldap_extended_enabled').prop('checked')); + set_required_port_fields(); if ($('#ldap_port').val() == "") set_ldap_port(); @@ -994,6 +1008,10 @@ events.push(function() { hideClass('extended', !this.checked); }); + $('#radius_srvcs').on('change', function() { + set_required_port_fields(); + }); + }); //]]> </script> diff --git a/src/usr/local/www/system_camanager.php b/src/usr/local/www/system_camanager.php index b935f3c..d20d14d 100644 --- a/src/usr/local/www/system_camanager.php +++ b/src/usr/local/www/system_camanager.php @@ -490,7 +490,7 @@ $section = new Form_Section('Create / Edit CA'); $section->addInput(new Form_Input( 'descr', - 'Descriptive name', + '*Descriptive name', 'text', $pconfig['descr'] )); @@ -498,7 +498,7 @@ $section->addInput(new Form_Input( if (!isset($id) || $act == "edit") { $section->addInput(new Form_Select( 'method', - 'Method', + '*Method', $pconfig['method'], $ca_methods ))->toggles(); @@ -511,7 +511,7 @@ $section->addClass('toggle-existing collapse'); $section->addInput(new Form_Textarea( 'cert', - 'Certificate data', + '*Certificate data', $pconfig['cert'] ))->setHelp('Paste a certificate in X.509 PEM format here.'); @@ -545,7 +545,7 @@ foreach ($a_ca as $ca) { $allCas[ $ca['refid'] ] = $ca['descr']; } -$group = new Form_Group('Signing Certificate Authority'); +$group = new Form_Group('*Signing Certificate Authority'); $group->addClass('toggle-intermediate', 'collapse'); $group->add(new Form_Select( 'caref', @@ -557,14 +557,14 @@ $section->add($group); $section->addInput(new Form_Select( 'keylen', - 'Key length (bits)', + '*Key length (bits)', $pconfig['keylen'], array_combine($ca_keylens, $ca_keylens) )); $section->addInput(new Form_Select( 'digest_alg', - 'Digest Algorithm', + '*Digest Algorithm', $pconfig['digest_alg'], array_combine($openssl_digest_algs, $openssl_digest_algs) ))->setHelp('NOTE: It is recommended to use an algorithm stronger than SHA1 '. @@ -572,21 +572,21 @@ $section->addInput(new Form_Select( $section->addInput(new Form_Input( 'lifetime', - 'Lifetime (days)', + '*Lifetime (days)', 'number', $pconfig['lifetime'] )); $section->addInput(new Form_Select( 'dn_country', - 'Country Code', + '*Country Code', $pconfig['dn_country'], $dn_cc )); $section->addInput(new Form_Input( 'dn_state', - 'State or Province', + '*State or Province', 'text', $pconfig['dn_state'], ['placeholder' => 'e.g. Texas'] @@ -594,7 +594,7 @@ $section->addInput(new Form_Input( $section->addInput(new Form_Input( 'dn_city', - 'City', + '*City', 'text', $pconfig['dn_city'], ['placeholder' => 'e.g. Austin'] @@ -602,7 +602,7 @@ $section->addInput(new Form_Input( $section->addInput(new Form_Input( 'dn_organization', - 'Organization', + '*Organization', 'text', $pconfig['dn_organization'], ['placeholder' => 'e.g. My Company Inc'] @@ -618,7 +618,7 @@ $section->addInput(new Form_Input( $section->addInput(new Form_Input( 'dn_email', - 'Email Address', + '*Email Address', 'email', $pconfig['dn_email'], ['placeholder' => 'e.g. admin@mycompany.com'] @@ -626,7 +626,7 @@ $section->addInput(new Form_Input( $section->addInput(new Form_Input( 'dn_commonname', - 'Common Name', + '*Common Name', 'text', $pconfig['dn_commonname'], ['placeholder' => 'e.g. internal-ca'] diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php index 9e4b062..df6f056 100644 --- a/src/usr/local/www/system_certmanager.php +++ b/src/usr/local/www/system_certmanager.php @@ -606,7 +606,7 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { if (!isset($id)) { $section->addInput(new Form_Select( 'method', - 'Method', + '*Method', $pconfig['method'], $cert_methods ))->toggles(); @@ -614,7 +614,7 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { $section->addInput(new Form_Input( 'descr', - 'Descriptive name', + '*Descriptive name', 'text', ($a_user && empty($pconfig['descr'])) ? $a_user[$userid]['name'] : $pconfig['descr'] ))->addClass('toggle-existing'); @@ -625,13 +625,13 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { $section->addInput(new Form_Textarea( 'cert', - 'Certificate data', + '*Certificate data', $pconfig['cert'] ))->setHelp('Paste a certificate in X.509 PEM format here.'); $section->addInput(new Form_Textarea( 'key', - 'Private key data', + '*Private key data', $pconfig['key'] ))->setHelp('Paste a private key in X.509 PEM format here.'); @@ -641,7 +641,7 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { if (!$internal_ca_count) { $section->addInput(new Form_StaticText( - 'Certificate authority', + '*Certificate authority', gettext('No internal Certificate Authorities have been defined. '). gettext('An internal CA must be defined in order to create an internal certificate. '). '<a href="system_camanager.php?act=new&method=internal"> '. gettext("Create") .'</a>'. @@ -659,7 +659,7 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { $section->addInput(new Form_Select( 'caref', - 'Certificate authority', + '*Certificate authority', $pconfig['caref'], $allCas )); @@ -667,14 +667,14 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { $section->addInput(new Form_Select( 'keylen', - 'Key length', + '*Key length', $pconfig['keylen'], array_combine($cert_keylens, $cert_keylens) )); $section->addInput(new Form_Select( 'digest_alg', - 'Digest Algorithm', + '*Digest Algorithm', $pconfig['digest_alg'], array_combine($openssl_digest_algs, $openssl_digest_algs) ))->setHelp('NOTE: It is recommended to use an algorithm stronger than '. @@ -682,7 +682,7 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { $section->addInput(new Form_Select( 'type', - 'Certificate Type', + '*Certificate Type', $pconfig['type'], $cert_types ))->setHelp('Type of certificate to generate. Used for placing '. @@ -690,21 +690,21 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { $section->addInput(new Form_Input( 'lifetime', - 'Lifetime (days)', + '*Lifetime (days)', 'number', $pconfig['lifetime'] )); $section->addInput(new Form_Select( 'dn_country', - 'Country Code', + '*Country Code', $pconfig['dn_country'], $dn_cc )); $section->addInput(new Form_Input( 'dn_state', - 'State or Province', + '*State or Province', 'text', $pconfig['dn_state'], ['placeholder' => 'e.g. Texas'] @@ -712,7 +712,7 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { $section->addInput(new Form_Input( 'dn_city', - 'City', + '*City', 'text', $pconfig['dn_city'], ['placeholder' => 'e.g. Austin'] @@ -720,7 +720,7 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { $section->addInput(new Form_Input( 'dn_organization', - 'Organization', + '*Organization', 'text', $pconfig['dn_organization'], ['placeholder' => 'e.g. My Company Inc'] @@ -736,7 +736,7 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { $section->addInput(new Form_Input( 'dn_email', - 'Email Address', + '*Email Address', 'text', $pconfig['dn_email'], ['placeholder' => 'e.g. admin@mycompany.com'] @@ -744,7 +744,7 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { $section->addInput(new Form_Input( 'dn_commonname', - 'Common Name', + '*Common Name', 'text', $pconfig['dn_commonname'], ['placeholder' => 'e.g. www.example.com'] @@ -809,14 +809,14 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { $section->addInput(new Form_Select( 'csr_keylen', - 'Key length', + '*Key length', $pconfig['csr_keylen'], array_combine($cert_keylens, $cert_keylens) )); $section->addInput(new Form_Select( 'csr_digest_alg', - 'Digest Algorithm', + '*Digest Algorithm', $pconfig['csr_digest_alg'], array_combine($openssl_digest_algs, $openssl_digest_algs) ))->setHelp('NOTE: It is recommended to use an algorithm stronger than '. @@ -824,14 +824,14 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { $section->addInput(new Form_Select( 'csr_dn_country', - 'Country Code', + '*Country Code', $pconfig['csr_dn_country'], $dn_cc )); $section->addInput(new Form_Input( 'csr_dn_state', - 'State or Province', + '*State or Province', 'text', $pconfig['csr_dn_state'], ['placeholder' => 'e.g. Texas'] @@ -839,7 +839,7 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { $section->addInput(new Form_Input( 'csr_dn_city', - 'City', + '*City', 'text', $pconfig['csr_dn_city'], ['placeholder' => 'e.g. Austin'] @@ -847,7 +847,7 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { $section->addInput(new Form_Input( 'csr_dn_organization', - 'Organization', + '*Organization', 'text', $pconfig['csr_dn_organization'], ['placeholder' => 'e.g. My Company Inc'] @@ -863,7 +863,7 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { $section->addInput(new Form_Input( 'csr_dn_email', - 'Email Address', + '*Email Address', 'text', $pconfig['csr_dn_email'], ['placeholder' => 'e.g. admin@mycompany.com'] @@ -871,7 +871,7 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { $section->addInput(new Form_Input( 'csr_dn_commonname', - 'Common Name', + '*Common Name', 'text', $pconfig['csr_dn_commonname'], ['placeholder' => 'e.g. internal-ca'] @@ -907,7 +907,7 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { $section->addInput(new Form_Select( 'certref', - 'Existing Certificates', + '*Existing Certificates', $pconfig['certref'], $existCerts )); @@ -923,7 +923,7 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { $section->addInput(new Form_Input( 'descr', - 'Descriptive name', + '*Descriptive name', 'text', $pconfig['descr'] )); @@ -938,7 +938,7 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { $section->addInput(new Form_Textarea( 'cert', - 'Final certificate data', + '*Final certificate data', $pconfig['cert'] ))->setWidth(7) ->setHelp('Paste the certificate received from the certificate authority here.'); diff --git a/src/usr/local/www/system_crlmanager.php b/src/usr/local/www/system_crlmanager.php index 861737c..d4942a3 100644 --- a/src/usr/local/www/system_crlmanager.php +++ b/src/usr/local/www/system_crlmanager.php @@ -381,7 +381,7 @@ if ($act == "new" || $act == gettext("Save") || $input_errors) { $section->addInput(new Form_Select( 'method', - 'Method', + '*Method', $pconfig['method'], build_method_list() )); @@ -390,14 +390,14 @@ if ($act == "new" || $act == gettext("Save") || $input_errors) { $section->addInput(new Form_Input( 'descr', - 'Descriptive name', + '*Descriptive name', 'text', $pconfig['descr'] )); $section->addInput(new Form_Select( 'caref', - 'Certificate Authority', + '*Certificate Authority', $pconfig['caref'], build_ca_list() )); @@ -409,7 +409,7 @@ if ($act == "new" || $act == gettext("Save") || $input_errors) { $section->addInput(new Form_Textarea( 'crltext', - 'CRL data', + '*CRL data', $pconfig['crltext'] ))->setHelp('Paste a Certificate Revocation List in X.509 CRL format here.'); @@ -455,14 +455,14 @@ if ($act == "new" || $act == gettext("Save") || $input_errors) { $section->addInput(new Form_Input( 'descr', - 'Descriptive name', + '*Descriptive name', 'text', $pconfig['descr'] )); $section->addInput(new Form_Textarea( 'crltext', - 'CRL data', + '*CRL data', $pconfig['crltext'] ))->setHelp('Paste a Certificate Revocation List in X.509 CRL format here.'); diff --git a/src/usr/local/www/system_gateway_groups_edit.php b/src/usr/local/www/system_gateway_groups_edit.php index 3ee8374..70d8325 100644 --- a/src/usr/local/www/system_gateway_groups_edit.php +++ b/src/usr/local/www/system_gateway_groups_edit.php @@ -237,7 +237,7 @@ $section = new Form_Section('Edit Gateway Group Entry'); $section->addInput(new Form_Input( 'name', - 'Group Name', + '*Group Name', 'text', $pconfig['name'] )); @@ -245,14 +245,14 @@ $section->addInput(new Form_Input( $row = 0; $numrows = count($a_gateways) - 1; -$group = new Form_Group('Gateway Priority'); +$group = new Form_Group('*Gateway Priority'); $group->add(new Form_StaticText('', ''))->setReadonly(); $group->add(new Form_StaticText('', ''))->setReadonly(); $group->add(new Form_StaticText('', ''))->setReadonly(); $group->add(new Form_StaticText('', ''))->setWidth(3)->setReadonly(); $section->add($group); -// Determine the protocol familily this group pertains to. We loop through every item +// Determine the protocol family this group pertains to. We loop through every item // just in case any have been removed and so have no family (orphans?) if (is_array($pconfig['item'])) { @@ -354,7 +354,7 @@ $section->addInput(new Form_StaticText( $section->addInput(new Form_Select( 'trigger', - 'Trigger Level', + '*Trigger Level', $pconfig['trigger'], array( '0' => gettext('Member down'), diff --git a/src/usr/local/www/system_gateways_edit.php b/src/usr/local/www/system_gateways_edit.php index 55ec423..11ed2c8 100644 --- a/src/usr/local/www/system_gateways_edit.php +++ b/src/usr/local/www/system_gateways_edit.php @@ -629,14 +629,14 @@ $section->addInput(new Form_Checkbox( $section->addInput(new Form_Select( 'interface', - 'Interface', + '*Interface', $pconfig['friendlyiface'], get_configured_interface_with_descr(false, true) ))->setHelp('Choose which interface this gateway applies to.'); $section->addInput(new Form_Select( 'ipprotocol', - 'Address Family', + '*Address Family', $pconfig['ipprotocol'], array( "inet" => "IPv4", @@ -646,7 +646,7 @@ $section->addInput(new Form_Select( $section->addInput(new Form_Input( 'name', - 'Name', + '*Name', 'text', $pconfig['name'] ))->setHelp('Gateway name'); diff --git a/src/usr/local/www/system_groupmanager.php b/src/usr/local/www/system_groupmanager.php index feb2e28..1a916a4 100644 --- a/src/usr/local/www/system_groupmanager.php +++ b/src/usr/local/www/system_groupmanager.php @@ -405,7 +405,7 @@ $section = new Form_Section('Group Properties'); $section->addInput($input = new Form_Input( 'groupname', - 'Group name', + '*Group name', 'text', $pconfig['name'] )); @@ -415,14 +415,14 @@ if ($pconfig['gtype'] == "system") { $section->addInput(new Form_Input( 'gtype', - 'Scope', + '*Scope', 'text', $pconfig['gtype'] ))->setReadonly(); } else { $section->addInput(new Form_Select( 'gtype', - 'Scope', + '*Scope', $pconfig['gtype'], ["local" => gettext("Local"), "remote" => gettext("Remote")] )); diff --git a/src/usr/local/www/system_groupmanager_addprivs.php b/src/usr/local/www/system_groupmanager_addprivs.php index a4acfb0..2171d36 100644 --- a/src/usr/local/www/system_groupmanager_addprivs.php +++ b/src/usr/local/www/system_groupmanager_addprivs.php @@ -180,7 +180,7 @@ $section = new Form_Section('Add Privileges for '. $a_group['name']); $section->addInput(new Form_Select( 'sysprivs', - 'Assigned privileges', + '*Assigned privileges', $a_group['priv'], build_priv_list(), true diff --git a/src/usr/local/www/system_routes_edit.php b/src/usr/local/www/system_routes_edit.php index 98ae6a0..0d2f5c5 100644 --- a/src/usr/local/www/system_routes_edit.php +++ b/src/usr/local/www/system_routes_edit.php @@ -276,7 +276,7 @@ $section = new Form_Section('Edit Route Entry'); $section->addInput(new Form_IpAddress( 'network', - 'Destination network', + '*Destination network', $pconfig['network'], 'ALIASV4V6' ))->addMask('network_subnet', $pconfig['network_subnet'])->setHelp('Destination network for this static route'); @@ -287,7 +287,7 @@ $allGateways = array_combine( ); $section->addInput(new Form_Select( 'gateway', - 'Gateway', + '*Gateway', $pconfig['gateway'], $allGateways ))->setHelp('Choose which gateway this route applies to or <a href="'. diff --git a/src/usr/local/www/system_update_settings.php b/src/usr/local/www/system_update_settings.php index cca7860..c0b2a3f 100644 --- a/src/usr/local/www/system_update_settings.php +++ b/src/usr/local/www/system_update_settings.php @@ -190,7 +190,7 @@ $section = new Form_Section('Firmware Branch'); $section->addInput(new Form_Select( fwbranch, - 'Branch', + '*Branch', get_repo_name($config['system']['pkg_repo_conf_path']), build_repo_list() ))->setHelp('Please select the stable, or the development branch from which to update the system firmware. ' . ' <br />' . diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php index 9d34f17..2a087a0 100644 --- a/src/usr/local/www/system_usermanager.php +++ b/src/usr/local/www/system_usermanager.php @@ -726,7 +726,7 @@ if ($act == "new" || $act == "edit" || $input_errors): $section->addInput($input = new Form_Input( 'usernamefld', - 'Username', + '*Username', 'text', $pconfig['usernamefld'] )); @@ -742,7 +742,13 @@ if ($act == "new" || $act == "edit" || $input_errors): $pconfig['usernamefld'] )); - $group = new Form_Group('Password'); + if ($act == "edit") { + $pwd_required = ""; + } else { + $pwd_required = "*"; + } + + $group = new Form_Group($pwd_required . 'Password'); $group->add(new Form_Input( 'passwordfld1', 'Password', diff --git a/src/usr/local/www/system_usermanager_addprivs.php b/src/usr/local/www/system_usermanager_addprivs.php index ad50d14..eac066b 100644 --- a/src/usr/local/www/system_usermanager_addprivs.php +++ b/src/usr/local/www/system_usermanager_addprivs.php @@ -173,7 +173,7 @@ $section = new Form_Section('User Privileges'); $section->addInput(new Form_Select( 'sysprivs', - 'Assigned privileges', + '*Assigned privileges', null, build_priv_list(), true diff --git a/src/usr/local/www/system_usermanager_passwordmg.php b/src/usr/local/www/system_usermanager_passwordmg.php index bcbc631..ba7fc88 100644 --- a/src/usr/local/www/system_usermanager_passwordmg.php +++ b/src/usr/local/www/system_usermanager_passwordmg.php @@ -130,13 +130,13 @@ $section = new Form_Section('Update Password'); $section->addInput(new Form_Input( 'passwordfld1', - 'Password', + '*Password', 'password' )); $section->addInput(new Form_Input( 'passwordfld2', - 'Confirmation', + '*Confirmation', 'password' ))->setHelp('Select a new password'); diff --git a/src/usr/local/www/system_usermanager_settings.php b/src/usr/local/www/system_usermanager_settings.php index 2b5c3fb..46677cd 100644 --- a/src/usr/local/www/system_usermanager_settings.php +++ b/src/usr/local/www/system_usermanager_settings.php @@ -226,7 +226,7 @@ foreach (auth_get_authserver_list() as $idx_authserver => $auth_server) { $section->addInput(new Form_Select( 'authmode', - 'Authentication Server', + '*Authentication Server', $pconfig['authmode'], $auth_servers )); |