diff options
117 files changed, 511 insertions, 425 deletions
diff --git a/src/conf.default/config.xml b/src/conf.default/config.xml index d5cdc8f..d33788e 100644 --- a/src/conf.default/config.xml +++ b/src/conf.default/config.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <pfsense> - <version>14.9</version> + <version>15.0</version> <lastchange/> <system> <optimization>normal</optimization> diff --git a/src/etc/inc/PEAR.inc b/src/etc/inc/PEAR.inc index a280602..c6c3061 100644 --- a/src/etc/inc/PEAR.inc +++ b/src/etc/inc/PEAR.inc @@ -421,18 +421,18 @@ class PEAR $deleted = $this->_checkDelExpect($error) ? true : false; } - return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME + return $deleted ? true : PEAR::raiseError("The expected error submitted does not exist"); // IMPROVE ME } elseif (!empty($error_code)) { // $error_code comes alone, trying to unset it if ($this->_checkDelExpect($error_code)) { return true; } - return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME + return PEAR::raiseError("The expected error submitted does not exist"); // IMPROVE ME } // $error_code is empty - return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME + return PEAR::raiseError("The expected error submitted is empty"); // IMPROVE ME } /** diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc index 9db25af..1cac566 100644 --- a/src/etc/inc/auth.inc +++ b/src/etc/inc/auth.inc @@ -220,7 +220,7 @@ if (function_exists("display_error_form") && !isset($config['system']['webgui'][ } if ($found_host == false) { if (!security_checks_disabled()) { - display_error_form("501", "An HTTP_REFERER was detected other than what is defined in System -> Advanced (" . htmlspecialchars($_SERVER['HTTP_REFERER']) . "). You can disable this check if needed in System -> Advanced -> Admin."); + display_error_form("501", "An HTTP_REFERER was detected other than what is defined in System -> Advanced (" . htmlspecialchars($_SERVER['HTTP_REFERER']) . "). If not needed, this check can be disabled in System -> Advanced -> Admin."); exit; } $security_passed = false; @@ -458,7 +458,7 @@ function local_user_set(& $user) { global $g, $debug; if (empty($user['password']) && empty($user['bcrypt-hash'])) { - log_error("There is something wrong in your config because user {$user['name']} password is missing!"); + log_error("There is something wrong in the config because user {$user['name']} password is missing!"); return; } diff --git a/src/etc/inc/config.console.inc b/src/etc/inc/config.console.inc index 32c07fc..00a304b 100644 --- a/src/etc/inc/config.console.inc +++ b/src/etc/inc/config.console.inc @@ -119,10 +119,10 @@ BEGIN MANUAL CONFIGURATION OR WE WILL PROCEED WITH AUTO CONFIGURATION. EOD; } - echo "\n" . gettext("Do you want to set up VLANs first?"); + echo "\n" . gettext("Do VLANs need to be set up first?"); echo "\n" . gettext( - "If you are not going to use VLANs, or only for optional interfaces, you should\n" . + "If VLANs will not be used, or only for optional interfaces, it is typical to\n" . "say no here and use the webConfigurator to configure VLANs later, if required.") . "\n"; echo "\n" . gettext("Do you want to set up VLANs now [y|n]?") . " "; @@ -179,7 +179,7 @@ EOD; Assigned WAN to : $wanif Assigned LAN to : $lanif -If you don't like this assignment, +If these assignments are not suitable, press any key to go back to manual configuration. EOD; @@ -213,7 +213,7 @@ EOD; echo <<<EOD -If you do not know the names of your interfaces, you may choose to use +If you do not know the names of the interfaces, you may choose to use auto-detection. In that case, disconnect all interfaces now before hitting 'a' to initiate auto detection. @@ -311,7 +311,7 @@ EOD; if ($ifarr[$i] == $ifarr[$j]) { echo <<<EOD -Error: you cannot assign the same interface name twice! +Error: The same interface name cannot be assigned twice! EOD; fclose($fp); diff --git a/src/etc/inc/config.lib.inc b/src/etc/inc/config.lib.inc index 65d34bc..117f29d 100644 --- a/src/etc/inc/config.lib.inc +++ b/src/etc/inc/config.lib.inc @@ -267,7 +267,7 @@ function parse_config_bootup() { if (!file_exists("{$g['conf_path']}/config.xml")) { echo gettext("No XML configuration file found - using factory defaults.\n" . "Make sure that the configuration floppy disk with the conf/config.xml\n" . - "file is inserted. If it isn't, your configuration changes will be lost\n" . + "file is inserted. If it isn't, the configuration changes will be lost\n" . "on reboot.\n"); } } else { @@ -283,8 +283,8 @@ function parse_config_bootup() { mwexec("/sbin/halt"); exit; } - log_error("Last known config found and restored. Please double check your configuration file for accuracy."); - file_notice("config.xml", gettext("Last known config found and restored. Please double check your configuration file for accuracy."), "pfSenseConfigurator", ""); + log_error("Last known config found and restored. Please double check the configuration file for accuracy."); + file_notice("config.xml", gettext("Last known config found and restored. Please double check the configuration file for accuracy."), "pfSenseConfigurator", ""); } } else { unlock($lockkey); diff --git a/src/etc/inc/dyndns.class b/src/etc/inc/dyndns.class index a95eadc..1454fa0 100644 --- a/src/etc/inc/dyndns.class +++ b/src/etc/inc/dyndns.class @@ -850,7 +850,7 @@ } else if (preg_match('/nohost/i', $data)) { $status = $status_intro . gettext("The hostname passed could not be matched to any services configured. The service field will be blank in the return code."); } else if (preg_match('/numhost/i', $data)) { - $status = $status_intro . gettext("You may update up to 20 hosts. numhost is returned if you try to update more than 20 or update a round-robin."); + $status = $status_intro . gettext("Up to 20 hosts my be updated. numhost is returned if attempting to update more than 20 or update a round-robin."); } else if (preg_match('/abuse/i', $data)) { $status = $status_intro . gettext("The hostname is blocked for update abuse."); } else if (preg_match('/good/i', $data)) { @@ -1044,7 +1044,7 @@ if (preg_match("/400/i", $data)) { $status = $status_intro . $error_str . gettext("Bad Request - The URL was malformed. Required parameters were not provided."); } else if (preg_match('/402/i', $data)) { - $status = $status_intro . $error_str . gettext("Update Too Soon - You have tried updating to quickly since last change."); + $status = $status_intro . $error_str . gettext("Update Too Soon - Attempted to update too quickly since last change."); } else if (preg_match('/403/i', $data)) { $status = $status_intro . $error_str . gettext("Database Error - There was a server-sided database error."); } else if (preg_match('/405/i', $data)) { @@ -1113,7 +1113,7 @@ if (preg_match('/badauth/i', $data)) { $status = $status_intro . $error_str . gettext("Not a valid username or password!"); } else if (preg_match('/nohost/i', $data)) { - $status = $status_intro . $error_str . gettext("Hostname you are trying to update does not exist."); + $status = $status_intro . $error_str . gettext("Hostname specified does not exist."); $successful_update = true; } else if (preg_match('/good/i', $data)) { $status = $status_intro . $success_str . gettext("IP Address Changed Successfully!") . " (" . $this->_dnsIP . ")"; @@ -1158,7 +1158,7 @@ if (preg_match("/internal server error/i", $data)) { $status = $status_intro . $error_str . gettext("Server side error."); } else if (preg_match("/request is badly formed/i", $data)) { - $status = $status_intro . $error_str . gettext("Badly Formed Request (check your settings)."); + $status = $status_intro . $error_str . gettext("Badly Formed Request (check the settings)."); } else if ($ncresponse['interface-response']['ErrCount'] === "0") { $status = $status_intro . $success_str . gettext("IP Address Updated Successfully!"); $successful_update = true; @@ -1269,7 +1269,7 @@ } elseif ($output->errors[0]->code === 9103) { $status = $status_intro . $error_str . gettext("Invalid Credentials! Don't forget to use API Key for password field with CloudFlare."); } elseif (($output->success) && (!$output->result[0]->id)) { - $status = $status_intro . $error_str . gettext("Zone or Host ID was not found, check your hostname."); + $status = $status_intro . $error_str . gettext("Zone or Host ID was not found, check the hostname."); } else { $status = $status_intro . gettext("UNKNOWN ERROR") . " - " . $output->errors[0]->message; log_error($status_intro . gettext("PAYLOAD:") . " " . $data); diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index f160eb3..8b2e6ae 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -99,7 +99,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "14.9", + "latest_config" => "15.0", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index f08c50a..cefa7ab 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -2808,7 +2808,7 @@ EOD; if (isset($wlcfg['wpa']['rsn_preauth'])) { $wpa .= <<<EOD -# Enable the next lines for preauth when roaming. Interface = wired or wireless interface talking to the AP you want to roam from/to +# Enable the next lines for preauth when roaming. Interface = wired or wireless interface talking to the AP to roam from/to rsn_preauth=1 rsn_preauth_interfaces={$if} diff --git a/src/etc/inc/openvpn.inc b/src/etc/inc/openvpn.inc index e2ae7fb..502d770 100644 --- a/src/etc/inc/openvpn.inc +++ b/src/etc/inc/openvpn.inc @@ -1614,7 +1614,6 @@ function openvpn_get_client_status($client, $socket) { fclose($fp); } else { - $DisplayNote=true; $client['remote_host'] = gettext("Unable to contact daemon"); $client['virtual_addr'] = gettext("Service not running?"); $client['bytes_recv'] = 0; diff --git a/src/etc/inc/priv/user.priv.inc b/src/etc/inc/priv/user.priv.inc index 172273d..879af7a 100644 --- a/src/etc/inc/priv/user.priv.inc +++ b/src/etc/inc/priv/user.priv.inc @@ -42,8 +42,8 @@ $priv_list['user-copy-files'] = array(); $priv_list['user-copy-files']['name'] = gettext("User - System: Copy files (scp)"); $priv_list['user-copy-files']['descr'] = gettext("Indicates whether the user is allowed to copy files ". "onto the {$g['product_name']} appliance via SCP/SFTP. ". - "If you are going to use this privilege, you must install ". - "scponly on the appliance (Hint: pkg_add -r scponly)."); + "To use this privilege, scponly must be installed ". + "on the appliance (Hint: pkg_add -r scponly)."); $priv_list['user-ssh-tunnel'] = array(); $priv_list['user-ssh-tunnel']['name'] = gettext("User - System: SSH tunneling"); diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index 2eccd71..5b08056 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -105,6 +105,19 @@ function services_radvd_configure($blacklist = array()) { $dhcpv6ifconf['rapriority'] = "medium"; } + $racarpif = false; + /* check if binding to CARP IP */ + if (!empty($dhcpv6ifconf['rainterface'])) { + if (strstr($dhcpv6ifconf['rainterface'], "_vip")) { + if (get_carp_interface_status($dhcpv6ifconf['rainterface']) == "MASTER") { + $dhcpv6if = $dhcpv6ifconf['rainterface']; + $racarpif = true; + } else { + continue; + } + } + } + $realif = get_real_interface($dhcpv6if, "inet6"); if (isset($radvdifs[$realif])) { @@ -134,7 +147,6 @@ function services_radvd_configure($blacklist = array()) { } else { $radvdconf .= "\tAdvLinkMTU 1280;\n"; } - // $radvdconf .= "\tDeprecatePrefix on;\n"; switch ($dhcpv6ifconf['rapriority']) { case "low": $radvdconf .= "\tAdvDefaultPreference low;\n"; @@ -158,7 +170,11 @@ function services_radvd_configure($blacklist = array()) { break; } $radvdconf .= "\tprefix {$subnetv6}/{$ifcfgsnv6} {\n"; - $radvdconf .= "\t\tDeprecatePrefix on;\n"; + if ($racarpif == true) { + $radvdconf .= "\t\tDeprecatePrefix off;\n"; + } else { + $radvdconf .= "\t\tDeprecatePrefix on;\n"; + } switch ($dhcpv6ifconf['ramode']) { case "managed": $radvdconf .= "\t\tAdvOnLink on;\n"; @@ -2589,7 +2605,7 @@ function configure_cron() { $crontab_contents .= "\n#\n"; $crontab_contents .= "# " . gettext("If possible do not add items to this file manually.") . "\n"; - $crontab_contents .= "# " . gettext("If you do so, this file must be terminated with a blank line (e.g. new line)") . "\n"; + $crontab_contents .= "# " . gettext("If done so, this file must be terminated with a blank line (e.g. new line)") . "\n"; $crontab_contents .= "#\n\n"; } diff --git a/src/etc/inc/shaper.inc b/src/etc/inc/shaper.inc index 73cf028..33266fb 100644 --- a/src/etc/inc/shaper.inc +++ b/src/etc/inc/shaper.inc @@ -848,7 +848,7 @@ class altq_root_queue { 'FAIRQ' => 'FAIRQ', 'CODELQ' => 'CODELQ', 'PRIQ' => 'PRIQ') - ))->setHelp('Changing this changes all child queues! Beware you can lose information.'); + ))->setHelp('Changing this changes all child queues! Beware information can be lost.'); $group = new Form_group('Bandwidth'); @@ -3500,7 +3500,7 @@ class dnpipe_class extends dummynet_class { } } if ($schedule == 0 && $entries > 1) { - $input_errors[] = gettext("You need to specify a schedule for every additional entry"); + $input_errors[] = gettext("A schedule needs to be specified for every additional entry"); } if ($schedulenone > 0 && $entries > 1) { $input_errors[] = gettext("If more than one bandwidth configured all schedules need to be selected"); @@ -3929,7 +3929,7 @@ EOD; 'Description', 'text', $this->GetDescription() - ))->setHelp('You may enter a description here for your reference (not parsed).'); + ))->setHelp('A description may be entered here for administrative reference (not parsed).'); $sform->add($section); @@ -3940,7 +3940,7 @@ EOD; 'Delay (ms)', 'text', $this->GetDelay() > 0 ? $this->GetDelay():null - ))->setHelp('In most cases, you should specify 0 here (or leave the field empty)'); + ))->setHelp('In most cases, zero (0) should specified here (or leave the field empty)'); $section->addInput(new Form_Input( 'plr', @@ -3948,7 +3948,7 @@ EOD; 'number', $this->GetPlr(), ['step' => '0.001', 'min' => '0.000'] - ))->setHelp('In most cases, you should specify 0 here (or leave the field empty). ' . + ))->setHelp('In most cases, zero (0) should be specified here (or leave the field empty). ' . 'A value of 0.001 means one packet in 1000 gets dropped'); $section->addInput(new Form_Input( @@ -3956,7 +3956,7 @@ EOD; 'Queue size (slots)', 'number', $this->GetQlimit() - ))->setHelp('In most cases, you should leave the field empty. All packets in this pipe are placed into a fixed-size queue first, ' . + ))->setHelp('In most cases, the field should be left empty. All packets in this pipe are placed into a fixed-size queue first, ' . 'then they are delayed by value specified in the Delay field, and then they are delivered to their destination.'); $section->addInput(new Form_Input( @@ -3964,7 +3964,7 @@ EOD; 'Bucket size (slots)', 'number', $this->GetBuckets() - ))->setHelp('In most cases, you should leave this field empty. It increases the hash size set'); + ))->setHelp('In most cases, this field should be left empty. It increases the hash size set'); $sform->add($section); @@ -4233,7 +4233,7 @@ class dnqueue_class extends dummynet_class { 'Description', 'text', $this->GetDescription() - ))->setHelp('You may enter a description here for your reference (not parsed).'); + ))->setHelp('A description may be entered here for administrative reference (not parsed).'); $sform->add($section); @@ -4246,7 +4246,7 @@ class dnqueue_class extends dummynet_class { $this->GetWeight(), ['min' => '1', 'max' => '100'] ))->setHelp('For queues under the same parent this specifies the share that a queue gets(values range from 1 to 100),' . - ' you can leave it blank otherwise'); + ' it can be left blank otherwise.'); $section->addInput(new Form_Input( 'plr', @@ -4254,7 +4254,7 @@ class dnqueue_class extends dummynet_class { 'number', $this->GetPlr(), ['step' => '0.001', 'min' => '0.000'] - ))->setHelp('In most cases, you should specify 0 here (or leave the field empty). ' . + ))->setHelp('In most cases, zero (0) should be specified here (or leave the field empty). ' . 'A value of 0.001 means one packet in 1000 gets dropped'); $section->addInput(new Form_Input( @@ -4262,7 +4262,7 @@ class dnqueue_class extends dummynet_class { 'Queue size (slots)', 'number', $this->GetQlimit() - ))->setHelp('In most cases, you should leave the field empty. All packets in this pipe are placed into a fixed-size queue first, ' . + ))->setHelp('In most cases, the field should be left empty. All packets in this pipe are placed into a fixed-size queue first, ' . 'then they are delayed by value specified in the Delay field, and then they are delivered to their destination.'); $section->addInput(new Form_Input( @@ -4270,7 +4270,7 @@ class dnqueue_class extends dummynet_class { 'Bucket size (slots)', 'number', $this->GetBuckets() - ))->setHelp('In most cases, you should leave this field empty. It increases the hash size set'); + ))->setHelp('In most cases, this field should be left empty. It increases the hash size set'); $section->addInput(new Form_Input( 'pipe', @@ -4667,7 +4667,7 @@ function build_iface_without_this_queue($iface, $qname) { } $default_shaper_msg = sprintf(gettext("Welcome to the %s Traffic Shaper."), $g['product_name']) . "<br />"; -$default_shaper_msg .= gettext("The tree on the left helps you navigate through the queues.<br />" +$default_shaper_msg .= gettext("The tree on the left navigates through the queues.<br />" . "Buttons at the bottom represent queue actions and are activated accordingly."); $dn_default_shaper_msg = $default_shaper_msg; diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index 4f27e09..2d0ab84 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -660,7 +660,7 @@ function upgrade_039_to_040() { $config['system']['user'][0]['priv'][3]['descr'] = sprintf(gettext("Indicates whether this user is allowed to copy files onto the %s appliance via SCP/SFTP."), $g['product_name']); $config['system']['user'][0]['priv'][4]['id'] = "isroot"; $config['system']['user'][0]['priv'][4]['name'] = "Is root user"; - $config['system']['user'][0]['priv'][4]['descr'] = gettext("This user is associated with the UNIX root user (you should associate this privilege only with one single user)."); + $config['system']['user'][0]['priv'][4]['descr'] = gettext("This user is associated with the UNIX root user (this privilege should only be associated with one single user)."); $config['system']['nextuid'] = "111"; $config['system']['nextgid'] = "111"; @@ -4773,4 +4773,18 @@ function upgrade_148_to_149() { } } } + +function upgrade_149_to_150() { + global $config; + + if (is_array($config['dhcpdv6'])) { + foreach ($config['dhcpdv6'] as &$dhcpdv6) { + if (isset($dhcpdv6['rainterface'])) { + if (strstr($dhcpdv6['rainterface'], "_vip")) { + $dhcpdv6['rainterface'] = get_vip_from_oldcarp($dhcpdv6['rainterface']); + } + } + } + } +} ?> diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index e74dc64..7449dc8 100644 --- a/src/etc/inc/util.inc +++ b/src/etc/inc/util.inc @@ -148,7 +148,7 @@ function config_unlock() { function lock($lock, $op = LOCK_SH) { global $g, $cfglckkeyconsumers; if (!$lock) { - die(gettext("WARNING: You must give a name as parameter to lock() function.")); + die(gettext("WARNING: A name must be given as parameter to lock() function.")); } if (!file_exists("{$g['tmp_path']}/{$lock}.lock")) { @touch("{$g['tmp_path']}/{$lock}.lock"); @@ -167,7 +167,7 @@ function lock($lock, $op = LOCK_SH) { function try_lock($lock, $timeout = 5) { global $g, $cfglckkeyconsumers; if (!$lock) { - die(gettext("WARNING: You must give a name as parameter to try_lock() function.")); + die(gettext("WARNING: A name must be given as parameter to try_lock() function.")); } if (!file_exists("{$g['tmp_path']}/{$lock}.lock")) { @touch("{$g['tmp_path']}/{$lock}.lock"); diff --git a/src/etc/rc.carpbackup b/src/etc/rc.carpbackup index a65aff4..0faeaab 100755 --- a/src/etc/rc.carpbackup +++ b/src/etc/rc.carpbackup @@ -98,6 +98,22 @@ if (is_array($config['openvpn']) && is_array($config['openvpn']['openvpn-server' } } +/* Reconfigure radvd when necessary */ +if (isset($config['dhcpdv6']) && is_array($config['dhcpdv6'])) { + $rafound = false; + foreach ($config['dhcpdv6'] as $dhcpv6if => $dhcpv6ifconf) { + foreach ($vips as $vip) { + if ($dhcpv6ifconf['rainterface'] == "_vip{$vip['uniqid']}") { + log_error("Stopping radvd instance on {$friendly_descr} because of transition to CARP master."); + $rafound = true; + } + } + } + if ($rafound) { + services_radvd_configure(); + } +} + $pluginparams = array(); $pluginparams['type'] = 'carp'; $pluginparams['event'] = 'rc.carpbackup'; diff --git a/src/etc/rc.carpmaster b/src/etc/rc.carpmaster index a9e779e..248b5bb 100755 --- a/src/etc/rc.carpmaster +++ b/src/etc/rc.carpmaster @@ -97,6 +97,22 @@ if (is_array($config['openvpn']) && is_array($config['openvpn']['openvpn-server' } } +/* Reconfigure radvd when necessary */ +if (isset($config['dhcpdv6']) && is_array($config['dhcpdv6'])) { + $rafound = false; + foreach ($config['dhcpdv6'] as $dhcpv6if => $dhcpv6ifconf) { + foreach ($vips as $vip) { + if ($dhcpv6ifconf['rainterface'] == "_vip{$vip['uniqid']}") { + log_error("Starting radvd instance on {$friendly_descr} because of transition to CARP master."); + $rafound = true; + } + } + } + if ($rafound) { + services_radvd_configure(); + } +} + $pluginparams = array(); $pluginparams['type'] = 'carp'; $pluginparams['event'] = 'rc.carpmaster'; diff --git a/src/etc/version b/src/etc/version index b223756..008d7ae 100644 --- a/src/etc/version +++ b/src/etc/version @@ -1 +1 @@ -2.3-BETA +2.4-DEVELOPMENT diff --git a/src/usr/local/www/diag_backup.php b/src/usr/local/www/diag_backup.php index 5b49019..f446e6c 100644 --- a/src/usr/local/www/diag_backup.php +++ b/src/usr/local/www/diag_backup.php @@ -226,7 +226,7 @@ if ($_POST) { if ($mode == "download") { if ($_POST['encrypt']) { if (!$_POST['encrypt_password']) { - $input_errors[] = gettext("You must supply and confirm the password for encryption."); + $input_errors[] = gettext("A password for decryption must be supplied and confirmed."); } } @@ -301,7 +301,7 @@ if ($_POST) { if ($mode == "restore") { if ($_POST['decrypt']) { if (!$_POST['decrypt_password']) { - $input_errors[] = gettext("You must supply and confirm the password for decryption."); + $input_errors[] = gettext("A password for encryption must be supplied and confirmed."); } } @@ -332,10 +332,10 @@ if ($_POST) { if ($_POST['restorearea']) { /* restore a specific area of the configuration */ if (!stristr($data, "<" . $_POST['restorearea'] . ">")) { - $input_errors[] = gettext("You have selected to restore an area but we could not locate the correct xml tag."); + $input_errors[] = gettext("An area to restore was selected but the correct xml tag could not be located."); } else { if (!restore_config_section($_POST['restorearea'], $data)) { - $input_errors[] = gettext("You have selected to restore an area but we could not locate the correct xml tag."); + $input_errors[] = gettext("An area to restore was selected but the correct xml tag could not be located."); } else { if ($config['rrddata']) { restore_rrddata(); @@ -347,12 +347,12 @@ if ($_POST) { conf_mount_ro(); } filter_configure(); - $savemsg = gettext("The configuration area has been restored. You may need to reboot the firewall."); + $savemsg = gettext("The configuration area has been restored. The firewall may need to be rebooted."); } } } else { if (!stristr($data, "<" . $g['xml_rootobj'] . ">")) { - $input_errors[] = sprintf(gettext("You have selected to restore the full configuration but we could not locate a %s tag."), $g['xml_rootobj']); + $input_errors[] = sprintf(gettext("A full configuration restore was selected but a %s tag could not be located."), $g['xml_rootobj']); } else { /* restore the entire configuration */ file_put_contents($_FILES['conffile']['tmp_name'], $data); @@ -529,7 +529,7 @@ if ($_POST) { clear_subsystem_dirty('packagelock'); $savemsg = "Package lock cleared."; } else if ($mode == "restore_ver") { - $input_errors[] = gettext("XXX - this feature may hose your config (do NOT backrev configs!) - billm"); + $input_errors[] = gettext("XXX - this feature may hose the config (do NOT backrev configs!) - billm"); if ($ver2restore <> "") { $conf_file = "{$g['cf_conf_path']}/bak/config-" . strtotime($ver2restore) . ".xml"; if (config_install($conf_file) == 0) { diff --git a/src/usr/local/www/diag_defaults.php b/src/usr/local/www/diag_defaults.php index 3520e68..130045d 100755 --- a/src/usr/local/www/diag_defaults.php +++ b/src/usr/local/www/diag_defaults.php @@ -75,7 +75,7 @@ include("head.inc"); ?> <?php if ($_POST['Submit'] == " " . gettext("Yes") . " "): - print_info_box(gettext("The system has been reset to factory defaults and is now rebooting. This may take a few minutes, depending on your hardware."))?> + print_info_box(gettext("The system has been reset to factory defaults and is now rebooting. This may take a few minutes, depending on the hardware."))?> <pre> <?php reset_factory_defaults(); @@ -85,12 +85,12 @@ include("head.inc"); <?php else:?> <div class="panel panel-default"> <div class="panel-heading"> - <h2 class="panel-title"><?=gettext("Are you sure you want to reset the system to the factory defaults?")?></h2> + <h2 class="panel-title"><?=gettext("Factory Defaults Reset")?></h2> </div> <div class="panel-body"> <div class="content"> <form action="diag_defaults.php" method="post"> - <p><strong><?=sprintf(gettext('If you click %1$sYes%1$s the firewall will:'), """)?></strong></p> + <p><strong><?=sprintf(gettext('Resetting the system to factory defaults will remove all user configuration and apply the following settings:'), """)?></strong></p> <ul> <li><?=gettext("Reset to factory defaults")?></li> <li><?=gettext("LAN IP address will be reset to 192.168.1.1")?></li> diff --git a/src/usr/local/www/diag_gmirror.php b/src/usr/local/www/diag_gmirror.php index edb58d2..0978d33 100644 --- a/src/usr/local/www/diag_gmirror.php +++ b/src/usr/local/www/diag_gmirror.php @@ -93,11 +93,11 @@ if ($_POST) { $input_errors = ""; if (($_POST['action'] != "clear") && !is_valid_mirror($_POST['mirror'])) { - $input_errors[] = gettext("You must supply a valid mirror name."); + $input_errors[] = gettext("A valid mirror name must be supplied."); } if (!empty($_POST['consumer']) && !is_valid_consumer($_POST['consumer'])) { - $input_errors[] = gettext("You must supply a valid consumer name"); + $input_errors[] = gettext("A valid consumer name must be supplied"); } /* Additional action-specific validation that hasn't already been tested */ diff --git a/src/usr/local/www/diag_nanobsd.php b/src/usr/local/www/diag_nanobsd.php index 8bf3c75..3393e54 100644 --- a/src/usr/local/www/diag_nanobsd.php +++ b/src/usr/local/www/diag_nanobsd.php @@ -100,7 +100,7 @@ if ($_POST['destslice'] && $_POST['duplicateslice']) { $statusmsg = gettext("Duplicating slice. Please wait, this will take a moment..."); if (!DEBUG && nanobsd_clone_slice($_POST['destslice'])) { - $savemsg = gettext("The slice has been duplicated.") . "<p/>" . gettext("If you would like to boot from this newly duplicated slice please set it using the bootup information area."); + $savemsg = gettext("The slice has been duplicated.") . "<p/>" . gettext("To boot from this newly duplicated slice set it using the bootup information area."); $class = 'alert-success'; } else { $savemsg = gettext("There was an error while duplicating the slice. Operation aborted."); @@ -242,7 +242,7 @@ $dupbtn->addClass('btn-success btn-sm'); $section->addInput(new Form_StaticText( 'Duplicate boot slice', $dupbtn -))->setHelp('This will duplicate the bootup slice to the alternate slice. Use this if you would like to duplicate the known good working boot partition to the alternate.'); +))->setHelp('This will duplicate the bootup slice to the alternate slice. Use this to duplicate the known good working boot partition to the alternate.'); $section->addInput(new Form_StaticText( 'RRD/DHCP Backup', diff --git a/src/usr/local/www/diag_packet_capture.php b/src/usr/local/www/diag_packet_capture.php index d31c335..d44a4e7 100644 --- a/src/usr/local/www/diag_packet_capture.php +++ b/src/usr/local/www/diag_packet_capture.php @@ -337,7 +337,7 @@ $section->addInput(new Form_Input( ))->setHelp('This value is either the Source or Destination IP address or subnet in CIDR notation. The packet capture will look for this address in either field.' . '<br />' . 'Matching can be negated by preceding the value with "!". Multiple IP addresses or CIDR subnets may be specified. Comma (",") separated values perform a boolean "AND". ' . 'Separating with a pipe ("|") performs a boolean "OR".' . '<br />' . - 'If you leave this field blank, all packets on the specified interface will be captured.'); + 'If this field is left blank, all packets on the specified interface will be captured.'); $section->addInput(new Form_Input( 'port', @@ -345,7 +345,7 @@ $section->addInput(new Form_Input( 'text', $port ))->setHelp('The port can be either the source or destination port. The packet capture will look for this port in either field. ' . - 'Leave blank if you do not want to filter by port.'); + 'Leave blank if not filtering by port.'); $section->addInput(new Form_Input( 'snaplen', diff --git a/src/usr/local/www/diag_resetstate.php b/src/usr/local/www/diag_resetstate.php index a29dea2..eb2e98c 100644 --- a/src/usr/local/www/diag_resetstate.php +++ b/src/usr/local/www/diag_resetstate.php @@ -101,7 +101,7 @@ $statetablehelp = sprintf(gettext('Resetting the state tables will remove all en 'will be broken and will have to be re-established. This may be necessary after making substantial changes to the ' . 'firewall and/or NAT rules, especially if there are IP protocol mappings (e.g. for PPTP or IPv6) with open connections.%s' . 'The firewall will normally leave the state tables intact when changing rules.%s' . - '%sNOTE:%s If you reset the firewall state table, the browser session may appear to be hung after clicking "Reset". ' . + '%sNOTE:%s Resetting the firewall state table, may cause the browser session to appear hung after clicking "Reset". ' . 'Simply refresh the page to continue.'), "<br /><br />", "<br /><br />", "<strong>", "</strong>"); $sourcetablehelp = sprintf(gettext('Resetting the source tracking table will remove all source/destination associations. ' . diff --git a/src/usr/local/www/diag_routes.php b/src/usr/local/www/diag_routes.php index d94b416..5ba3c2b 100644 --- a/src/usr/local/www/diag_routes.php +++ b/src/usr/local/www/diag_routes.php @@ -114,7 +114,7 @@ $section->addInput(new Form_Checkbox( 'Enable', $resolve ))->setHelp('Enabling name resolution may cause the query to take longer.'. - ' You can stop it at any time by clicking the Stop button in your browser.'); + ' It can be stopped at any time by clicking the Stop button in the browser.'); $validLimits = array('10', '50', '100', '200', '500', '1000', 'all'); $section->addInput(new Form_Select( diff --git a/src/usr/local/www/diag_testport.php b/src/usr/local/www/diag_testport.php index d40960d..58444c0 100644 --- a/src/usr/local/www/diag_testport.php +++ b/src/usr/local/www/diag_testport.php @@ -98,10 +98,10 @@ if ($_POST || $_REQUEST['host']) { } if (is_ipaddrv4($_REQUEST['host']) && ($_REQUEST['ipprotocol'] == "ipv6")) { - $input_errors[] = gettext("You cannot connect to an IPv4 address using IPv6."); + $input_errors[] = gettext("Cannot connect to an IPv4 address using IPv6."); } if (is_ipaddrv6($_REQUEST['host']) && ($_REQUEST['ipprotocol'] == "ipv4")) { - $input_errors[] = gettext("You cannot connect to an IPv6 address using IPv4."); + $input_errors[] = gettext("Cannot connect to an IPv6 address using IPv4."); } if (!$input_errors) { @@ -241,7 +241,7 @@ if ($input_errors) { } } else { // First time, new page - print_info_box(gettext('This page allows you to perform a simple TCP connection test to determine if a host is up and accepting connections on a given port.') . " " . + print_info_box(gettext('This page performs a simple TCP connection test to determine if a host is up and accepting connections on a given port.') . " " . gettext('This test does not function for UDP since there is no way to reliably determine if a UDP port accepts connections in this manner.'), 'warning', false); } @@ -292,8 +292,8 @@ $section->addInput(new Form_Select( 'IP Protocol', $ipprotocol, array('ipv4' => 'IPv4', 'ipv6' => 'IPv6') -))->setHelp("If you force IPv4 or IPv6 and use a hostname that does not contain a result using that protocol, it will result in an error." . - " For example if you force IPv4 and use a hostname that only returns an AAAA IPv6 IP address, it will not work."); +))->setHelp("If IPv4 or IPv6 is forced and a hostname is used that does not contain a result using that protocol, it will result in an error." . + " For example if IPv4 is forced and a hostname is used that only returns an AAAA IPv6 IP address, it will not work."); $form->add($section); diff --git a/src/usr/local/www/firewall_aliases.php b/src/usr/local/www/firewall_aliases.php index b49a82e..71d3fce 100644 --- a/src/usr/local/www/firewall_aliases.php +++ b/src/usr/local/www/firewall_aliases.php @@ -208,7 +208,7 @@ if ($savemsg) { } if (is_subsystem_dirty('aliases')) { - print_apply_box(gettext("The alias list has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The alias list has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } display_top_tabs($tab_array); @@ -318,8 +318,8 @@ display_top_tabs($tab_array); <div class="infoblock"> <?php print_info_box(gettext('Aliases act as placeholders for real hosts, networks or ports. They can be used to minimize the number ' . 'of changes that have to be made if a host, network or port changes. <br />' . - 'You can enter the name of an alias instead of the host, network or port where indicated. The alias will be resolved according to the list above.' . '<br />' . - 'If an alias cannot be resolved (e.g. because you deleted it), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped.'), 'info', false); ?> + 'The name of an alias can be entered instead of the host, network or port where indicated. The alias will be resolved according to the list above.' . '<br />' . + 'If an alias cannot be resolved (e.g. because it was deleted), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped.'), 'info', false); ?> </div> </div> diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php index ae1790a..5d2ac60 100755 --- a/src/usr/local/www/firewall_aliases_edit.php +++ b/src/usr/local/www/firewall_aliases_edit.php @@ -224,7 +224,7 @@ if ($_POST) { $alias['url'] = $_POST['address0']; $alias['updatefreq'] = $_POST['address_subnet0'] ? $_POST['address_subnet0'] : 7; if (!is_URL($alias['url']) || empty($alias['url'])) { - $input_errors[] = gettext("You must provide a valid URL."); + $input_errors[] = gettext("A valid URL must be provided."); } elseif (!process_alias_urltable($alias['name'], $alias['url'], 0, true, true)) { $input_errors[] = gettext("Unable to fetch usable data from URL") . " " . htmlspecialchars($alias['url']); } @@ -287,7 +287,7 @@ if ($_POST) { $address = parse_aliases_file("{$temp_filename}/aliases", $_POST['type'], 5000); if ($address == null) { /* nothing was found */ - $input_errors[] = sprintf(gettext("You must provide a valid URL. Could not fetch usable data from '%s'."), $_POST['address' . $x]); + $input_errors[] = sprintf(gettext("A valid URL must be provided. Could not fetch usable data from '%s'."), $_POST['address' . $x]); } mwexec("/bin/rm -rf " . escapeshellarg($temp_filename)); } else { @@ -594,14 +594,14 @@ $label_str = array( $special_cidr_usage_text = gettext("The value after the \"/\" is the update frequency in days."); $help = array( - 'network' => gettext("Networks are specified in CIDR format. Select the CIDR mask that pertains to each entry. /32 specifies a single IPv4 host, /128 specifies a single IPv6 host, /24 specifies 255.255.255.0, /64 specifies a normal IPv6 network, etc. Hostnames (FQDNs) may also be specified, using a /32 mask for IPv4 or /128 for IPv6. You may also enter an IP range such as 192.168.1.1-192.168.1.254 and a list of CIDR networks will be derived to fill the range."), - 'host' => gettext("Enter as many hosts as you would like. Hosts must be specified by their IP address or fully qualified domain name (FQDN). FQDN hostnames are periodically re-resolved and updated. If multiple IPs are returned by a DNS query, all are used. You may also enter an IP range such as 192.168.1.1-192.168.1.10 or a small subnet such as 192.168.1.16/28 and a list of individual IP addresses will be generated."), - 'port' => gettext("Enter as many ports as you wish. Port ranges can be expressed by separating with a colon."), - 'url' => gettext("Enter as many URLs as you wish. After saving we will download the URL and import the items into the alias. Use only with small sets of IP addresses (less than 3000)."), - 'url_ports' => gettext("Enter as many URLs as you wish. After saving we will download the URL and import the items into the alias. Use only with small sets of Ports (less than 3000)."), - 'urltable' => gettext("Enter a single URL containing a large number of IPs and/or Subnets. After saving we will download the URL and create a table file containing these addresses. This will work with large numbers of addresses (30,000+) or small numbers.") . + 'network' => gettext("Networks are specified in CIDR format. Select the CIDR mask that pertains to each entry. /32 specifies a single IPv4 host, /128 specifies a single IPv6 host, /24 specifies 255.255.255.0, /64 specifies a normal IPv6 network, etc. Hostnames (FQDNs) may also be specified, using a /32 mask for IPv4 or /128 for IPv6. An IP range such as 192.168.1.1-192.168.1.254 may also be entered and a list of CIDR networks will be derived to fill the range."), + 'host' => gettext("Enter as many hosts as desired. Hosts must be specified by their IP address or fully qualified domain name (FQDN). FQDN hostnames are periodically re-resolved and updated. If multiple IPs are returned by a DNS query, all are used. An IP range such as 192.168.1.1-192.168.1.10 or a small subnet such as 192.168.1.16/28 may also be entered and a list of individual IP addresses will be generated."), + 'port' => gettext("Enter as many ports as desired. Port ranges can be expressed by separating with a colon."), + 'url' => gettext("Enter as many URLs as desired. After saving, the URLs will be downloaded and the items imported into the alias. Use only with small sets of IP addresses (less than 3000)."), + 'url_ports' => gettext("Enter as many URLs as desired. After saving, the URLs will be downloaded and the items imported into the alias. Use only with small sets of Ports (less than 3000)."), + 'urltable' => gettext("Enter a single URL containing a large number of IPs and/or Subnets. After saving, the URLs will be downloaded and a table file containing these addresses will be created. This will work with large numbers of addresses (30,000+) or small numbers.") . "<br /><b>" . $special_cidr_usage_text . "</b>", - 'urltable_ports' => gettext("Enter a single URL containing a list of Port numbers and/or Port ranges. After saving we will download the URL.") . + 'urltable_ports' => gettext("Enter a single URL containing a list of Port numbers and/or Port ranges. After saving, the URL will be downloaded.") . "<br /><b>" . $special_cidr_usage_text . "</b>", ); @@ -682,7 +682,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $pconfig['descr'] -))->setHelp('You may enter a description here for your reference (not parsed).'); +))->setHelp('A description may be entered here for administrative reference (not parsed).'); $section->addInput(new Form_Select( 'type', diff --git a/src/usr/local/www/firewall_aliases_import.php b/src/usr/local/www/firewall_aliases_import.php index 4230a14..77b2adf 100755 --- a/src/usr/local/www/firewall_aliases_import.php +++ b/src/usr/local/www/firewall_aliases_import.php @@ -208,8 +208,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $_POST['descr'] -))->setHelp('You may enter a description here for your reference (not '. - 'parsed).'); +))->setHelp('A description may be entered here for administrative reference (not parsed).'); $section->addInput(new Form_Textarea( 'aliasimport', diff --git a/src/usr/local/www/firewall_nat_out_edit.php b/src/usr/local/www/firewall_nat_out_edit.php index a17fabb..a19bde7 100644 --- a/src/usr/local/www/firewall_nat_out_edit.php +++ b/src/usr/local/www/firewall_nat_out_edit.php @@ -607,10 +607,9 @@ $group->addClass('natportgrp'); $group->add(new Form_Input( 'natport', null, - 'number', - $pconfig['natport'], - ['min' => '1', 'max' => '65536'] -))->setHelp('Enter the source port for the outbound NAT mapping.'); + 'text', + $pconfig['natport'] +))->setHelp('Enter the source port or range for the outbound NAT mapping.'); $group->add(new Form_Checkbox( 'staticnatport', diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php index ee07f4f..f9630c0 100644 --- a/src/usr/local/www/firewall_rules.php +++ b/src/usr/local/www/firewall_rules.php @@ -213,7 +213,7 @@ if ($_POST) { clear_subsystem_dirty('filter'); - $savemsg = sprintf(gettext("The settings have been applied. The firewall rules are now reloading in the background.<br />You can also %s monitor %s the reload progress."), + $savemsg = sprintf(gettext("The settings have been applied. The firewall rules are now reloading in the background.<br />%s Monitor %s the reload progress."), "<a href='status_filter_reload.php'>", "</a>"); } } @@ -363,7 +363,7 @@ if ($savemsg) { } if (is_subsystem_dirty('filter')) { - print_apply_box(gettext("The firewall rule configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The firewall rule configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } display_top_tabs($tab_array); @@ -825,7 +825,7 @@ if ($seprows[$nrules]) { <?=gettext("No floating rules are currently defined.");?> <?php else: ?> <?=gettext("No rules are currently defined for this interface");?><br /> - <?=gettext("All incoming connections on this interface will be blocked until you add pass rules.");?> + <?=gettext("All incoming connections on this interface will be blocked until pass rules are added.");?> <?php endif;?> <?=gettext("Click the button to add a new rule.");?> </p> @@ -874,7 +874,7 @@ if ($seprows[$nrules]) { if ("FloatingRules" != $if) { print(gettext("Rules are evaluated on a first-match basis (i.e. " . "the action of the first rule to match a packet will be executed). ") . '<br />' . - gettext("This means that if you use block rules, you'll have to pay attention " . + gettext("This means that if block rules are used, it is important to pay attention " . "to the rule order. Everything that isn't explicitly passed is blocked " . "by default. ")); } else { @@ -961,7 +961,7 @@ events.push(function() { // Provide a warning message if the user tries to change page before saving $(window).bind('beforeunload', function(){ if ((!saving && dirty) || newSeperator) { - return ("<?=gettext('You have moved one or more rules but have not yet saved')?>"); + return ("<?=gettext('One or more rules have been moved but have not yet been saved')?>"); } else { return undefined; } diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index 9d5a7e1..d8f3267 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -344,13 +344,13 @@ if ($_POST) { continue; } if (($_POST['ipprotocol'] == "inet46") && ($_POST['ipprotocol'] != $family)) { - $input_errors[] = gettext("You can not assign a gateway to a rule that applies to IPv4 and IPv6"); + $input_errors[] = gettext("A gateway can not be assigned to a rule that applies to IPv4 and IPv6"); } if (($_POST['ipprotocol'] == "inet6") && ($_POST['ipprotocol'] != $family)) { - $input_errors[] = gettext("You can not assign an IPv4 gateway group on IPv6 Address Family rule"); + $input_errors[] = gettext("An IPv4 gateway group can not be assigned on an IPv6 Address Family rule"); } if (($_POST['ipprotocol'] == "inet") && ($_POST['ipprotocol'] != $family)) { - $input_errors[] = gettext("You can not assign an IPv6 gateway group on IPv4 Address Family rule"); + $input_errors[] = gettext("An IPv6 gateway group can not be assigned on an IPv4 Address Family rule"); } } } @@ -358,18 +358,18 @@ if ($_POST) { } if (($_POST['ipprotocol'] <> "") && ($_POST['gateway'] <> "") && (is_ipaddr(lookup_gateway_ip_by_name($_POST['gateway'])))) { if (($_POST['ipprotocol'] == "inet46") && ($_POST['gateway'] <> "")) { - $input_errors[] = gettext("You can not assign a gateway to a rule that applies to IPv4 and IPv6"); + $input_errors[] = gettext("A gateway can not be assigned to a rule that applies to IPv4 and IPv6"); } if (($_POST['ipprotocol'] == "inet6") && (!is_ipaddrv6(lookup_gateway_ip_by_name($_POST['gateway'])))) { - $input_errors[] = gettext("You can not assign an IPv4 Gateway to an IPv6 Filter rule"); + $input_errors[] = gettext("An IPv4 Gateway can not be assigned to an IPv6 Filter rule"); } if (($_POST['ipprotocol'] == "inet") && (!is_ipaddrv4(lookup_gateway_ip_by_name($_POST['gateway'])))) { - $input_errors[] = gettext("You can not assign an IPv6 Gateway to an IPv4 Filter rule"); + $input_errors[] = gettext("An IPv6 Gateway can not be assigned to an IPv4 Filter rule"); } } if (($_POST['proto'] == "icmp") && ($_POST['icmptype'] <> "")) { if ($_POST['ipprotocol'] == "inet46") { - $input_errors[] = gettext("You can not assign a ICMP type to a rule that applies to IPv4 and IPv6"); + $input_errors[] = gettext("An ICMP type can not be assigned to a rule that applies to IPv4 and IPv6"); } } @@ -497,7 +497,7 @@ if ($_POST) { } if (!$_POST['srcbeginport_cust'] && $_POST['srcendport_cust']) { if (is_alias($_POST['srcendport_cust'])) { - $input_errors[] = 'If you put port alias in Source port range to: field you must put the same port alias in from: field'; + $input_errors[] = 'If a port alias is put in the Source port range to: field the same port alias must be put in the from: field'; } } if ($_POST['srcbeginport_cust'] && $_POST['srcendport_cust']) { @@ -506,12 +506,12 @@ if ($_POST) { } if ((is_alias($_POST['srcbeginport_cust']) && (!is_alias($_POST['srcendport_cust']) && $_POST['srcendport_cust'] != '')) || ((!is_alias($_POST['srcbeginport_cust']) && $_POST['srcbeginport_cust'] != '') && is_alias($_POST['srcendport_cust']))) { - $input_errors[] = 'You cannot specify numbers and port aliases at the same time in Source port range from: and to: field'; + $input_errors[] = 'Numbers and port aliases cannot be specified at the same time in Source port range from: and to: field'; } } if (!$_POST['dstbeginport_cust'] && $_POST['dstendport_cust']) { if (is_alias($_POST['dstendport_cust'])) { - $input_errors[] = 'If you put port alias in Destination port range to: field you must put the same port alias in from: field'; + $input_errors[] = 'If a port alias is put in the Destination port range to: field the same port alias must be put in the from: field'; } } if ($_POST['dstbeginport_cust'] && $_POST['dstendport_cust']) { @@ -520,7 +520,7 @@ if ($_POST) { } if ((is_alias($_POST['dstbeginport_cust']) && (!is_alias($_POST['dstendport_cust']) && $_POST['dstendport_cust'] != '')) || ((!is_alias($_POST['dstbeginport_cust']) && $_POST['dstbeginport_cust'] != '') && is_alias($_POST['dstendport_cust']))) { - $input_errors[] = 'You cannot specify numbers and port aliases at the same time in Destination port range from: and to: field'; + $input_errors[] = 'Numbers and port aliases cannot be specified at the same time in Destination port range from: and to: field'; } } @@ -534,12 +534,12 @@ if ($_POST) { /* if user enters an alias and selects "network" then disallow. */ if ($_POST['srctype'] == "network") { if (is_alias($_POST['src'])) { - $input_errors[] = gettext("You must specify single host or alias for alias entries."); + $input_errors[] = gettext("Alias entries must be a single host or alias."); } } if ($_POST['dsttype'] == "network") { if (is_alias($_POST['dst'])) { - $input_errors[] = gettext("You must specify single host or alias for alias entries."); + $input_errors[] = gettext("Alias entries must be a single host or alias."); } } @@ -564,15 +564,15 @@ if ($_POST) { $input_errors[] = sprintf(gettext("The Source IP address %s Address Family differs from the destination %s."), $_POST['src'], $_POST['dst']); } if ((is_ipaddrv6($_POST['src']) || is_ipaddrv6($_POST['dst'])) && ($_POST['ipprotocol'] == "inet")) { - $input_errors[] = gettext("You can not use IPv6 addresses in IPv4 rules."); + $input_errors[] = gettext("IPv6 addresses can not be used in IPv4 rules."); } if ((is_ipaddrv4($_POST['src']) || is_ipaddrv4($_POST['dst'])) && ($_POST['ipprotocol'] == "inet6")) { - $input_errors[] = gettext("You can not use IPv4 addresses in IPv6 rules."); + $input_errors[] = gettext("IPv4 addresses can not be used in IPv6 rules."); } } if ((is_ipaddr($_POST['src']) || is_ipaddr($_POST['dst'])) && ($_POST['ipprotocol'] == "inet46")) { - $input_errors[] = gettext("You can not use a IPv4 or IPv6 address in combined IPv4 + IPv6 rules."); + $input_errors[] = gettext("An IPv4 or IPv6 address can not be used in combined IPv4 + IPv6 rules."); } if ($_POST['srcbeginport'] > $_POST['srcendport']) { @@ -598,26 +598,26 @@ if ($_POST) { if ($_POST['ackqueue'] != "") { if ($_POST['defaultqueue'] == "") { - $input_errors[] = gettext("You have to select a queue when you select an acknowledge queue too."); + $input_errors[] = gettext("A queue must be selected when an acknowledge queue is also selected."); } else if ($_POST['ackqueue'] == $_POST['defaultqueue']) { $input_errors[] = gettext("Acknowledge queue and Queue cannot be the same."); } } if (isset($_POST['floating']) && $_POST['pdnpipe'] != "" && (empty($_POST['direction']) || $_POST['direction'] == "any")) { - $input_errors[] = gettext("You can not use limiters in Floating rules without choosing a direction."); + $input_errors[] = gettext("Limiters can not be used in Floating rules without choosing a direction."); } if (isset($_POST['floating']) && $_POST['gateway'] != "" && (empty($_POST['direction']) || $_POST['direction'] == "any")) { - $input_errors[] = gettext("You can not use gateways in Floating rules without choosing a direction."); + $input_errors[] = gettext("Gateways can not be used in Floating rules without choosing a direction."); } if ($_POST['pdnpipe'] && $_POST['pdnpipe'] != "") { if ($_POST['dnpipe'] == "") { - $input_errors[] = gettext("You must select a queue for the In direction before selecting one for Out too."); + $input_errors[] = gettext("A queue must be selected for the In direction before selecting one for Out too."); } else if ($_POST['pdnpipe'] == $_POST['dnpipe']) { $input_errors[] = gettext("In and Out Queue cannot be the same."); } else if ($dnqlist[$_POST['pdnpipe']][0] == "?" && $dnqlist[$_POST['dnpipe']][0] <> "?") { - $input_errors[] = gettext("You cannot select one queue and one virtual interface for IN and Out. Both must be from the same type."); + $input_errors[] = gettext("A queue and a virtual interface cannot be selected for IN and Out. Both must be from the same type."); } else if ($dnqlist[$_POST['dnpipe']][0] == "?" && $dnqlist[$_POST['pdnpipe']][0] <> "?") { - $input_errors[] = gettext("You cannot select one queue and one virtual interface for IN and Out. Both must be from the same type."); + $input_errors[] = gettext("A queue and a virtual interface cannot be selected for IN and Out. Both must be from the same type."); } if ($_POST['direction'] == "out" && empty($_POST['gateway'])) { $input_errors[] = gettext("Please select a gateway, normally the interface selected gateway, so the limiters work correctly"); @@ -629,55 +629,55 @@ if ($_POST) { if (!in_array($_POST['proto'], array("tcp", "tcp/udp"))) { if (!empty($_POST['max-src-conn'])) { - $input_errors[] = gettext("You can only specify the maximum number of established connections per host (advanced option) for TCP protocol."); + $input_errors[] = gettext("The maximum number of established connections per host (advanced option) can only be specified for TCP protocol."); } if (!empty($_POST['max-src-conn-rate']) || !empty($_POST['max-src-conn-rates'])) { - $input_errors[] = gettext("You can only specify the maximum new connections per host / per second(s) (advanced option) for TCP protocol."); + $input_errors[] = gettext("The maximum new connections per host / per second(s) (advanced option) can only be specified for TCP protocol."); } if (!empty($_POST['statetimeout'])) { - $input_errors[] = gettext("You can only specify the state timeout (advanced option) for TCP protocol."); + $input_errors[] = gettext("The state timeout (advanced option) can only be specified for TCP protocol."); } } if ($_POST['type'] <> "pass") { if (!empty($_POST['max'])) { - $input_errors[] = gettext("You can only specify the maximum state entries (advanced option) for Pass type rules."); + $input_errors[] = gettext("The maximum state entries (advanced option) can only be specified for Pass type rules."); } if (!empty($_POST['max-src-nodes'])) { - $input_errors[] = gettext("You can only specify the maximum number of unique source hosts (advanced option) for Pass type rules."); + $input_errors[] = gettext("The maximum number of unique source hosts (advanced option) can only be specified for Pass type rules."); } if (!empty($_POST['max-src-conn'])) { - $input_errors[] = gettext("You can only specify the maximum number of established connections per host (advanced option) for Pass type rules."); + $input_errors[] = gettext("The maximum number of established connections per host (advanced option) can only be specified for Pass type rules."); } if (!empty($_POST['max-src-states'])) { - $input_errors[] = gettext("You can only specify the maximum state entries per host (advanced option) for Pass type rules."); + $input_errors[] = gettext("The maximum state entries per host (advanced option) can only be specified for Pass type rules."); } if (!empty($_POST['max-src-conn-rate']) || !empty($_POST['max-src-conn-rates'])) { - $input_errors[] = gettext("You can only specify the maximum new connections per host / per second(s) (advanced option) for Pass type rules."); + $input_errors[] = gettext("The maximum new connections per host / per second(s) (advanced option) can only be specified for Pass type rules."); } if (!empty($_POST['statetimeout'])) { - $input_errors[] = gettext("You can only specify the state timeout (advanced option) for Pass type rules."); + $input_errors[] = gettext("The state timeout (advanced option) can only be specified for Pass type rules."); } } if ($_POST['statetype'] == "none") { if (!empty($_POST['max'])) { - $input_errors[] = gettext("You cannot specify the maximum state entries (advanced option) if statetype is none."); + $input_errors[] = gettext("The maximum state entries (advanced option) cannot be specified if statetype is none."); } if (!empty($_POST['max-src-nodes'])) { - $input_errors[] = gettext("You cannot specify the maximum number of unique source hosts (advanced option) if statetype is none."); + $input_errors[] = gettext("The maximum number of unique source hosts (advanced option) cannot be specified if statetype is none."); } if (!empty($_POST['max-src-conn'])) { - $input_errors[] = gettext("You cannot specify the maximum number of established connections per host (advanced option) if statetype is none."); + $input_errors[] = gettext("The maximum number of established connections per host (advanced option) cannot be specified if statetype is none."); } if (!empty($_POST['max-src-states'])) { - $input_errors[] = gettext("You cannot specify the maximum state entries per host (advanced option) if statetype is none."); + $input_errors[] = gettext("The maximum state entries per host (advanced option) cannot be specified if statetype is none."); } if (!empty($_POST['max-src-conn-rate']) || !empty($_POST['max-src-conn-rates'])) { - $input_errors[] = gettext("You cannot specify the maximum new connections per host / per second(s) (advanced option) if statetype is none."); + $input_errors[] = gettext("The maximum new connections per host / per second(s) (advanced option) cannot be specified if statetype is none."); } if (!empty($_POST['statetimeout'])) { - $input_errors[] = gettext("You cannot specify the state timeout (advanced option) if statetype is none."); + $input_errors[] = gettext("The state timeout (advanced option) cannot be specified if statetype is none."); } } @@ -722,7 +722,7 @@ if ($_POST) { } } if (empty($outoftcpflags) && !empty($settcpflags)) { - $input_errors[] = gettext("If you specify TCP flags that should be set you should specify out of which flags as well."); + $input_errors[] = gettext("If TCP flags that should be set is specified, then out of which flags should be specified as well."); } } @@ -1161,7 +1161,7 @@ if ($if == "FloatingRules" || isset($pconfig['floating'])) { 'Quick', 'Apply the action immediately on match.', $pconfig['quick'] - ))->setHelp('Set this option if you need to apply this action to traffic that '. + ))->setHelp('Set this option to apply this action to traffic that '. 'matches this rule immediately.'); } @@ -1179,7 +1179,7 @@ if ($edit_disabled) { 'Associated filter rule', '<span class="help-block">' . 'This is associated with a NAT rule.<br/>' . - 'You cannot edit the interface, protocol, source, or destination of associated filter rules.'. + 'Editing the interface, protocol, source, or destination of associated filter rules is not permitted.'. $extra . '</span>' )); @@ -1277,14 +1277,14 @@ $section->addInput(new Form_Select( 'ICMP type', $pconfig['icmptype'], $icmptypes -))->setHelp('If you selected ICMP for the protocol above, you may specify an ICMP type here.'); +))->setHelp('If ICMP is selected for the protocol above, an ICMP type may be specified here.'); $section->addInput(new Form_Select( 'icmp6type', 'ICMPv6 type', $pconfig['icmptype'], $icmp6types -))->setHelp('If you selected ICMP for the protocol above, you may specify an ICMP type here.'); +))->setHelp('If ICMP is selected for the protocol above, an ICMP type may be specified here.'); $form->add($section); @@ -1411,11 +1411,11 @@ foreach (['src' => 'Source', 'dst' => 'Destination'] as $type => $name) { if ($type == 'src') $group->setHelp('Specify the source port or port range for this rule. This is '. 'usually random and almost never equal to the destination port range (and '. - 'should usually be <b>any</b>). You can leave the "To" field '. - 'empty if you only want to filter a single port.'); + 'should usually be <b>any</b>). The "To" field may be left '. + 'empty if only filtering a single port.'); else $group->setHelp('Specify the destination port or port range for this rule. ' . - 'You can leave the "To" field empty if you only want to filter a '. + 'The "To" field may be left empty if only filtering a '. 'single port.'); $group->addClass(($type == 'src') ? 'srcprtr':'dstprtr'); @@ -1430,7 +1430,7 @@ $section->addInput(new Form_Checkbox( 'Log packets that are handled by this rule', $pconfig['log'] ))->setHelp('Hint: the firewall has limited local log space. Don\'t turn on logging '. - 'for everything. If you want to do a lot of logging, consider using a remote '. + 'for everything. If doing a lot of logging, consider using a remote '. 'syslog server (see the <a href="status_logs_settings.php">Status: System Logs: '. 'Settings</a> page).'); @@ -1439,7 +1439,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $pconfig['descr'] -))->setHelp('You may enter a description here for your reference.'); +))->setHelp('A description may be entered here for administrative reference.'); $btnadv = new Form_Button( 'btnadvopts', @@ -1494,7 +1494,7 @@ $section->addInput(new Form_Input( 'Tag', 'text', $pconfig['tag'] -))->setHelp('You can mark a packet matching this rule and use this mark to match '. +))->setHelp('A packet matching this rule can be marked and this mark used to match '. 'on other NAT/filter rules. It is called <b>Policy filtering</b>.'); $section->addInput(new Form_Input( @@ -1502,7 +1502,7 @@ $section->addInput(new Form_Input( 'Tagged', 'text', $pconfig['tagged'] -))->setHelp('You can match packet on a mark placed before on another rule.'); +))->setHelp('A packet can be matched on a mark placed before on another rule.'); $section->addInput(new Form_Input( 'max', @@ -1577,7 +1577,7 @@ $section->addInput(new Form_Select( 'synproxy state' => gettext('Synproxy'), 'none' => gettext('None'), ) -))->setHelp('Select which type of state tracking mechanism you would like to use. If in doubt, use keep state' . '<br />' . +))->setHelp('Select which type of state tracking mechanism to use. If in doubt, use keep state' . '<br />' . '<span></span>'); $section->addInput(new Form_Checkbox( @@ -1666,9 +1666,9 @@ $group->add(new Form_Select( )); $section->add($group)->setHelp('Choose the Out queue/Virtual interface only if '. - 'you have also selected In. The Out selection is applied to traffic leaving '. + 'In is also selected. The Out selection is applied to traffic leaving '. 'the interface where the rule is created, the In selection is applied to traffic coming '. - 'into the chosen interface.<br />If you are creating a floating rule, if the '. + 'into the chosen interface.<br />If creating a floating rule, if the '. 'direction is In then the same rules apply, if the direction is Out the '. 'selections are reversed, Out is for incoming and In is for outgoing.' ); @@ -1702,7 +1702,7 @@ $group->add(new Form_Select( $list )); -$section->add($group)->setHelp('Choose the Acknowledge Queue only if you have '. +$section->add($group)->setHelp('Choose the Acknowledge Queue only if there is a '. 'selected Queue.' ); @@ -2028,7 +2028,7 @@ events.push(function() { } else if (val == 'synproxy state') { dispstr += 'Synproxy: proxies incoming TCP connections to help protect servers from spoofed TCP SYN floods. This option includes the functionality of keep state and modulate state combined'; } else if (val == 'none') { - dispstr += 'None: Do not use state mechanisms to keep track. This is only useful if you\'re doing advanced queueing in certain situations'; + dispstr += 'None: Do not use state mechanisms to keep track. This is only useful for doing advanced queueing in certain situations'; } dispstr += '</span>'; diff --git a/src/usr/local/www/firewall_schedule_edit.php b/src/usr/local/www/firewall_schedule_edit.php index 0022260..5ef540e 100644 --- a/src/usr/local/www/firewall_schedule_edit.php +++ b/src/usr/local/www/firewall_schedule_edit.php @@ -409,7 +409,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $pconfig['descr'] -))->setHelp('You may enter a description here for your reference (not parsed). '); +))->setHelp('A description may be entered here for administrative reference (not parsed). '); $section->addInput(new Form_Select( 'monthsel', @@ -462,7 +462,7 @@ $section->addInput(new Form_Input( 'Time range description', 'text', $pconfig['timerangedescr'] -))->setHelp('You may enter a description here for your reference (not parsed). '); +))->setHelp('A description may be entered here for administrative reference (not parsed). '); $group = new Form_Group(null); @@ -844,7 +844,7 @@ function update_month() { function checkForRanges() { if (daysSelected != "") { - alert("You have not saved the specified time range. Please click 'Add Time' button to save the time range."); + alert("The specified time range has not been saved. Please click 'Add Time' button to save the time range."); return false; } else { return true; @@ -1084,7 +1084,7 @@ function addTimeRange() { } else { //no days were selected, alert user - alert ("You must select at least 1 day before adding time"); + alert ("At least 1 day must be selected before adding time"); } } diff --git a/src/usr/local/www/firewall_shaper.php b/src/usr/local/www/firewall_shaper.php index b71a932..37d3754 100644 --- a/src/usr/local/www/firewall_shaper.php +++ b/src/usr/local/www/firewall_shaper.php @@ -200,7 +200,7 @@ if ($_GET) { } else if ($addnewaltq) { $q = new altq_root_queue(); } else { - $input_errors[] = gettext("Could not create new queue/discipline! Did you remember to apply any recent changes?"); + $input_errors[] = gettext("Could not create new queue/discipline! Any recent changes may need to be applied first."); } if ($q) { @@ -260,27 +260,6 @@ if ($_POST) { if ($addnewaltq) { $altq =& new altq_root_queue(); $altq->SetInterface($interface); - - switch ($altq->GetBwscale()) { - case "Mb": - $factor = 1000 * 1000; - break; - case "Kb": - $factor = 1000; - break; - case "b": - $factor = 1; - break; - case "Gb": - $factor = 1000 * 1000 * 1000; - break; - case "%": /* We don't use it for root_XXX queues. */ - default: /* XXX assume Kb by default. */ - $factor = 1000; - break; - } - - $altq->SetAvailableBandwidth($altq->GetBandwidth() * $factor); $altq->ReadConfig($_POST); $altq->validate_input($_POST, $input_errors); if (!$input_errors) { @@ -429,7 +408,7 @@ if ($savemsg) { } if (is_subsystem_dirty('shaper')) { - print_apply_box(gettext("The traffic shaper configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The traffic shaper configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } $tab_array = array(); diff --git a/src/usr/local/www/firewall_shaper_queues.php b/src/usr/local/www/firewall_shaper_queues.php index ce1f53f..283f776 100644 --- a/src/usr/local/www/firewall_shaper_queues.php +++ b/src/usr/local/www/firewall_shaper_queues.php @@ -236,7 +236,7 @@ if ($savemsg) { } if (is_subsystem_dirty('shaper')) { - print_apply_box(gettext("The traffic shaper configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The traffic shaper configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } $tab_array = array(); diff --git a/src/usr/local/www/firewall_shaper_vinterface.php b/src/usr/local/www/firewall_shaper_vinterface.php index 208d189..0830382 100644 --- a/src/usr/local/www/firewall_shaper_vinterface.php +++ b/src/usr/local/www/firewall_shaper_vinterface.php @@ -257,7 +257,7 @@ if ($_POST) { if ($addnewpipe) { if (!empty($dummynet_pipe_list[$qname])) { - $input_errors[] = gettext("You cannot name a child queue with the same name as a parent limiter"); + $input_errors[] = gettext("A child queue cannot be named the same as a parent limiter"); } else { $dnpipe =& new dnpipe_class(); @@ -283,7 +283,7 @@ if ($_POST) { } } else if ($parentqueue) { /* Add a new queue */ if (!empty($dummynet_pipe_list[$qname])) { - $input_errors[] = gettext("You cannot name a child queue with the same name as a parent limiter"); + $input_errors[] = gettext("A child queue cannot be named the same as a parent limiter"); } else if ($dnpipe) { $tmppath =& $dnpipe->GetLink(); array_push($tmppath, $qname); @@ -408,7 +408,7 @@ if ($savemsg) { } if (is_subsystem_dirty('shaper')) { - print_apply_box(gettext("The traffic shaper configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The traffic shaper configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } $tab_array = array(); diff --git a/src/usr/local/www/firewall_shaper_wizards.php b/src/usr/local/www/firewall_shaper_wizards.php index 3e15bb7..662351a 100644 --- a/src/usr/local/www/firewall_shaper_wizards.php +++ b/src/usr/local/www/firewall_shaper_wizards.php @@ -119,7 +119,7 @@ if ($savemsg) { } if (is_subsystem_dirty('shaper')) { - print_apply_box(gettext("The traffic shaper configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The traffic shaper configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } ?> diff --git a/src/usr/local/www/firewall_virtual_ip.php b/src/usr/local/www/firewall_virtual_ip.php index 9e24709..adf55df 100644 --- a/src/usr/local/www/firewall_virtual_ip.php +++ b/src/usr/local/www/firewall_virtual_ip.php @@ -276,7 +276,7 @@ if ($input_errors) { } else if ($savemsg) { print_info_box($savemsg, 'success'); } else if (is_subsystem_dirty('vip')) { - print_apply_box(gettext("The VIP configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The VIP configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } /* active tabs @@ -374,7 +374,7 @@ endforeach; <div class="infoblock"> <?php print_info_box(sprintf(gettext('The virtual IP addresses defined on this page may be used in %1$sNAT%2$s mappings.'), '<a href="firewall_nat.php">', '</a>') . '<br />' . - sprintf(gettext('You can check the status of your CARP Virtual IPs and interfaces %1$shere%2$s.'), '<a href="status_carp.php">', '</a>'), 'info', false); ?> + sprintf(gettext('Check the status of CARP Virtual IPs and interfaces %1$shere%2$s.'), '<a href="status_carp.php">', '</a>'), 'info', false); ?> </div> <?php diff --git a/src/usr/local/www/firewall_virtual_ip_edit.php b/src/usr/local/www/firewall_virtual_ip_edit.php index a666c31..3e3c6cd 100644 --- a/src/usr/local/www/firewall_virtual_ip_edit.php +++ b/src/usr/local/www/firewall_virtual_ip_edit.php @@ -180,9 +180,9 @@ if ($_POST) { } if (isset($network_addr) && $_POST['subnet'] == $network_addr) { - $input_errors[] = gettext("You cannot use the network address for this VIP"); + $input_errors[] = gettext("The network address cannot be used for this VIP"); } else if (isset($broadcast_addr) && $_POST['subnet'] == $broadcast_addr) { - $input_errors[] = gettext("You cannot use the broadcast address for this VIP"); + $input_errors[] = gettext("The broadcast address cannot be used for this VIP"); } } @@ -201,7 +201,7 @@ if ($_POST) { } if (empty($_POST['password'])) { - $input_errors[] = gettext("You must specify a CARP password that is shared between the two VHID members."); + $input_errors[] = gettext("A CARP password that is shared between the two VHID members must be specified."); } if ($_POST['password'] != $_POST['password_confirm']) { @@ -455,7 +455,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $pconfig['descr'] -))->setHelp('You may enter a description here for your reference (not parsed).'); +))->setHelp('A description may be entered here for administrative reference (not parsed).'); if (isset($id) && $a_vip[$id]){ $section->addInput(new Form_Input( diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc index 258dbd2..16d89db 100644 --- a/src/usr/local/www/guiconfig.inc +++ b/src/usr/local/www/guiconfig.inc @@ -384,7 +384,7 @@ function get_std_save_message($ok) { } } if ($filter_related) { - $to_return .= "<br />" . gettext("You can also <a href=\"status_filter_reload.php\">monitor</a> the filter reload progress."); + $to_return .= "<br />" . gettext("<a href=\"status_filter_reload.php\">Monitor</a> the filter reload progress."); } return $to_return; } diff --git a/src/usr/local/www/index.php b/src/usr/local/www/index.php index 31fd1ff..a435777 100644 --- a/src/usr/local/www/index.php +++ b/src/usr/local/www/index.php @@ -510,7 +510,7 @@ events.push(function() { // provide a warning message if the user tries to change page before saving $(window).bind('beforeunload', function(){ if (dirty) { - return ("<?=gettext('You have moved one or more widgets but have not yet saved')?>"); + return ("<?=gettext('One or more widgets have been moved but have not yet been saved')?>"); } else { return undefined; } diff --git a/src/usr/local/www/interfaces.php b/src/usr/local/www/interfaces.php index dbc821c..0d7bb6e 100644 --- a/src/usr/local/www/interfaces.php +++ b/src/usr/local/www/interfaces.php @@ -3078,7 +3078,7 @@ if (isset($wancfg['wireless'])) { $group->add(new Form_Input( 'auth_server_shared_secret', 'Shared Secret', - 'number', + 'text', $pconfig['auth_server_shared_secret'] ))->setHelp('RADIUS Shared secret for this firewall'); @@ -3102,7 +3102,7 @@ if (isset($wancfg['wireless'])) { $group->add(new Form_Input( 'auth_server_shared_secret2', 'Shared Secret', - 'number', + 'text', $pconfig['auth_server_shared_secret2'] ))->setHelp('RADIUS Shared secret for this firewall'); diff --git a/src/usr/local/www/load_balancer_monitor.php b/src/usr/local/www/load_balancer_monitor.php index d1a5d30..ea44692 100644 --- a/src/usr/local/www/load_balancer_monitor.php +++ b/src/usr/local/www/load_balancer_monitor.php @@ -118,7 +118,7 @@ if ($savemsg) { } if (is_subsystem_dirty('loadbalancer')) { - print_apply_box(gettext("The load balancer configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The load balancer configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } /* active tabs */ diff --git a/src/usr/local/www/load_balancer_monitor_edit.php b/src/usr/local/www/load_balancer_monitor_edit.php index 53c6978..26cddcb 100644 --- a/src/usr/local/www/load_balancer_monitor_edit.php +++ b/src/usr/local/www/load_balancer_monitor_edit.php @@ -127,7 +127,7 @@ if ($_POST) { } if (preg_match('/[ \/]/', $_POST['name'])) { - $input_errors[] = gettext("You cannot use spaces or slashes in the 'name' field."); + $input_errors[] = gettext("Spaces or slashes cannot be used in the 'name' field."); } if (strlen($_POST['name']) > 16) { diff --git a/src/usr/local/www/load_balancer_pool.php b/src/usr/local/www/load_balancer_pool.php index 8e28e9a..d325498 100644 --- a/src/usr/local/www/load_balancer_pool.php +++ b/src/usr/local/www/load_balancer_pool.php @@ -132,7 +132,7 @@ if ($savemsg) { } if (is_subsystem_dirty('loadbalancer')) { - print_apply_box(gettext("The load balancer configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The load balancer configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } /* active tabs */ diff --git a/src/usr/local/www/load_balancer_pool_edit.php b/src/usr/local/www/load_balancer_pool_edit.php index 6501335..551c3a0 100644 --- a/src/usr/local/www/load_balancer_pool_edit.php +++ b/src/usr/local/www/load_balancer_pool_edit.php @@ -116,7 +116,7 @@ if ($_POST) { } if (preg_match('/[ \/]/', $_POST['name'])) { - $input_errors[] = gettext("You cannot use spaces or slashes in the 'name' field."); + $input_errors[] = gettext("Spaces or slashes cannot be used in the 'name' field."); } if (strlen($_POST['name']) > 16) { @@ -361,7 +361,7 @@ $section->addInput(new Form_Input( 'Port', 'text', $pconfig['port'] -))->setHelp('This is the port your servers are listening on. You may also specify a port alias listed in Firewall -> Aliases here.'); +))->setHelp('This is the port the servers are listening on. A port alias listed in Firewall -> Aliases may also be specified here.'); $section->addInput(new Form_Input( 'retry', @@ -391,7 +391,7 @@ if (count($config['load_balancer']['monitor_type'])) { } else { $section->addInput(new Form_StaticText( 'Monitor', - 'Please add a monitor IP address on the monitors tab if you wish to use this feature."' + 'Please add a monitor IP address on the monitors tab to use this feature."' )); } diff --git a/src/usr/local/www/load_balancer_setting.php b/src/usr/local/www/load_balancer_setting.php index 6e04d2b..8212407 100644 --- a/src/usr/local/www/load_balancer_setting.php +++ b/src/usr/local/www/load_balancer_setting.php @@ -131,7 +131,7 @@ if ($savemsg) { } if (is_subsystem_dirty('loadbalancer')) { - print_apply_box(gettext("The load balancer configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The load balancer configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } /* active tabs */ diff --git a/src/usr/local/www/load_balancer_virtual_server.php b/src/usr/local/www/load_balancer_virtual_server.php index 18c2407..c2296b4 100644 --- a/src/usr/local/www/load_balancer_virtual_server.php +++ b/src/usr/local/www/load_balancer_virtual_server.php @@ -132,7 +132,7 @@ if ($savemsg) { } if (is_subsystem_dirty('loadbalancer')) { - print_apply_box(gettext("The virtual server configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The virtual server configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } /* active tabs */ diff --git a/src/usr/local/www/load_balancer_virtual_server_edit.php b/src/usr/local/www/load_balancer_virtual_server_edit.php index adf1b6a..bc80cb7 100644 --- a/src/usr/local/www/load_balancer_virtual_server_edit.php +++ b/src/usr/local/www/load_balancer_virtual_server_edit.php @@ -120,7 +120,7 @@ if ($_POST) { } if (preg_match('/[ \/]/', $_POST['name'])) { - $input_errors[] = gettext("You cannot use spaces or slashes in the 'name' field."); + $input_errors[] = gettext("Spaces or slashes cannot be used in the 'name' field."); } if (strlen($_POST['name']) > 32) { @@ -142,7 +142,7 @@ if ($_POST) { } if ((strtolower($_POST['relay_protocol']) == "dns") && !empty($_POST['sitedown'])) { - $input_errors[] = gettext("You cannot select a Fall Back Pool when using the DNS relay protocol."); + $input_errors[] = gettext("A Fall Back Pool cannot be selected when using the DNS relay protocol."); } if (!$input_errors) { @@ -222,9 +222,9 @@ $section->addInput(new Form_IpAddress( 'ipaddr', 'IP Address', $pconfig['ipaddr'] -))->setHelp('This is normally the WAN IP address that you would like the server to listen on. ' . +))->setHelp('This is normally the WAN IP address for the server to listen on. ' . 'All connections to this IP and port will be forwarded to the pool cluster. ' . - 'You may also specify a host alias listed in Firewall -> Aliases here.'); + 'A host alias listed in Firewall -> Aliases may also be specified here.'); $section->addInput(new Form_Input( 'port', @@ -233,7 +233,7 @@ $section->addInput(new Form_Input( $pconfig['port'] ))->setHelp('Port that the clients will connect to. All connections to this port will be forwarded to the pool cluster. ' . 'If left blank listening ports from the pool will be used.' . - 'You may also specify a port alias listed in Firewall -> Aliases here.'); + 'A port alias listed in Firewall -> Aliases may also be specified here.'); if (count($config['load_balancer']['lbpool']) == 0) { $section->addInput(new Form_StaticText( @@ -301,7 +301,7 @@ if (isset($id) && $a_vs[$id] && $_GET['act'] != 'dup') { $form->add($section); print($form); -print_info_box(gettext('Don\'t forget to add a firewall rule for the virtual server/pool after you have finished setting it up.')); +print_info_box(gettext('Don\'t forget to add a firewall rule for the virtual server/pool after finished setting it up.')); ?> <script type="text/javascript"> //<![CDATA[ diff --git a/src/usr/local/www/services_captiveportal.php b/src/usr/local/www/services_captiveportal.php index 9a34769..ed2d52b 100644 --- a/src/usr/local/www/services_captiveportal.php +++ b/src/usr/local/www/services_captiveportal.php @@ -640,7 +640,7 @@ $section->addInput(new Form_Input( 'Pre-authentication redirect URL', 'text', $pconfig['preauthurl'] -))->setHelp('Use this field to set $PORTAL_REDIRURL$ variable which can be accessed using your custom captive portal index.php page or error pages.'); +))->setHelp('Use this field to set $PORTAL_REDIRURL$ variable which can be accessed using the custom captive portal index.php page or error pages.'); $section->addInput(new Form_Input( 'redirurl', @@ -679,7 +679,7 @@ $section->addInput(new Form_Checkbox( 'Enable Pass-through MAC automatic additions', $pconfig['passthrumacadd'] ))->setHelp(sprintf('When enabled, a MAC passthrough entry is automatically added after the user has successfully authenticated. Users of that MAC address will ' . - 'never have to authenticate again. To remove the passthrough MAC entry you either have to log in and remove it manually from the ' . + 'never have to authenticate again. To remove the passthrough MAC entry either log in and remove it manually from the ' . '%s or send a POST from another system.' . 'If this is enabled, RADIUS MAC authentication cannot be used. Also, the logout window will not be shown.', '<a href="services_captiveportal_mac.php">MAC tab</a>')); @@ -689,7 +689,7 @@ $section->addInput(new Form_Checkbox( 'Enable Pass-through MAC automatic addition with username', $pconfig['passthrumacaddusername'] ))->setHelp(sprintf('If enabled with the automatically MAC passthrough entry created, the username used during authentication will be saved. ' . - 'To remove the passthrough MAC entry you either have to log in and remove it manually from the %s or send a POST from another system.', + 'To remove the passthrough MAC entry either log in and remove it manually from the %s or send a POST from another system.', '<a href="services_captiveportal_mac.php">MAC tab</a>')); $section->addInput(new Form_Checkbox( @@ -1022,7 +1022,7 @@ $section->addInput(new Form_Select( 'MAC address format', $pconfig['radmac_format'], ['default' => 'Default', 'singledash' => gettext('Single dash'), 'ietf' => 'IETF', 'cisco' => 'Cisco', 'unformatted' => gettext('Unformatted')] -))->setHelp('This option changes the MAC address format used in the whole RADIUS system. Change this if you also need to change the username format for ' . +))->setHelp('This option changes the MAC address format used in the whole RADIUS system. Change this if the username format also needs to be changed for ' . 'RADIUS MAC authentication.' . '<br />' . 'Default: 00:11:22:33:44:55' . '<br />' . 'Single dash: 001122-334455' . '<br />' . @@ -1048,7 +1048,7 @@ $section->addInput(new Form_Input( '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 your certificate ' . +))->setHelp('This name will be used in the form action for the HTTPS POST and should match the Common Name (CN) in the certificate ' . '(otherwise, the client browser will most likely display a security warning). ' . 'Make sure captive portal clients can resolve this name in DNS and verify on the client that the IP resolves to the correct interface IP on pfSense.'); @@ -1057,7 +1057,7 @@ $section->addInput(new Form_Select( 'SSL Certificate', $pconfig['certref'], build_cert_list() -))->setHelp('If no certificates are defined, you may define one here: ' . '<a href="system_certmanager.php">System > Cert. Manager</a>'); +))->setHelp('If no certificates are defined, one may be defined here: ' . '<a href="system_certmanager.php">System > Cert. Manager</a>'); $section->addInput(new Form_Checkbox( 'nohttpsforwards', @@ -1132,8 +1132,8 @@ $section->addInput(new Form_Input( 'Auth error page contents', 'file', $pconfig['errfile'] -))->setHelp('The contents of the HTML/PHP file that you upload here are displayed when an authentication error occurs. ' . - 'You may include "$PORTAL_MESSAGE$", which will be replaced by the error or reply messages from the RADIUS ' . +))->setHelp('The contents of the HTML/PHP file that is uploaded here are displayed when an authentication error occurs. ' . + 'It may include "$PORTAL_MESSAGE$", which will be replaced by the error or reply messages from the RADIUS ' . 'server, if any.')->addClass('btn btn-info btn-sm'); if ($pconfig['page']['errtext']) { @@ -1166,7 +1166,7 @@ $section->addInput(new Form_Input( 'Logout page contents', 'file', $pconfig['logoutfile'] -))->setHelp('The contents of the HTML/PHP file that you upload here are displayed on authentication success when the logout popup is enabled.')->addClass('btn btn-info btn-sm'); +))->setHelp('The contents of the HTML/PHP file that is uploaded here are displayed on authentication success when the logout popup is enabled.')->addClass('btn btn-info btn-sm'); if ($pconfig['page']['logouttext']) { $group = new Form_Group('Current Logout Page'); @@ -1202,7 +1202,7 @@ $section->addInput(new Form_Input( $form->add($section); print($form); -print_info_box(gettext('Don\'t forget to enable the DHCP server on your captive portal interface! ' . +print_info_box(gettext('Don\'t forget to enable the DHCP server on the captive portal interface! ' . 'Make sure that the default/maximum DHCP lease time is higher than the hard timeout entered on this page. ' . 'Also, the DNS Forwarder or Resolver must be enabled for DNS lookups by unauthenticated clients to work.')); diff --git a/src/usr/local/www/services_captiveportal_filemanager.php b/src/usr/local/www/services_captiveportal_filemanager.php index f7b1637..68834a7 100644 --- a/src/usr/local/www/services_captiveportal_filemanager.php +++ b/src/usr/local/www/services_captiveportal_filemanager.php @@ -276,14 +276,14 @@ endif; <div class="infoblock panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=gettext("Notes");?></h2></div> <div class="panel-body"> - <?=gettext("Any files that you upload here with the filename prefix of captiveportal- will " . + <?=gettext("Any files that are uploaded here with the filename prefix of captiveportal- will " . "be made available in the root directory of the captive portal HTTP(S) server. " . - "You may reference them directly from your portal page HTML code using relative paths. " . - "Example: you've uploaded an image with the name 'captiveportal-test.jpg' using the " . - "file manager. Then you can include it in your portal page like this:")?><br /><br /> + "They may be referenced directly from the portal page HTML code using relative paths. " . + "Example: An image uploaded with the name 'captiveportal-test.jpg' using the " . + "file manager can then be included in the portal page like this:")?><br /><br /> <pre><img src="captiveportal-test.jpg" width=... height=...></pre><br /> - <?=gettext("In addition, you can also upload .php files for execution. You can pass the filename " . - "to your custom page from the initial page by using text similar to:")?><br /><br /> + <?=gettext("In addition, .php files can also be uploaded for execution. The filename can be passed " . + "to the custom page from the initial page by using text similar to:")?><br /><br /> <pre><a href="/captiveportal-aup.php?zone=$PORTAL_ZONE$&redirurl=$PORTAL_REDIRURL$"><?=gettext("Acceptable usage policy"); ?></a></pre><br /> <?=sprintf(gettext("The total size limit for all files is %s."), format_bytes($g['captiveportal_element_sizelimit']))?> </div> diff --git a/src/usr/local/www/services_captiveportal_hostname_edit.php b/src/usr/local/www/services_captiveportal_hostname_edit.php index b98add5..9ab00e5 100644 --- a/src/usr/local/www/services_captiveportal_hostname_edit.php +++ b/src/usr/local/www/services_captiveportal_hostname_edit.php @@ -223,7 +223,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $pconfig['descr'] -))->setHelp('You may enter a description here for your reference (not parsed).'); +))->setHelp('A description may be entered here for administrative reference (not parsed).'); $section->addInput(new Form_Input( 'bw_up', diff --git a/src/usr/local/www/services_captiveportal_mac.php b/src/usr/local/www/services_captiveportal_mac.php index d07260a..d80600b 100644 --- a/src/usr/local/www/services_captiveportal_mac.php +++ b/src/usr/local/www/services_captiveportal_mac.php @@ -189,7 +189,7 @@ if ($savemsg) { } if (is_subsystem_dirty('passthrumac')) { - print_apply_box(gettext("The Captive Portal MAC address configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The Captive Portal MAC address configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } $tab_array = array(); diff --git a/src/usr/local/www/services_captiveportal_mac_edit.php b/src/usr/local/www/services_captiveportal_mac_edit.php index 5459e00..a838292 100644 --- a/src/usr/local/www/services_captiveportal_mac_edit.php +++ b/src/usr/local/www/services_captiveportal_mac_edit.php @@ -139,7 +139,7 @@ if ($_POST) { $iflist = get_interface_list(); foreach ($iflist as $if) { if ($_POST['mac'] == strtolower($if['mac'])) { - $input_errors[] = sprintf(gettext("The MAC address %s belongs to a local interface, you cannot use it here."), $_POST['mac']); + $input_errors[] = sprintf(gettext("The MAC address %s belongs to a local interface. It cannot be used here."), $_POST['mac']); break; } } @@ -264,7 +264,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $pconfig['descr'] -))->setHelp('You may enter a description here for your reference (not parsed)'); +))->setHelp('A description may be entered here for administrative reference (not parsed)'); $section->addInput(new Form_Input( 'bw_up', diff --git a/src/usr/local/www/services_captiveportal_vouchers.php b/src/usr/local/www/services_captiveportal_vouchers.php index 57eb862..2fd9f83 100644 --- a/src/usr/local/www/services_captiveportal_vouchers.php +++ b/src/usr/local/www/services_captiveportal_vouchers.php @@ -276,7 +276,7 @@ if ($_POST) { $input_errors[] = gettext("This doesn't look like an RSA Private key."); } if ($_POST['vouchersyncdbip'] && (is_ipaddr_configured($_POST['vouchersyncdbip']))) { - $input_errors[] = gettext("You cannot sync the voucher database to this host (itself)."); + $input_errors[] = gettext("The voucher database cannot be sync'd to this host (itself)."); } if ($_POST['vouchersyncpass'] != $_POST['vouchersyncpass_confirm']) { $input_errors[] = gettext("Password and confirmed password must match."); diff --git a/src/usr/local/www/services_captiveportal_zones.php b/src/usr/local/www/services_captiveportal_zones.php index e388869..334ac18 100644 --- a/src/usr/local/www/services_captiveportal_zones.php +++ b/src/usr/local/www/services_captiveportal_zones.php @@ -99,7 +99,7 @@ if ($savemsg) { } if (is_subsystem_dirty('captiveportal')) { - print_apply_box(gettext("The Captive Portal entry list has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The Captive Portal entry list has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } ?> <form action="services_captiveportal_zones.php" method="post"> diff --git a/src/usr/local/www/services_captiveportal_zones_edit.php b/src/usr/local/www/services_captiveportal_zones_edit.php index 0d3f8c6..12fbc0e 100644 --- a/src/usr/local/www/services_captiveportal_zones_edit.php +++ b/src/usr/local/www/services_captiveportal_zones_edit.php @@ -126,7 +126,7 @@ $section->addInput(new Form_Input( $section->addInput(new Form_Input( 'descr', 'Zone description' -))->setHelp('You may enter a description here for your reference (not parsed).'); +))->setHelp('A description may be entered here for administrative reference (not parsed).'); $form->add($section); diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php index 3139cb3..22b98bc 100644 --- a/src/usr/local/www/services_dhcp.php +++ b/src/usr/local/www/services_dhcp.php @@ -336,7 +336,7 @@ if (isset($_POST['save'])) { } if (($_POST['ddnsdomainkey'] && !$_POST['ddnsdomainkeyname']) || ($_POST['ddnsdomainkeyname'] && !$_POST['ddnsdomainkey'])) { - $input_errors[] = gettext("You must specify both a valid domain key and key name."); + $input_errors[] = gettext("Both a valid domain key and key name must be specified."); } if ($_POST['domainsearchlist']) { $domain_array = preg_split("/[ ;]+/", $_POST['domainsearchlist']); @@ -350,10 +350,10 @@ if (isset($_POST['save'])) { // Validate MACs if (!empty($_POST['mac_allow']) && !validate_partial_mac_list($_POST['mac_allow'])) { - $input_errors[] = gettext("If you specify a mac allow list, it must contain only valid partial MAC addresses."); + $input_errors[] = gettext("If a mac allow list is specified, it must contain only valid partial MAC addresses."); } if (!empty($_POST['mac_deny']) && !validate_partial_mac_list($_POST['mac_deny'])) { - $input_errors[] = gettext("If you specify a mac deny list, it must contain only valid partial MAC addresses."); + $input_errors[] = gettext("If a mac deny list is specified, it must contain only valid partial MAC addresses."); } if (($_POST['ntp1'] && !is_ipaddrv4($_POST['ntp1'])) || ($_POST['ntp2'] && !is_ipaddrv4($_POST['ntp2']))) { @@ -370,10 +370,10 @@ if (isset($_POST['save'])) { } if (gen_subnet($ifcfgip, $ifcfgsn) == $_POST['range_from']) { - $input_errors[] = gettext("You cannot use the network address in the starting subnet range."); + $input_errors[] = gettext("The network address cannot be used in the starting subnet range."); } if (gen_subnet_max($ifcfgip, $ifcfgsn) == $_POST['range_to']) { - $input_errors[] = gettext("You cannot use the broadcast address in the ending subnet range."); + $input_errors[] = gettext("The broadcast address cannot be used in the ending subnet range."); } // Disallow a range that includes the virtualip @@ -397,7 +397,7 @@ if (isset($_POST['save'])) { } if ($_POST['staticarp'] && $noip) { - $input_errors[] = gettext("Cannot enable static ARP when you have static map entries without IP addresses. Ensure all static maps have IP addresses and try again."); + $input_errors[] = gettext("Cannot enable static ARP when there are static map entries without IP addresses. Ensure all static maps have IP addresses and try again."); } if (is_array($pconfig['numberoptions']['item'])) { @@ -465,7 +465,7 @@ if (isset($_POST['save'])) { /* make sure that the DHCP Relay isn't enabled on this interface */ if (isset($config['dhcrelay']['enable']) && (stristr($config['dhcrelay']['interface'], $if) !== false)) { - $input_errors[] = sprintf(gettext("You must disable the DHCP relay on the %s interface before enabling the DHCP server."), $iflist[$if]); + $input_errors[] = sprintf(gettext("The DHCP relay on the %s interface must be disabled before enabling the DHCP server."), $iflist[$if]); } if (is_array($a_maps)) { @@ -747,7 +747,7 @@ if (isset($config['dhcrelay']['enable'])) { } if (is_subsystem_dirty('staticmaps')) { - print_apply_box(gettext("The static mapping configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The static mapping configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } /* active tabs */ @@ -891,7 +891,7 @@ if (!is_numeric($pool) && !($act == "newpool")) { $section->addInput(new Form_StaticText( 'Add', $btnaddpool - ))->setHelp('If you need additional pools of addresses inside of this subnet outside the above Range, they may be specified here'); + ))->setHelp('If additional pools of addresses are needed inside of this subnet outside the above Range, they may be specified here'); if (is_array($a_pools)) { $section->addInput(new Form_StaticText( @@ -934,14 +934,14 @@ $section->addInput(new Form_IpAddress( 'Gateway', $pconfig['gateway'] ))->setPattern('[.a-zA-Z0-9_]+') - ->setHelp('The default is to use the IP on this interface of the firewall as the gateway. Specify an alternate gateway here if this is not the correct gateway for your network. Type "none" for no gateway assignment'); + ->setHelp('The default is to use the IP on this interface of the firewall as the gateway. Specify an alternate gateway here if this is not the correct gateway for the network. Type "none" for no gateway assignment'); $section->addInput(new Form_Input( 'domain', 'Domain name', 'text', $pconfig['domain'] -))->setHelp('The default is to use the domain name of this system as the default domain name provided by DHCP. You may specify an alternate domain name here'); +))->setHelp('The default is to use the domain name of this system as the default domain name provided by DHCP. An alternate domain name may be specified here'); $section->addInput(new Form_Input( 'domainsearchlist', @@ -1167,7 +1167,7 @@ $section->addClass('adnlopts'); $section->addInput(new Form_StaticText( null, - '<div class="alert alert-info"> ' . gettext('Enter the DHCP option number and the value for each item you would like to include in the DHCP lease information.') . ' ' . + '<div class="alert alert-info"> ' . gettext('Enter the DHCP option number and the value for each item to include in the DHCP lease information.') . ' ' . sprintf(gettext('For a list of available options please visit this %1$s URL%2$s'), '<a href="http://www.iana.org/assignments/bootp-dhcp-parameters/" target="_blank">', '</a></div>') )); @@ -1276,8 +1276,8 @@ $section->addInput(new Form_Input( 'UEFI 64 bit file name', 'text', $pconfig['filename64'] -))->setHelp('You need both a filename and a boot server configured for this to work! ' . - 'You will need all three filenames and a boot server configured for UEFI to work! '); +))->setHelp('Both a filename and a boot server must be configured for this to work! ' . + 'All three filenames and a configured boot server are necessary for UEFI to work! '); $section->addInput(new Form_Input( 'rootpath', diff --git a/src/usr/local/www/services_dhcp_edit.php b/src/usr/local/www/services_dhcp_edit.php index 6ab36ce..0cd6354 100644 --- a/src/usr/local/www/services_dhcp_edit.php +++ b/src/usr/local/www/services_dhcp_edit.php @@ -214,7 +214,7 @@ if ($_POST) { $input_errors[] = gettext("A valid MAC address must be specified."); } if ($static_arp_enabled && !$_POST['ipaddr']) { - $input_errors[] = gettext("Static ARP is enabled. You must specify an IP address."); + $input_errors[] = gettext("Static ARP is enabled. An IP address must be specified."); } /* check for overlaps */ @@ -299,7 +299,7 @@ if ($_POST) { } if (($_POST['ddnsdomainkey'] && !$_POST['ddnsdomainkeyname']) || ($_POST['ddnsdomainkeyname'] && !$_POST['ddnsdomainkey'])) { - $input_errors[] = gettext("You must specify both a valid domain key and key name."); + $input_errors[] = gettext("Both a valid domain key and key name must be specified."); } if ($_POST['domainsearchlist']) { $domain_array=preg_split("/[ ;]+/", $_POST['domainsearchlist']); @@ -489,7 +489,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $pconfig['descr'] -))->setHelp('You may enter a description here for your reference (not parsed).'); +))->setHelp('A description may be entered here for administrative reference (not parsed).'); $section->addInput(new Form_Checkbox( 'arp_table_static_entry', @@ -560,14 +560,14 @@ $section->addInput(new Form_Input( 'Gateway', 'text', $pconfig['gateway'] -))->setHelp('The default is to use the IP on this interface of the firewall as the gateway. Specify an alternate gateway here if this is not the correct gateway for your network.'); +))->setHelp('The default is to use the IP on this interface of the firewall as the gateway. Specify an alternate gateway here if this is not the correct gateway for the network.'); $section->addInput(new Form_Input( 'domain', 'Domain name', 'text', $pconfig['domain'] -))->setHelp('The default is to use the domain name of this system as the default domain name provided by DHCP. You may specify an alternate domain name here. '); +))->setHelp('The default is to use the domain name of this system as the default domain name provided by DHCP. An alternate domain name may be specified here. '); $section->addInput(new Form_Input( 'domainsearchlist', diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php index 9da4609..4cbc02b 100644 --- a/src/usr/local/www/services_dhcpv6.php +++ b/src/usr/local/www/services_dhcpv6.php @@ -326,7 +326,7 @@ if (isset($_POST['apply'])) { } if (($_POST['ddnsdomainkey'] && !$_POST['ddnsdomainkeyname']) || ($_POST['ddnsdomainkeyname'] && !$_POST['ddnsdomainkey'])) { - $input_errors[] = gettext("You must specify both a valid domain key and key name."); + $input_errors[] = gettext("Both a valid domain key and key name must be specified."); } if ($_POST['domainsearchlist']) { $domain_array=preg_split("/[ ;]+/", $_POST['domainsearchlist']); @@ -388,7 +388,7 @@ if (isset($_POST['apply'])) { /* make sure that the DHCP Relay isn't enabled on this interface */ if (isset($config['dhcrelay'][$if]['enable'])) { - $input_errors[] = sprintf(gettext("You must disable the DHCP relay on the %s interface before enabling the DHCP server."), $iflist[$if]); + $input_errors[] = sprintf(gettext("The DHCP relay on the %s interface must be disabled before enabling the DHCP server."), $iflist[$if]); } @@ -504,7 +504,7 @@ if ($_GET['act'] == "del") { $pgtitle = array(gettext("Services"), htmlspecialchars(gettext("DHCPv6 Server & RA"))); -if (!empty($if) && !$dhcrelay_enabled && isset($iflist[$if])) { +if (!empty($if) && isset($iflist[$if])) { $pgtitle[] = $iflist[$if]; $pgtitle[] = gettext("DHCPv6 Server"); } @@ -522,12 +522,10 @@ if ($savemsg) { if ($dhcrelay_enabled) { print_info_box(gettext("DHCPv6 Relay is currently enabled. Cannot enable the DHCPv6 Server service while the DHCPv6 Relay is enabled on any interface."), 'danger', false); - include("foot.inc"); - exit; } if (is_subsystem_dirty('staticmaps')) { - print_apply_box(gettext('The static mapping configuration has been changed.') . '<br />' . gettext('You must apply the changes in order for them to take effect.')); + print_apply_box(gettext('The static mapping configuration has been changed.') . '<br />' . gettext('The changes must be applied for them to take effect.')); } /* active tabs */ @@ -590,6 +588,11 @@ $tab_array[] = array(gettext("DHCPv6 Server"), true, "services_dhcpv6.php?if={ $tab_array[] = array(gettext("Router Advertisements"), false, "services_router_advertisements.php?if={$if}"); display_top_tabs($tab_array, false, 'nav nav-tabs'); +if ($dhcrelay_enabled) { + include("foot.inc"); + exit; +} + $form = new Form(); $section = new Form_Section('DHCPv6 Options'); @@ -696,7 +699,7 @@ $section->addInput(new Form_Select( '63' => '63', '64' => '64' ) -))->setHelp('You can define a Prefix range here for DHCP Prefix Delegation. This allows for assigning networks to subrouters. The start and end of the range must end on boundaries of the prefix delegation size.'); +))->setHelp('A Prefix range can be defined here for DHCP Prefix Delegation. This allows for assigning networks to subrouters. The start and end of the range must end on boundaries of the prefix delegation size.'); $group = new Form_Group('DNS Servers'); @@ -718,7 +721,7 @@ $section->addInput(new Form_Input( 'Domain Name', 'text', $pconfig['domain'] -))->setHelp('The default is to use the domain name of this system as the default domain name provided by DHCP. You may specify an alternate domain name here. '); +))->setHelp('The default is to use the domain name of this system as the default domain name provided by DHCP. An alternate domain name may be specified here. '); $section->addInput(new Form_Input( 'domainsearchlist', diff --git a/src/usr/local/www/services_dhcpv6_edit.php b/src/usr/local/www/services_dhcpv6_edit.php index 31e759b..747388d 100644 --- a/src/usr/local/www/services_dhcpv6_edit.php +++ b/src/usr/local/www/services_dhcpv6_edit.php @@ -274,7 +274,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $pconfig['descr'] -))->setHelp('You may enter a description here for your reference (not parsed).'); +))->setHelp('A description may be entered here for administrative reference (not parsed).'); if($netboot_enabled) { $section->addInput(new Form_Input( diff --git a/src/usr/local/www/services_dnsmasq.php b/src/usr/local/www/services_dnsmasq.php index 9dd8591..e0ad975 100644 --- a/src/usr/local/www/services_dnsmasq.php +++ b/src/usr/local/www/services_dnsmasq.php @@ -138,7 +138,7 @@ if ($_POST) { if (is_port($_POST['port'])) { $config['dnsmasq']['port'] = $_POST['port']; } else { - $input_errors[] = gettext("You must specify a valid port number"); + $input_errors[] = gettext("A valid port number must be specified."); } } else if (isset($config['dnsmasq']['port'])) { unset($config['dnsmasq']['port']); @@ -225,7 +225,7 @@ if ($savemsg) { } if (is_subsystem_dirty('hosts')) { - print_apply_box(gettext("The DNS forwarder configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The DNS forwarder configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } $form = new Form(); @@ -247,8 +247,8 @@ $section->addInput(new Form_Checkbox( ))->setHelp(sprintf("If this option is set, then machines that specify". " their hostname when requesting a DHCP lease will be registered". " in the DNS forwarder, so that their name can be resolved.". - " You should also set the domain in %sSystem:". - " General setup%s to the proper value.",'<a href="system.php">','</a>')) + " The domain in %sSystem: General setup%s should also". + " be set to the proper value.",'<a href="system.php">','</a>')) ->addClass('toggle-dhcp'); $section->addInput(new Form_Checkbox( @@ -258,8 +258,8 @@ $section->addInput(new Form_Checkbox( $pconfig['regdhcpstatic'] ))->setHelp(sprintf("If this option is set, then DHCP static mappings will ". "be registered in the DNS forwarder, so that their name can be ". - "resolved. You should also set the domain in %s". - "System: General setup%s to the proper value.",'<a href="system.php">','</a>')) + "resolved. The domain in %sSystem: General setup%s should also ". + "be set to the proper value.",'<a href="system.php">','</a>')) ->addClass('toggle-dhcp'); $section->addInput(new Form_Checkbox( @@ -336,7 +336,7 @@ $section->addInput(new Form_Textarea( 'custom_options', 'Custom options', $pconfig['custom_options'] -))->setHelp('Enter any additional options you would like to add to the dnsmasq configuration here, separated by a space or newline') +))->setHelp('Enter any additional options to add to the dnsmasq configuration here, separated by a space or newline') ->addClass('advanced'); $form->add($section); @@ -350,8 +350,8 @@ print_callout('<p>' . ' serve the LAN IP address as a DNS server to DHCP clients so they will use the forwarder.') . '</p><p>' . sprintf(gettext('The DNS forwarder will use the DNS servers entered in %1$sSystem > General Setup%2$s or' . ' those obtained via DHCP or PPP on WAN if "Allow DNS server list to be overridden by DHCP/PPP on WAN" is checked.' . - ' If you don\'t use that option (or if you use a static IP address on WAN),' . - ' you must manually specify at least one DNS server on the %1$sSystem > General Setup%2$s page.'), + ' If that option is not used (or if a static IP address is used on WAN),' . + ' at least one DNS server must be manually specified on the %1$sSystem > General Setup%2$s page.'), '<a href="system.php">', '</a>') . '</p>' diff --git a/src/usr/local/www/services_dnsmasq_domainoverride_edit.php b/src/usr/local/www/services_dnsmasq_domainoverride_edit.php index 5354e3c..806a0f0 100644 --- a/src/usr/local/www/services_dnsmasq_domainoverride_edit.php +++ b/src/usr/local/www/services_dnsmasq_domainoverride_edit.php @@ -183,14 +183,14 @@ $section->addInput(new Form_IpAddress( 'dnssrcip', 'Source IP', $pconfig['dnssrcip'] -))->setHelp('Source IP address for queries to the DNS server for the override domain. Leave blank unless your DNS server is accessed through a VPN tunnel.'); +))->setHelp('Source IP address for queries to the DNS server for the override domain. Leave blank unless the DNS server is accessed through a VPN tunnel.'); $section->addInput(new Form_Input( 'descr', 'Description', 'text', $pconfig['descr'] -))->setHelp('You may enter a description here for your reference (not parsed).'); +))->setHelp('A description may be entered here for administrative reference (not parsed).'); if (isset($id) && $a_domainOverrides[$id]) { $section->addInput(new Form_Input( diff --git a/src/usr/local/www/services_dnsmasq_edit.php b/src/usr/local/www/services_dnsmasq_edit.php index db565e0..bbebb02 100644 --- a/src/usr/local/www/services_dnsmasq_edit.php +++ b/src/usr/local/www/services_dnsmasq_edit.php @@ -269,7 +269,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $pconfig['descr'] -))->setHelp('You may enter a description here for your reference (not parsed).'); +))->setHelp('A description may be entered here for administrative reference (not parsed).'); if (isset($id) && $a_hosts[$id]) { $section->addInput(new Form_Input( diff --git a/src/usr/local/www/services_dyndns.php b/src/usr/local/www/services_dyndns.php index a1e3fa6..f0de114 100644 --- a/src/usr/local/www/services_dyndns.php +++ b/src/usr/local/www/services_dyndns.php @@ -248,7 +248,7 @@ foreach ($a_dyndns as $dyndns): <div> <?=gettext('IP addresses appearing in <span class="text-success">green</span> are up to date with Dynamic DNS provider. ')?> - <?=gettext('You can force an update for an IP address on the edit page for that service.')?> + <?=gettext('An update for an IP address can be forced on the edit page for that service.')?> </div> <?php diff --git a/src/usr/local/www/services_dyndns_edit.php b/src/usr/local/www/services_dyndns_edit.php index 55cfe08..5ca0714 100644 --- a/src/usr/local/www/services_dyndns_edit.php +++ b/src/usr/local/www/services_dyndns_edit.php @@ -333,8 +333,8 @@ $group->add(new Form_Input( )); $group->setHelp('Enter the complete fully qualified domain name. Example: myhost.dyndns.org'. '<br />' . - 'he.net tunnelbroker: Enter your tunnel ID' . '<br />' . - 'GleSYS: Enter your record ID' . '<br />' . + 'he.net tunnelbroker: Enter the tunnel ID' . '<br />' . + 'GleSYS: Enter the record ID' . '<br />' . 'DNSimple: Enter only the domain name.' . '<br />' . 'Namecheap: Enter the hostname and the domain separately, with the domain being the domain or subdomain zone being handled by Namecheap.'); @@ -345,8 +345,8 @@ $section->addInput(new Form_Input( 'MX', 'text', $pconfig['mx'] -))->setHelp('Note: With DynDNS service you can only use a hostname, not an IP address. '. - 'Set this option only if you need a special MX record. Not all services support this.'); +))->setHelp('Note: With DynDNS service only a hostname can be used, not an IP address. '. + 'Set this option only if a special MX record is needed. Not all services support this.'); $section->addInput(new Form_Checkbox( 'wildcard', @@ -382,8 +382,8 @@ $section->addInput(new Form_Input( 'text', $pconfig['username'] ))->setHelp('Username is required for all types except Namecheap, FreeDNS and Custom Entries.' . '<br />' . - 'Route 53: Enter your Access Key ID.' . '<br />' . - 'GleSYS: Enter your API user.' . '<br />' . + 'Route 53: Enter the Access Key ID.' . '<br />' . + 'GleSYS: Enter the API user.' . '<br />' . 'For Custom Entries, Username and Password represent HTTP Authentication username and passwords.'); $section->addPassword(new Form_Input( @@ -391,17 +391,17 @@ $section->addPassword(new Form_Input( 'Password', 'password', $pconfig['password'] -))->setHelp('FreeDNS (freedns.afraid.org): Enter your "Authentication Token" provided by FreeDNS.' . '<br />' . - 'Route 53: Enter your Secret Access Key.' . '<br />' . - 'GleSYS: Enter your API key.' . '<br />' . - 'DNSimple: Enter your API token.'); +))->setHelp('FreeDNS (freedns.afraid.org): Enter the "Authentication Token" provided by FreeDNS.' . '<br />' . + 'Route 53: Enter the Secret Access Key.' . '<br />' . + 'GleSYS: Enter the API key.' . '<br />' . + 'DNSimple: Enter the API token.'); $section->addInput(new Form_Input( 'zoneid', 'Zone ID', 'text', $pconfig['zoneid'] -))->setHelp('Enter Zone ID that you received when you created your domain in Route 53.' . '<br />' . +))->setHelp('Enter Zone ID that was received when creating the domain in Route 53.' . '<br />' . 'DNSimple: Enter the Record ID of record to update.'); $section->addInput(new Form_Input( @@ -415,9 +415,9 @@ $section->addInput(new Form_Textarea( 'resultmatch', 'Result Match', $pconfig['resultmatch'] -))->sethelp('This field should be identical to what your DDNS Provider will return if the update succeeds, leave it blank to disable checking of returned results.' . '<br />' . - 'If you need the new IP to be included in the request, put %IP% in its place.' . '<br />' . - 'If you need to include multiple possible values, separate them with a |. If your provider includes a |, escape it with \\|)' . '<br />' . +))->sethelp('This field should be identical to what the DDNS Provider will return if the update succeeds, leave it blank to disable checking of returned results.' . '<br />' . + 'To include the new IP in the request, put %IP% in its place.' . '<br />' . + 'To include multiple possible values, separate them with a |. If the provider includes a |, escape it with \\|)' . '<br />' . 'Tabs (\\t), newlines (\\n) and carriage returns (\\r) at the beginning or end of the returned results are removed before comparison.'); $section->addInput(new Form_Input( @@ -425,14 +425,14 @@ $section->addInput(new Form_Input( 'TTL', 'text', $pconfig['ttl'] -))->setHelp('Choose TTL for your dns record.'); +))->setHelp('Choose TTL for the dns record.'); $section->addInput(new Form_Input( 'descr', 'Description', 'text', $pconfig['descr'] -))->setHelp('You may enter a description here for your reference (not parsed).'); +))->setHelp('A description may be entered here for administrative reference (not parsed).'); if (isset($id) && $a_dyndns[$id]) { $section->addInput(new Form_Input( diff --git a/src/usr/local/www/services_igmpproxy.php b/src/usr/local/www/services_igmpproxy.php index b2e1ab3..40344b3 100644 --- a/src/usr/local/www/services_igmpproxy.php +++ b/src/usr/local/www/services_igmpproxy.php @@ -106,7 +106,7 @@ if ($savemsg) { } if (is_subsystem_dirty('igmpproxy')) { - print_apply_box(gettext('The IGMP entry list has been changed.') . '<br />' . gettext('You must apply the changes in order for them to take effect.')); + print_apply_box(gettext('The IGMP entry list has been changed.') . '<br />' . gettext('The changes must be applied for them to take effect.')); } ?> @@ -180,7 +180,7 @@ endforeach; </nav> <div class="infoblock"> -<?php print_info_box(gettext('Please add the interface for upstream, the allowed subnets, and the downstream interfaces you would like the proxy to allow. ' . +<?php print_info_box(gettext('Please add the interface for upstream, the allowed subnets, and the downstream interfaces for the proxy to allow. ' . 'Only one "upstream" interface can be configured.'), 'info', false); ?> </div> <?php diff --git a/src/usr/local/www/services_igmpproxy_edit.php b/src/usr/local/www/services_igmpproxy_edit.php index f12e1ad..c26cd9f 100644 --- a/src/usr/local/www/services_igmpproxy_edit.php +++ b/src/usr/local/www/services_igmpproxy_edit.php @@ -195,7 +195,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $pconfig['descr'] -))->setHelp('You may enter a description here for your reference (not parsed).'); +))->setHelp('A description may be entered here for administrative reference (not parsed).'); $section->addInput(new Form_Select( 'type', diff --git a/src/usr/local/www/services_ntpd_acls.php b/src/usr/local/www/services_ntpd_acls.php index 623d049..0866743 100644 --- a/src/usr/local/www/services_ntpd_acls.php +++ b/src/usr/local/www/services_ntpd_acls.php @@ -119,20 +119,20 @@ if ($_POST) { /* End ACL Flags */ if (!is_ipaddr($networkacl[$x]['acl_network'])) { - $input_errors[] = gettext("You must enter a valid IP address for each row under Networks."); + $input_errors[] = gettext("A valid IP address must be entered for each row under Networks."); } if (is_ipaddr($networkacl[$x]['acl_network'])) { if (!is_subnet($networkacl[$x]['acl_network']."/".$networkacl[$x]['mask'])) { - $input_errors[] = gettext("You must enter a valid IPv4 netmask for each IPv4 row under Networks."); + $input_errors[] = gettext("A valid IPv4 netmask must be entered for each IPv4 row under Networks."); } } else if (function_exists("is_ipaddrv6")) { if (!is_ipaddrv6($networkacl[$x]['acl_network'])) { - $input_errors[] = gettext("You must enter a valid IPv6 address for {$networkacl[$x]['acl_network']}."); + $input_errors[] = gettext("A valid IPv6 address must be entered for {$networkacl[$x]['acl_network']}."); } else if (!is_subnetv6($networkacl[$x]['acl_network']."/".$networkacl[$x]['mask'])) { - $input_errors[] = gettext("You must enter a valid IPv6 netmask for each IPv6 row under Networks."); + $input_errors[] = gettext("A valid IPv6 netmask must be entered for each IPv6 row under Networks."); } } else { - $input_errors[] = gettext("You must enter a valid IP address for each row under Networks."); + $input_errors[] = gettext("A valid IP address must be entered for each row under Networks."); } } else if (isset($networkacl[$x])) { unset($networkacl[$x]); diff --git a/src/usr/local/www/services_ntpd_gps.php b/src/usr/local/www/services_ntpd_gps.php index 5b8ad4b..fc74f41 100644 --- a/src/usr/local/www/services_ntpd_gps.php +++ b/src/usr/local/www/services_ntpd_gps.php @@ -253,9 +253,9 @@ $section->addInput(new Form_Select( 'GPS Type', $pconfig['type'], array_combine($gpstypes, $gpstypes) -))->setHelp('This option allows you to select a predefined configuration. ' . - 'Default is the configuration of pfSense 2.1 and earlier (not recommended). Select Generic if your GPS is not listed.' . '<br /><br />' . - 'The predefined configurations assume your GPS has already been set to NMEA mode.'); +))->setHelp('This option allows a predefined configuration to be selected. ' . + 'Default is the configuration of pfSense 2.1 and earlier (not recommended). Select Generic if the GPS is not listed.' . '<br /><br />' . + 'The predefined configurations assume the GPS has already been set to NMEA mode.'); $serialports = glob("/dev/cua?[0-9]{,.[0-9]}", GLOB_BRACE); @@ -312,7 +312,7 @@ $section->addInput(new Form_Input( 'Stratum (0-16)', 'text', $pconfig['stratum'] -))->setHelp('This may be used to change the GPS Clock stratum (default: 0). This may be useful if, for some reason, you want ntpd to prefer a different clock'); +))->setHelp('This may be used to change the GPS Clock stratum (default: 0). This may be useful to, for some reason, have ntpd prefer a different clock'); $section->addInput(new Form_Checkbox( 'gpsprefer', @@ -390,7 +390,7 @@ $section->addInput(new Form_Textarea( 'gpsinitcmd', null, base64_decode($pconfig['initcmd']) -))->setHelp('Commands entered here will be sent to the GPS during initialization. Please read and understand your GPS documentation before making any changes here'); +))->setHelp('Commands entered here will be sent to the GPS during initialization. Please read and understand the GPS documentation before making any changes here'); $group = new Form_Group('NMEA Checksum Calculator'); diff --git a/src/usr/local/www/services_ntpd_pps.php b/src/usr/local/www/services_ntpd_pps.php index e63ddb7..7c2a61c 100644 --- a/src/usr/local/www/services_ntpd_pps.php +++ b/src/usr/local/www/services_ntpd_pps.php @@ -1,4 +1,4 @@ -<?php +f<?php /* services_ntpd_pps.php */ @@ -195,7 +195,7 @@ $section->addInput(new Form_Input( 'Stratum', 'text', $pconfig['stratum'] -))->setHelp('This may be used to change the PPS Clock stratum (default: 0). This may be useful if, for some reason, you want ntpd to prefer a different clock and just monitor this source.'); +))->setHelp('This may be used to change the PPS Clock stratum (default: 0). This may be useful to, for some reason, have ntpd prefer a different clock and just monitor this source.'); $section->addInput(new Form_Checkbox( 'ppsflag2', diff --git a/src/usr/local/www/services_pppoe.php b/src/usr/local/www/services_pppoe.php index bdd4be7..b9b09e4 100644 --- a/src/usr/local/www/services_pppoe.php +++ b/src/usr/local/www/services_pppoe.php @@ -122,7 +122,7 @@ if ($savemsg) { } if (is_subsystem_dirty('vpnpppoe')) { - print_apply_box(gettext('The PPPoE entry list has been changed.') . '<br />' . gettext('You must apply the changes in order for them to take effect.')); + print_apply_box(gettext('The PPPoE entry list has been changed.') . '<br />' . gettext('The changes must be applied for them to take effect.')); } ?> diff --git a/src/usr/local/www/services_rfc2136_edit.php b/src/usr/local/www/services_rfc2136_edit.php index d3fc0a1..a8ef2d0 100644 --- a/src/usr/local/www/services_rfc2136_edit.php +++ b/src/usr/local/www/services_rfc2136_edit.php @@ -322,7 +322,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $pconfig['descr'] -))->setHelp('You may enter a description here for your reference (not parsed).'); +))->setHelp('A description may be entered here for administrative reference (not parsed).'); if (isset($id) && $a_rfc2136[$id]) { $section->addInput(new Form_Input( @@ -343,7 +343,7 @@ if (isset($id) && $a_rfc2136[$id]) { $form->add($section); print($form); -print_info_box(sprintf(gettext('You must configure a DNS server in %1$sSystem: ' . +print_info_box(sprintf(gettext('A DNS server must be configured in %1$sSystem: ' . 'General setup %2$sor allow the DNS server list to be overridden ' . 'by DHCP/PPP on WAN for dynamic DNS updates to work.'), '<a href="system.php">', '</a>')); diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php index 59de63b..6852d13 100644 --- a/src/usr/local/www/services_router_advertisements.php +++ b/src/usr/local/www/services_router_advertisements.php @@ -120,6 +120,7 @@ if (is_array($config['dhcpdv6'][$if])) { /* RA specific */ $pconfig['ramode'] = $config['dhcpdv6'][$if]['ramode']; $pconfig['rapriority'] = $config['dhcpdv6'][$if]['rapriority']; + $pconfig['rainterface'] = $config['dhcpdv6'][$if]['rainterface']; if ($pconfig['rapriority'] == "") { $pconfig['rapriority'] = "medium"; } @@ -209,6 +210,7 @@ if ($_POST) { $config['dhcpdv6'][$if]['ramode'] = $_POST['ramode']; $config['dhcpdv6'][$if]['rapriority'] = $_POST['rapriority']; + $config['dhcpdv6'][$if]['rainterface'] = $_POST['rainterface']; $config['dhcpdv6'][$if]['ravalidlifetime'] = $_POST['ravalidlifetime']; $config['dhcpdv6'][$if]['rapreferredlifetime'] = $_POST['rapreferredlifetime']; @@ -262,7 +264,7 @@ $tabscounter = 0; $i = 0; foreach ($iflist as $ifent => $ifname) { $oc = $config['interfaces'][$ifent]; - // We need interfaces configured with a static IPv6 address or track6 for PD. + // We need interfaces configured with a static IPv6 address or track6 for PD. if (!is_ipaddrv6($oc['ipaddrv6']) && $oc['ipaddrv6'] != "track6") { continue; } @@ -312,6 +314,34 @@ $section->addInput(new Form_Select( $priority_modes ))->setHelp('Select the Priority for the Router Advertisement (RA) Daemon.'); +$carplist = get_configured_vip_list("inet6", VIP_CARP); + +$carplistif = array(); + +if(count($carplist) > 0) { + foreach($carplist as $ifname => $vip) { + if (get_configured_vip_interface($ifname) == $if) { + $carplistif[$ifname] = $vip; + } + } +} + +if (count($carplistif) > 0) { + $iflist = array(); + + $iflist['interface'] = strtoupper($if); + foreach($carplistif as $ifname => $vip) { + $iflist[$ifname] = get_vip_descr($vip) . " - " . $vip; + } + + $section->addInput(new Form_Select( + 'rainterface', + 'RA Interface', + $pconfig['rainterface'], + $iflist + ))->setHelp('Select the Interface for the Router Advertisement (RA) Daemon.'); +} + $section->addInput(new Form_Input( 'ravalidlifetime', 'Default valid lifetime', diff --git a/src/usr/local/www/services_unbound.php b/src/usr/local/www/services_unbound.php index 4408d2a..b99ec69 100644 --- a/src/usr/local/www/services_unbound.php +++ b/src/usr/local/www/services_unbound.php @@ -177,7 +177,7 @@ if ($_POST) { } if ($pconfig['port'] && !is_port($pconfig['port'])) { - $input_errors[] = gettext("You must specify a valid port number."); + $input_errors[] = gettext("A valid port number must be specified."); } if (is_array($pconfig['active_interface']) && !empty($pconfig['active_interface'])) { @@ -283,7 +283,7 @@ if ($savemsg) { } if (is_subsystem_dirty('unbound')) { - print_apply_box(gettext("The DNS resolver configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The DNS resolver configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } $tab_array = array(); @@ -360,16 +360,15 @@ $section->addInput(new Form_Checkbox( $pconfig['regdhcp'] ))->setHelp(sprintf('If this option is set, then machines that specify their hostname when requesting a DHCP lease will be registered'. ' in the DNS Resolver, so that their name can be resolved.'. - ' You should also set the domain in %sSystem: General setup%s to the proper value.','<a href="system.php">','</a>')); + ' The domain in %sSystem: General setup%s should also be set to the proper value.','<a href="system.php">','</a>')); $section->addInput(new Form_Checkbox( 'regdhcpstatic', 'Static DHCP', 'Register DHCP static mappings in the DNS Resolver', $pconfig['regdhcpstatic'] -))->setHelp(sprintf('If this option is set, then DHCP static mappings will be registered in the DNS Resolver, so that their name can be '. - 'resolved. You should also set the domain in %s'. - 'System: General setup%s to the proper value.','<a href="system.php">','</a>')); +))->setHelp(sprintf('If this option is set, then DHCP static mappings will be registered in the DNS Resolver, so that their name can be resolved. '. + 'The domain in %sSystem: General setup%s should also be set to the proper value.','<a href="system.php">','</a>')); $btnadv = new Form_Button( 'btnadvcustom', diff --git a/src/usr/local/www/services_unbound_acls.php b/src/usr/local/www/services_unbound_acls.php index 23fae6d..db5b2e2 100644 --- a/src/usr/local/www/services_unbound_acls.php +++ b/src/usr/local/www/services_unbound_acls.php @@ -148,21 +148,21 @@ if ($_POST) { $networkacl[$x]['mask'] = $pconfig["mask{$x}"]; $networkacl[$x]['description'] = $pconfig["description{$x}"]; if (!is_ipaddr($networkacl[$x]['acl_network'])) { - $input_errors[] = gettext("You must enter a valid IP address for each row under Networks."); + $input_errors[] = gettext("A valid IP address must be entered for each row under Networks."); } if (is_ipaddr($networkacl[$x]['acl_network'])) { if (!is_subnet($networkacl[$x]['acl_network']."/".$networkacl[$x]['mask'])) { - $input_errors[] = gettext("You must enter a valid IPv4 netmask for each IPv4 row under Networks."); + $input_errors[] = gettext("A valid IPv4 netmask must be entered for each IPv4 row under Networks."); } } else if (function_exists("is_ipaddrv6")) { if (!is_ipaddrv6($networkacl[$x]['acl_network'])) { - $input_errors[] = gettext("You must enter a valid IPv6 address for {$networkacl[$x]['acl_network']}."); + $input_errors[] = gettext("A valid IPv6 address must be entered for {$networkacl[$x]['acl_network']}."); } else if (!is_subnetv6($networkacl[$x]['acl_network']."/".$networkacl[$x]['mask'])) { - $input_errors[] = gettext("You must enter a valid IPv6 netmask for each IPv6 row under Networks."); + $input_errors[] = gettext("A valid IPv6 netmask must be entered for each IPv6 row under Networks."); } } else { - $input_errors[] = gettext("You must enter a valid IP address for each row under Networks."); + $input_errors[] = gettext("A valid IP address must be entered for each row under Networks."); } } else if (isset($networkacl[$x])) { unset($networkacl[$x]); @@ -203,7 +203,7 @@ $actionHelp = sprintf(gettext('%sDeny:%s Stops queries from hosts within the netblock defined below.%s'), '<span class="text-success"><strong>', '</strong></span>', '<br />') . sprintf(gettext('%sRefuse:%s Stops queries from hosts within the netblock defined below, but sends a DNS rcode REFUSED error message back to the client.%s'), '<span class="text-success"><strong>', '</strong></span>', '<br />') . sprintf(gettext('%sAllow:%s Allow queries from hosts within the netblock defined below.%s'), '<span class="text-success"><strong>', '</strong></span>', '<br />') . - sprintf(gettext('%sAllow Snoop:%s Allow recursive and nonrecursive access from hosts within the netblock defined below. Used for cache snooping and ideally should only be configured for your administrative host.'), '<span class="text-success"><strong>', '</strong></span>'); + sprintf(gettext('%sAllow Snoop:%s Allow recursive and nonrecursive access from hosts within the netblock defined below. Used for cache snooping and ideally should only be configured for the administrative host.'), '<span class="text-success"><strong>', '</strong></span>'); $pgtitle = array(gettext("Services"), gettext("DNS Resolver"), gettext("Access Lists")); @@ -222,7 +222,7 @@ if ($savemsg) { } if (is_subsystem_dirty('unbound')) { - print_apply_box(gettext("The DNS resolver configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The DNS resolver configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } $tab_array = array(); @@ -270,7 +270,7 @@ if ($act == "new" || $act == "edit") { 'Description', 'text', $pconfig['description'] - ))->setHelp('You may enter a description here for your reference.'); + ))->setHelp('A description may be entered here for administrative reference.'); $numrows = count($networkacl) - 1; $counter = 0; diff --git a/src/usr/local/www/services_unbound_advanced.php b/src/usr/local/www/services_unbound_advanced.php index 22b9b86..c10c478 100644 --- a/src/usr/local/www/services_unbound_advanced.php +++ b/src/usr/local/www/services_unbound_advanced.php @@ -231,7 +231,7 @@ if ($savemsg) { } if (is_subsystem_dirty('unbound')) { - print_apply_box(gettext("The DNS resolver configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The DNS resolver configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } $tab_array = array(); @@ -306,7 +306,7 @@ $section->addInput(new Form_Select( $pconfig['edns_buffer_size'], array_combine(array("512", "1480", "4096"), array("512", "1480", "4096")) ))->setHelp('Number of bytes size to advertise as the EDNS reassembly buffer size. This is the value that is used in UDP datagrams sent to peers. ' . - 'RFC recommendation is 4096 (which is the default). If you have fragmentation reassemble problems, usually seen as timeouts, then a value of 1480 should help. ' . + 'RFC recommendation is 4096 (which is the default). If fragmentation reassemble problems occur, usually seen as timeouts, then a value of 1480 should help. ' . 'The 512 value bypasses most MTU path problems, but it can generate an excessive amount of TCP fallback.'); $section->addInput(new Form_Select( diff --git a/src/usr/local/www/services_unbound_domainoverride_edit.php b/src/usr/local/www/services_unbound_domainoverride_edit.php index 776b32e..360f319 100644 --- a/src/usr/local/www/services_unbound_domainoverride_edit.php +++ b/src/usr/local/www/services_unbound_domainoverride_edit.php @@ -169,7 +169,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $pconfig['descr'] -))->setHelp('You may enter a description here for your reference (not parsed).'); +))->setHelp('A description may be entered here for administrative reference (not parsed).'); if (isset($id) && $a_domainOverrides[$id]) { $section->addInput(new Form_Input( diff --git a/src/usr/local/www/services_unbound_host_edit.php b/src/usr/local/www/services_unbound_host_edit.php index 3ae8c7f..fadc451 100644 --- a/src/usr/local/www/services_unbound_host_edit.php +++ b/src/usr/local/www/services_unbound_host_edit.php @@ -270,7 +270,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $pconfig['descr'] -))->setHelp('You may enter a description here for your reference (not parsed).'); +))->setHelp('A description may be entered here for administrative reference (not parsed).'); if (isset($id) && $a_hosts[$id]) { $section->addInput(new Form_Input( diff --git a/src/usr/local/www/services_wol_edit.php b/src/usr/local/www/services_wol_edit.php index 2debfd9..8071159 100644 --- a/src/usr/local/www/services_wol_edit.php +++ b/src/usr/local/www/services_wol_edit.php @@ -173,7 +173,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $pconfig['descr'] -))->setHelp(gettext('You may enter a description here for your reference (not parsed).')); +))->setHelp(gettext('A description may be entered here for administrative reference (not parsed).')); $form->add($section); print $form; diff --git a/src/usr/local/www/status_captiveportal.php b/src/usr/local/www/status_captiveportal.php index be1be65..36abe13 100644 --- a/src/usr/local/www/status_captiveportal.php +++ b/src/usr/local/www/status_captiveportal.php @@ -261,7 +261,7 @@ if (!empty($cpzone)): ?> else: if (empty($a_cp)) { // If no zones have been defined - print_info_box(sprintf(gettext('No Captive Portal zones have been configured. You may add new zones here: %1$sServices > Captive Portal%2$s.'), '<a href="services_captiveportal_zones.php">', '</a>'), 'warning', false); + print_info_box(sprintf(gettext('No Captive Portal zones have been configured. New zones may be added here: %1$sServices > Captive Portal%2$s.'), '<a href="services_captiveportal_zones.php">', '</a>'), 'warning', false); } endif; ?> diff --git a/src/usr/local/www/status_carp.php b/src/usr/local/www/status_carp.php index e369f05..93faafe 100644 --- a/src/usr/local/www/status_carp.php +++ b/src/usr/local/www/status_carp.php @@ -161,7 +161,7 @@ if (is_array($config['virtualip']['vip'])) { if ($carpcount == 0) { print_info_box(gettext('No CARP interfaces have been defined.') . '<br />' . '<a href="system_hasync.php" class="alert-link">' . - gettext("You can configure high availability sync settings here.") . + gettext("High availability sync settings can be configured here.") . '</a>'); } else { ?> diff --git a/src/usr/local/www/status_graph_cpu.php b/src/usr/local/www/status_graph_cpu.php index 1b9d8e8..a7e0250 100644 --- a/src/usr/local/www/status_graph_cpu.php +++ b/src/usr/local/www/status_graph_cpu.php @@ -77,7 +77,7 @@ include("head.inc"); <p class="text-center"> <strong><?=gettext("Note"); ?>:</strong> - <?=sprintf(gettext('If you cannot see the graph, you may have to install the %1$sAdobe SVG viewer%2$s'), '<a href="http://www.adobe.com/svg/viewer/install/" target="_blank">', '</a>')?> + <?=sprintf(gettext('If the graph cannot be seen, the %1$sAdobe SVG viewer%2$s may need to be installed'), '<a href="http://www.adobe.com/svg/viewer/install/" target="_blank">', '</a>')?> </p> </div> diff --git a/src/usr/local/www/status_interfaces.php b/src/usr/local/www/status_interfaces.php index 3a46b04..4afb95d 100644 --- a/src/usr/local/www/status_interfaces.php +++ b/src/usr/local/www/status_interfaces.php @@ -214,7 +214,7 @@ foreach ($ifdescrs as $ifdescr => $ifname): print_info_box(gettext("Using dial-on-demand will bring the connection up again if any packet ". "triggers it. To substantiate this point: disconnecting manually ". "will <strong>not</strong> prevent dial-on-demand from making connections ". - "to the outside! Don't use dial-on-demand if you want to make sure that the line ". - "is kept disconnected."), 'warning', false); + "to the outside! Don't use dial-on-demand if the line ". + "is to be kept disconnected."), 'warning', false); include("foot.inc"); ?> diff --git a/src/usr/local/www/status_ipsec.php b/src/usr/local/www/status_ipsec.php index 1142e2a..21a6fa9 100644 --- a/src/usr/local/www/status_ipsec.php +++ b/src/usr/local/www/status_ipsec.php @@ -533,7 +533,7 @@ if (ipsec_enabled()) { <div class="infoblock blockopen"> <?php } -print_info_box(sprintf(gettext('You can configure IPsec %1$shere%2$s.'), '<a href="vpn_ipsec.php">', '</a>'), 'info', false); +print_info_box(sprintf(gettext('IPsec can be configured %1$shere%2$s.'), '<a href="vpn_ipsec.php">', '</a>'), 'info', false); ?> </div> <?php diff --git a/src/usr/local/www/status_ipsec_leases.php b/src/usr/local/www/status_ipsec_leases.php index 93d1653..09b1d06 100644 --- a/src/usr/local/www/status_ipsec_leases.php +++ b/src/usr/local/www/status_ipsec_leases.php @@ -159,7 +159,7 @@ if (ipsec_enabled()) { <div class="infoblock blockopen"> <?php } -print_info_box(sprintf(gettext('You can configure IPsec %1$shere%2$s.'), '<a href="vpn_ipsec.php">', '</a>'), 'info', false); +print_info_box(sprintf(gettext('IPsec can be configured %1$shere%2$s.'), '<a href="vpn_ipsec.php">', '</a>'), 'info', false); ?> </div> <?php diff --git a/src/usr/local/www/status_ipsec_sad.php b/src/usr/local/www/status_ipsec_sad.php index d2adf5c..828f862 100644 --- a/src/usr/local/www/status_ipsec_sad.php +++ b/src/usr/local/www/status_ipsec_sad.php @@ -158,7 +158,7 @@ if (ipsec_enabled()) { <div class="infoblock blockopen"> <?php } -print_info_box(sprintf(gettext('You can configure IPsec %1$shere%2$s.'), '<a href="vpn_ipsec.php">', '</a>'), 'info', false); +print_info_box(sprintf(gettext('IPsec can be configured %1$shere%2$s.'), '<a href="vpn_ipsec.php">', '</a>'), 'info', false); ?> </div> <?php diff --git a/src/usr/local/www/status_ipsec_spd.php b/src/usr/local/www/status_ipsec_spd.php index d5b8111..c14567d 100644 --- a/src/usr/local/www/status_ipsec_spd.php +++ b/src/usr/local/www/status_ipsec_spd.php @@ -142,7 +142,7 @@ if (ipsec_enabled()) { <div class="infoblock blockopen"> <?php } -print_info_box(sprintf(gettext('You can configure IPsec %1$shere%2$s.'), '<a href="vpn_ipsec.php">', '</a>'), 'info', false); +print_info_box(sprintf(gettext('IPsec can be configured %1$shere%2$s.'), '<a href="vpn_ipsec.php">', '</a>'), 'info', false); ?> </div> <?php diff --git a/src/usr/local/www/status_lb_pool.php b/src/usr/local/www/status_lb_pool.php index cd77e1f..5de3cbf 100644 --- a/src/usr/local/www/status_lb_pool.php +++ b/src/usr/local/www/status_lb_pool.php @@ -140,7 +140,7 @@ if ($_POST) { } if (is_subsystem_dirty('loadbalancer')) { - print_apply_box(gettext("The load balancer configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The load balancer configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } /* active tabs */ diff --git a/src/usr/local/www/status_logs_settings.php b/src/usr/local/www/status_logs_settings.php index de2d595..0e97ff0 100644 --- a/src/usr/local/www/status_logs_settings.php +++ b/src/usr/local/www/status_logs_settings.php @@ -211,13 +211,13 @@ include("head.inc"); $logfilesizeHelp = gettext("Logs are held in constant-size circular log files. This field controls how large each log file is, and thus how many entries may exist inside the log. By default this is approximately 500KB per log file, and there are nearly 20 such log files.") . '<br /><br />' . - gettext("NOTE: Log sizes are changed the next time a log file is cleared or deleted. To immediately increase the size of the log files, you must first save the options to set the size, then clear all logs using the \"Reset Log Files\" option farther down this page. ") . + gettext("NOTE: Log sizes are changed the next time a log file is cleared or deleted. To immediately increase the size of the log files, first save the options to set the size, then clear all logs using the \"Reset Log Files\" option farther down this page. ") . gettext("Be aware that increasing this value increases every log file size, so disk usage will increase significantly.") . '<br /><br />' . gettext("Disk space currently used by log files is: ") . exec("/usr/bin/du -sh /var/log | /usr/bin/awk '{print $1;}'") . gettext(" Remaining disk space for log files: ") . exec("/bin/df -h /var/log | /usr/bin/awk '{print $4;}'"); $remoteloghelp = gettext("This option will allow the logging daemon to bind to a single IP address, rather than all IP addresses.") . - gettext("If you pick a single IP, remote syslog servers must all be of that IP type. If you wish to mix IPv4 and IPv6 remote syslog servers, you must bind to all interfaces.") . + gettext("If a single IP is picked, remote syslog servers must all be of that IP type. To mix IPv4 and IPv6 remote syslog servers, bind to all interfaces.") . "<br /><br />" . gettext("NOTE: If an IP address cannot be located on the chosen interface, the daemon will bind to all addresses."); @@ -336,7 +336,7 @@ $section->addInput(new Form_Button( 'Reset Log Files', null, 'fa-trash' -))->addClass('btn-danger btn-sm')->setHelp('Clears all local log files and reinitializes them as empty logs. This also restarts the DHCP daemon. Use the Save button first if you have made any setting changes.'); +))->addClass('btn-danger btn-sm')->setHelp('Clears all local log files and reinitializes them as empty logs. This also restarts the DHCP daemon. Use the Save button first if any setting changes have been made.'); $form->add($section); $section = new Form_Section('Remote Logging Options'); diff --git a/src/usr/local/www/status_openvpn.php b/src/usr/local/www/status_openvpn.php index 452f84c..8e58f28 100644 --- a/src/usr/local/www/status_openvpn.php +++ b/src/usr/local/www/status_openvpn.php @@ -356,7 +356,7 @@ include("head.inc"); ?> } if ($DisplayNote) { - print_info_box(gettext("If you have custom options that override the management features of OpenVPN on a client or server, they will cause that OpenVPN instance to not work correctly with this status page.")); + print_info_box(gettext("If there are custom options that override the management features of OpenVPN on a client or server, they will cause that OpenVPN instance to not work correctly with this status page.")); } if ((empty($clients)) && (empty($servers)) && (empty($sk_servers))) { diff --git a/src/usr/local/www/vpn_ipsec.php b/src/usr/local/www/vpn_ipsec.php index 93fc6d4..cafded4 100644 --- a/src/usr/local/www/vpn_ipsec.php +++ b/src/usr/local/www/vpn_ipsec.php @@ -266,7 +266,7 @@ display_top_tabs($tab_array); } if (is_subsystem_dirty('ipsec')) { - print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } ?> @@ -557,7 +557,7 @@ display_top_tabs($tab_array); </form> <div class="infoblock"> - <?php print_info_box(sprintf(gettext("You can check your IPsec status at %s%s%s."), '<a href="status_ipsec.php">', gettext("Status:IPsec"), '</a>') . '<br />' . + <?php print_info_box(sprintf(gettext("The IPsec status can be checked at %s%s%s."), '<a href="status_ipsec.php">', gettext("Status:IPsec"), '</a>') . '<br />' . sprintf(gettext("IPsec debug mode can be enabled at %s%s%s."), '<a href="vpn_ipsec_settings.php">', gettext("VPN:IPsec:Advanced Settings"), '</a>') . '<br />' . sprintf(gettext("IPsec can be set to prefer older SAs at %s%s%s."), '<a href="vpn_ipsec_settings.php">', gettext("VPN:IPsec:Advanced Settings"), '</a>'), 'info', false); ?> </div> diff --git a/src/usr/local/www/vpn_ipsec_keys.php b/src/usr/local/www/vpn_ipsec_keys.php index 00834c9..84649e8 100644 --- a/src/usr/local/www/vpn_ipsec_keys.php +++ b/src/usr/local/www/vpn_ipsec_keys.php @@ -112,7 +112,7 @@ if ($savemsg) { } if (is_subsystem_dirty('ipsec')) { - print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } $tab_array = array(); diff --git a/src/usr/local/www/vpn_ipsec_mobile.php b/src/usr/local/www/vpn_ipsec_mobile.php index dd113fe..6b03e17 100644 --- a/src/usr/local/www/vpn_ipsec_mobile.php +++ b/src/usr/local/www/vpn_ipsec_mobile.php @@ -437,7 +437,7 @@ if ($savemsg) { print_info_box($savemsg, 'success'); } if (is_subsystem_dirty('ipsec')) { - print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } foreach ($a_phase1 as $ph1ent) { if (isset($ph1ent['mobile'])) { diff --git a/src/usr/local/www/vpn_ipsec_phase1.php b/src/usr/local/www/vpn_ipsec_phase1.php index fb19df5..29d521f 100644 --- a/src/usr/local/www/vpn_ipsec_phase1.php +++ b/src/usr/local/www/vpn_ipsec_phase1.php @@ -273,9 +273,9 @@ if ($_POST) { if (!is_ipaddr($pconfig['remotegw']) && !is_domain($pconfig['remotegw'])) { $input_errors[] = gettext("A valid remote gateway address or host name must be specified."); } elseif (is_ipaddrv4($pconfig['remotegw']) && ($pconfig['protocol'] != "inet")) { - $input_errors[] = gettext("A valid remote gateway IPv4 address must be specified or you need to change protocol to IPv6"); + $input_errors[] = gettext("A valid remote gateway IPv4 address must be specified or protocol needs to be changed to IPv6"); } elseif (is_ipaddrv6($pconfig['remotegw']) && ($pconfig['protocol'] != "inet6")) { - $input_errors[] = gettext("A valid remote gateway IPv6 address must be specified or you need to change protocol to IPv4"); + $input_errors[] = gettext("A valid remote gateway IPv6 address must be specified or protocol needs to be changed to IPv4"); } } @@ -296,11 +296,11 @@ if ($_POST) { foreach ($a_phase2 as $phase2) { if ($phase2['ikeid'] == $pconfig['ikeid']) { if (($pconfig['protocol'] == "inet") && ($phase2['mode'] == "tunnel6")) { - $input_errors[] = gettext("There is a Phase 2 using IPv6, you cannot use IPv4."); + $input_errors[] = gettext("There is a Phase 2 using IPv6, cannot use IPv4."); break; } if (($pconfig['protocol'] == "inet6") && ($phase2['mode'] == "tunnel")) { - $input_errors[] = gettext("There is a Phase 2 using IPv4, you cannot use IPv6."); + $input_errors[] = gettext("There is a Phase 2 using IPv4, cannot use IPv6."); break; } } @@ -729,7 +729,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $pconfig['descr'] -))->setHelp('You may enter a description here for your reference (not parsed).'); +))->setHelp('A description may be entered here for administrative reference (not parsed).'); $form->add($section); @@ -795,7 +795,7 @@ $section->addInput(new Form_Input( 'Pre-Shared Key', 'text', $pconfig['pskey'] -))->setHelp('Enter your Pre-Shared Key string.'); +))->setHelp('Enter the Pre-Shared Key string.'); $section->addInput(new Form_Select( 'certref', diff --git a/src/usr/local/www/vpn_ipsec_phase2.php b/src/usr/local/www/vpn_ipsec_phase2.php index 553950a..ec7b96d 100644 --- a/src/usr/local/www/vpn_ipsec_phase2.php +++ b/src/usr/local/www/vpn_ipsec_phase2.php @@ -187,9 +187,9 @@ if ($_POST) { if (!$pconfig['localid_address'] || !is_ipaddr($pconfig['localid_address'])) { $input_errors[] = gettext("A valid local network IP address must be specified."); } elseif (is_ipaddrv4($pconfig['localid_address']) && ($pconfig['mode'] != "tunnel")) { - $input_errors[] = gettext("A valid local network IPv4 address must be specified or you need to change Mode to IPv6"); + $input_errors[] = gettext("A valid local network IPv4 address must be specified or Mode needs to be changed to IPv6"); } elseif (is_ipaddrv6($pconfig['localid_address']) && ($pconfig['mode'] != "tunnel6")) { - $input_errors[] = gettext("A valid local network IPv6 address must be specified or you need to change Mode to IPv4"); + $input_errors[] = gettext("A valid local network IPv6 address must be specified or Mode needs to be changed to IPv4"); } break; } @@ -211,15 +211,15 @@ if ($_POST) { $input_errors[] = gettext("A valid NAT local network bit count must be specified."); } if ($pconfig['localid_type'] == "address") { - $input_errors[] = gettext("You cannot configure a network type address for NAT while only an address type is selected for local source."); + $input_errors[] = gettext("A network type address cannot be configured for NAT while only an address type is selected for local source."); } case "address": if (!empty($pconfig['natlocalid_address']) && !is_ipaddr($pconfig['natlocalid_address'])) { $input_errors[] = gettext("A valid NAT local network IP address must be specified."); } elseif (is_ipaddrv4($pconfig['natlocalid_address']) && ($pconfig['mode'] != "tunnel")) { - $input_errors[] = gettext("A valid NAT local network IPv4 address must be specified or you need to change Mode to IPv6"); + $input_errors[] = gettext("A valid NAT local network IPv4 address must be specified or Mode needs to be changed to IPv6"); } elseif (is_ipaddrv6($pconfig['natlocalid_address']) && ($pconfig['mode'] != "tunnel6")) { - $input_errors[] = gettext("A valid NAT local network IPv6 address must be specified or you need to change Mode to IPv4"); + $input_errors[] = gettext("A valid NAT local network IPv6 address must be specified or Mode needs to be changed to IPv4"); } break; } @@ -244,9 +244,9 @@ if ($_POST) { if (!$pconfig['remoteid_address'] || !is_ipaddr($pconfig['remoteid_address'])) { $input_errors[] = gettext("A valid remote network IP address must be specified."); } elseif (is_ipaddrv4($pconfig['remoteid_address']) && ($pconfig['mode'] != "tunnel")) { - $input_errors[] = gettext("A valid remote network IPv4 address must be specified or you need to change Mode to IPv6"); + $input_errors[] = gettext("A valid remote network IPv4 address must be specified or Mode needs to be changed to IPv6"); } elseif (is_ipaddrv6($pconfig['remoteid_address']) && ($pconfig['mode'] != "tunnel6")) { - $input_errors[] = gettext("A valid remote network IPv6 address must be specified or you need to change Mode to IPv4"); + $input_errors[] = gettext("A valid remote network IPv6 address must be specified or Mode needs to be changed to IPv4"); } break; } @@ -619,7 +619,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $pconfig['descr'] -))->setHelp('You may enter a description here for your reference (not parsed).'); +))->setHelp('A description may be entered here for administrative reference (not parsed).'); $form->add($section); @@ -667,7 +667,7 @@ foreach ($p2_ealgos as $algo => $algodata) { if ($i == $rows) { - $group->setHelp('Use 3DES for best compatibility or if you have a hardware crypto accelerator card. Blowfish is usually the fastest in software encryption.'); + $group->setHelp('Use 3DES for best compatibility or for a hardware crypto accelerator card. Blowfish is usually the fastest in software encryption.'); } $i++; diff --git a/src/usr/local/www/vpn_ipsec_settings.php b/src/usr/local/www/vpn_ipsec_settings.php index 768e7c9..ca33a7d 100644 --- a/src/usr/local/www/vpn_ipsec_settings.php +++ b/src/usr/local/www/vpn_ipsec_settings.php @@ -328,7 +328,7 @@ $section->addInput(new Form_Checkbox( 'Some implementations send the third Main Mode message unencrypted, probably to find the PSKs for the specified ID for authentication.' . 'This is very similar to Aggressive Mode, and has the same security implications: ' . 'A passive attacker can sniff the negotiated Identity, and start brute forcing the PSK using the HASH payload.' . - 'It is recommended to keep this option to no, unless you know exactly what the implications are and require compatibility to such devices (for example, some SonicWall boxes).' + 'It is recommended to keep this option to no, unless the exact implications are known and compatibility is required for such devices (for example, some SonicWall boxes).' ); $section->addInput(new Form_Checkbox( diff --git a/src/usr/local/www/vpn_l2tp_users.php b/src/usr/local/www/vpn_l2tp_users.php index 931eef2..3d8d877 100644 --- a/src/usr/local/www/vpn_l2tp_users.php +++ b/src/usr/local/www/vpn_l2tp_users.php @@ -110,7 +110,7 @@ if (isset($config['l2tp']['radius']['enable'])) { } if (is_subsystem_dirty('l2tpusers')) { - print_apply_box(gettext("The L2TP user list has been modified.") . "<br />" . gettext("You must apply the changes in order for them to take effect") . ".<br /><b>" . gettext("Warning: this will terminate all current L2TP sessions!") . "</b>"); + print_apply_box(gettext("The L2TP user list has been modified.") . "<br />" . gettext("The changes must be applied for them to take effect") . ".<br /><b>" . gettext("Warning: this will terminate all current L2TP sessions!") . "</b>"); } diff --git a/src/usr/local/www/vpn_l2tp_users_edit.php b/src/usr/local/www/vpn_l2tp_users_edit.php index 673f088..e457461 100644 --- a/src/usr/local/www/vpn_l2tp_users_edit.php +++ b/src/usr/local/www/vpn_l2tp_users_edit.php @@ -199,7 +199,7 @@ $pwd = new Form_Input( ); if (isset($id) && $a_secret[$id]) { - $pwd->setHelp('If you want to change the users password, enter it here.'); + $pwd->setHelp('To change the users password, enter it here.'); } $section->addPassword($pwd); @@ -208,7 +208,7 @@ $section->addInput(new Form_IpAddress( 'ip', 'IP Address', $pconfig['ip'] -))->setHelp('If you want the user to be assigned a specific IP address, enter it here.'); +))->setHelp('To assign the user a specific IP address, enter it here.'); $form->add($section); diff --git a/src/usr/local/www/vpn_openvpn_client.php b/src/usr/local/www/vpn_openvpn_client.php index 6284c6f..9e90762 100644 --- a/src/usr/local/www/vpn_openvpn_client.php +++ b/src/usr/local/www/vpn_openvpn_client.php @@ -217,9 +217,9 @@ if ($_POST) { list($iv_iface, $iv_ip) = explode ("|", $pconfig['interface']); if (is_ipaddrv4($iv_ip) && (stristr($pconfig['protocol'], "6") !== false)) { - $input_errors[] = gettext("Protocol and IP address families do not match. You cannot select an IPv6 protocol and an IPv4 IP address."); + $input_errors[] = gettext("Protocol and IP address families do not match. An IPv6 protocol and an IPv4 IP address cannot be selected."); } elseif (is_ipaddrv6($iv_ip) && (stristr($pconfig['protocol'], "6") === false)) { - $input_errors[] = gettext("Protocol and IP address families do not match. You cannot select an IPv4 protocol and an IPv6 IP address."); + $input_errors[] = gettext("Protocol and IP address families do not match. An IPv4 protocol and an IPv6 IP address cannot be selected."); } elseif ((stristr($pconfig['protocol'], "6") === false) && !get_interface_ip($iv_iface) && ($pconfig['interface'] != "any")) { $input_errors[] = gettext("An IPv4 protocol was selected, but the selected interface has no IPv4 address."); } elseif ((stristr($pconfig['protocol'], "6") !== false) && !get_interface_ipv6($iv_iface) && ($pconfig['interface'] != "any")) { @@ -498,7 +498,7 @@ if ($act=="new" || $act=="edit"): 'number', $pconfig['local_port'], ['min' => '0'] - ))->setHelp('Set this option if you would like to bind to a specific port. Leave this blank or enter 0 for a random dynamic port.'); + ))->setHelp('Set this option to bind to a specific port. Leave this blank or enter 0 for a random dynamic port.'); $section->addInput(new Form_Input( 'server_addr', @@ -555,7 +555,7 @@ if ($act=="new" || $act=="edit"): 'Description', 'text', $pconfig['description'] - ))->setHelp('You may enter a description here for your reference (not parsed).'); + ))->setHelp('A description may be entered here for administrative reference (not parsed).'); $form->add($section); $section = new Form_Section('User Authentication Settings'); @@ -599,7 +599,7 @@ if ($act=="new" || $act=="edit"): 'tls', 'Key', $pconfig['tls'] - ))->setHelp('Paste your shared key here'); + ))->setHelp('Paste the shared key here'); if (count($a_ca)) { $list = array(); @@ -616,7 +616,7 @@ if ($act=="new" || $act=="edit"): } else { $section->addInput(new Form_StaticText( 'Peer Certificate Authority', - sprintf('No Certificate Authorities defined. You may create one here: %s', '<a href="system_camanager.php">System > Cert. Manager</a>') + sprintf('No Certificate Authorities defined. One may be created here: %s', '<a href="system_camanager.php">System > Cert. Manager</a>') )); } @@ -630,7 +630,7 @@ if ($act=="new" || $act=="edit"): } else { $section->addInput(new Form_StaticText( 'Peer Certificate Revocation list', - sprintf('No Certificate Revocation Lists defined. You may create one here: %s', '<a href="system_crlmanager.php">System > Cert. Manager > Certificate Revocation</a>') + sprintf('No Certificate Revocation Lists defined. One may be created here: %s', '<a href="system_crlmanager.php">System > Cert. Manager > Certificate Revocation</a>') )); } @@ -645,7 +645,7 @@ if ($act=="new" || $act=="edit"): 'shared_key', 'Shared Key', $pconfig['shared_key'] - ))->setHelp('Paste your shared key here'); + ))->setHelp('Paste the shared key here'); $cl = openvpn_build_cert_list(true); @@ -706,7 +706,7 @@ if ($act=="new" || $act=="edit"): $pconfig['remote_network'] ))->setHelp('IPv4 networks that will be routed through the tunnel, so that a site-to-site VPN can be established without manually ' . 'changing the routing tables. Expressed as a comma-separated list of one or more CIDR ranges. ' . - 'If this is a site-to-site VPN, enter the remote LAN/s here. You may leave this blank if you don\'t want a site-to-site VPN.'); + 'If this is a site-to-site VPN, enter the remote LAN/s here. May be left blank for non site-to-site VPN.'); $section->addInput(new Form_Input( 'remote_networkv6', @@ -715,7 +715,7 @@ if ($act=="new" || $act=="edit"): $pconfig['remote_networkv6'] ))->setHelp('These are the IPv6 networks that will be routed through the tunnel, so that a site-to-site VPN can be established without manually ' . 'changing the routing tables. Expressed as a comma-separated list of one or more IP/PREFIX. ' . - 'If this is a site-to-site VPN, enter the remote LAN/s here. You may leave this blank if you don\'t want a site-to-site VPN.'); + 'If this is a site-to-site VPN, enter the remote LAN/s here. May be left blank for non site-to-site VPN.'); $section->addInput(new Form_Input( 'use_shaper', @@ -776,14 +776,14 @@ if ($act=="new" || $act=="edit"): 'custom_options', 'Custom options', $pconfig['custom_options'] - ))->setHelp('Enter any additional options you would like to add to the OpenVPN client configuration here, separated by semicolon'); + ))->setHelp('Enter any additional options to add to the OpenVPN client configuration here, separated by semicolon'); $section->addInput(new Form_Select( 'verbosity_level', 'Verbosity level', $pconfig['verbosity_level'], $openvpn_verbosity_level - ))->setHelp('Each level shows all info from the previous levels. Level 3 is recommended if you want a good summary of what\'s happening without being swamped by output' . '<br /><br />' . + ))->setHelp('Each level shows all info from the previous levels. Level 3 is recommended for a good summary of what\'s happening without being swamped by output' . '<br /><br />' . 'None: Only fatal errors' . '<br />' . 'Default through 4: Normal usage range' . '<br />' . '5: Output R and W characters to the console for each packet read and write, uppercase is used for TCP/UDP packets and lowercase is used for TUN/TAP packets' .'<br />' . diff --git a/src/usr/local/www/vpn_openvpn_csc.php b/src/usr/local/www/vpn_openvpn_csc.php index 927e34c..0121619 100644 --- a/src/usr/local/www/vpn_openvpn_csc.php +++ b/src/usr/local/www/vpn_openvpn_csc.php @@ -372,7 +372,7 @@ if ($act == "new" || $act == "edit"): 'Description', 'text', $pconfig['description'] - ))->setHelp('You may enter a description here for your reference (not parsed). '); + ))->setHelp('A description may be entered here for administrative reference (not parsed). '); $section->addInput(new Form_Checkbox( 'block', @@ -399,7 +399,7 @@ if ($act == "new" || $act == "edit"): 'text', $pconfig['local_network'] ))->setHelp('These are the IPv4 networks that will be accessible from this particular client. Expressed as a comma-separated list of one or more CIDR ranges. ' . '<br />' . - 'NOTE: You do not need to specify networks here if they have already been defined on the main server configuration.'); + 'NOTE: Networks do not need to be specified here if they have already been defined on the main server configuration.'); $section->addInput(new Form_Input( 'local_networkv6', @@ -407,7 +407,7 @@ if ($act == "new" || $act == "edit"): 'text', $pconfig['local_networkv6'] ))->setHelp('These are the IPv4 networks that will be accessible from this particular client. Expressed as a comma-separated list of one or more IP/PREFIX networks.' . '<br />' . - 'NOTE: You do not need to specify networks here if they have already been defined on the main server configuration.'); + 'NOTE: Networks do not need to be specified here if they have already been defined on the main server configuration.'); $section->addInput(new Form_Input( 'remote_network', @@ -415,7 +415,7 @@ if ($act == "new" || $act == "edit"): 'text', $pconfig['remote_network'] ))->setHelp('These are the IPv4 networks that will be routed to this client specifically using iroute, so that a site-to-site VPN can be established. ' . - 'Expressed as a comma-separated list of one or more CIDR ranges. You may leave this blank if there are no client-side networks to be routed.' . '<br />' . + 'Expressed as a comma-separated list of one or more CIDR ranges. May be left blank if there are no client-side networks to be routed.' . '<br />' . 'NOTE: Remember to add these subnets to the IPv4 Remote Networks list on the corresponding OpenVPN server settings.'); $section->addInput(new Form_Input( @@ -424,7 +424,7 @@ if ($act == "new" || $act == "edit"): 'text', $pconfig['remote_networkv6'] ))->setHelp('These are the IPv4 networks that will be routed to this client specifically using iroute, so that a site-to-site VPN can be established. ' . - 'Expressed as a comma-separated list of one or more IP/PREFIX networks. You may leave this blank if there are no client-side networks to be routed.' . '<br />' . + 'Expressed as a comma-separated list of one or more IP/PREFIX networks. May be left blank if there are no client-side networks to be routed.' . '<br />' . 'NOTE: Remember to add these subnets to the IPv6 Remote Networks list on the corresponding OpenVPN server settings.'); $section->addInput(new Form_Checkbox( @@ -589,7 +589,7 @@ if ($act == "new" || $act == "edit"): 'custom_options', 'Advanced', $pconfig['custom_options'] - ))->setHelp('Enter any additional options you would like to add for this client specific override, separated by a semicolon. ' . '<br />' . + ))->setHelp('Enter any additional options to add for this client specific override, separated by a semicolon. ' . '<br />' . 'EXAMPLE: push "route 10.0.0.0 255.255.255.0"; '); // The hidden fields diff --git a/src/usr/local/www/vpn_openvpn_server.php b/src/usr/local/www/vpn_openvpn_server.php index b8c182b..4938b9d 100644 --- a/src/usr/local/www/vpn_openvpn_server.php +++ b/src/usr/local/www/vpn_openvpn_server.php @@ -286,9 +286,9 @@ if ($_POST) { list($iv_iface, $iv_ip) = explode ("|", $pconfig['interface']); if (is_ipaddrv4($iv_ip) && (stristr($pconfig['protocol'], "6") !== false)) { - $input_errors[] = gettext("Protocol and IP address families do not match. You cannot select an IPv6 protocol and an IPv4 IP address."); + $input_errors[] = gettext("Protocol and IP address families do not match. An IPv6 protocol and an IPv4 IP address cannot be selected."); } elseif (is_ipaddrv6($iv_ip) && (stristr($pconfig['protocol'], "6") === false)) { - $input_errors[] = gettext("Protocol and IP address families do not match. You cannot select an IPv4 protocol and an IPv6 IP address."); + $input_errors[] = gettext("Protocol and IP address families do not match. An IPv4 protocol and an IPv6 IP address cannot be selected."); } elseif ((stristr($pconfig['protocol'], "6") === false) && !get_interface_ip($iv_iface) && ($pconfig['interface'] != "any")) { $input_errors[] = gettext("An IPv4 protocol was selected, but the selected interface has no IPv4 address."); } elseif ((stristr($pconfig['protocol'], "6") !== false) && !get_interface_ipv6($iv_iface) && ($pconfig['interface'] != "any")) { @@ -302,7 +302,7 @@ if ($_POST) { } if (empty($pconfig['authmode']) && (($pconfig['mode'] == "server_user") || ($pconfig['mode'] == "server_tls_user"))) { - $input_errors[] = gettext("You must select a Backend for Authentication if the server mode requires User Auth."); + $input_errors[] = gettext("A Backend for Authentication must be selected if the server mode requires User Auth."); } /* input validation */ @@ -695,7 +695,7 @@ if ($act=="new" || $act=="edit"): 'Description', 'text', $pconfig['description'] - ))->setHelp('You may enter a description here for your reference (not parsed).'); + ))->setHelp('A description may be entered here for administrative reference (not parsed).'); $form->add($section); @@ -721,7 +721,7 @@ if ($act=="new" || $act=="edit"): 'tls', 'Key', $pconfig['tls'] - ))->setHelp('Paste your shared key here'); + ))->setHelp('Paste the shared key here'); if (count($a_ca)) { @@ -739,7 +739,7 @@ if ($act=="new" || $act=="edit"): } else { $section->addInput(new Form_StaticText( 'Peer Certificate Authority', - sprintf('No Certificate Authorities defined. You may create one here: %s', '<a href="system_camanager.php">System > Cert. Manager</a>') + sprintf('No Certificate Authorities defined. One may be created here: %s', '<a href="system_camanager.php">System > Cert. Manager</a>') )); } @@ -753,7 +753,7 @@ if ($act=="new" || $act=="edit"): } else { $section->addInput(new Form_StaticText( 'Peer Certificate Revocation list', - sprintf('No Certificate Revocation Lists defined. You may create one here: %s', '<a href="system_camanager.php">System > Cert. Manager</a>') + sprintf('No Certificate Revocation Lists defined. One may be created here: %s', '<a href="system_camanager.php">System > Cert. Manager</a>') )); } @@ -767,7 +767,7 @@ if ($act=="new" || $act=="edit"): } } } else { - $certhelp = sprintf('%s%s%s$s', '<span id="certtype">', gettext('No Certificates defined. You may create one here: '), '<a href="system_camanager.php">' . gettext("System > Cert. Manager") . '</a>', '</span>'); + $certhelp = sprintf('%s%s%s$s', '<span id="certtype">', gettext('No Certificates defined. One may be created here: '), '<a href="system_camanager.php">' . gettext("System > Cert. Manager") . '</a>', '</span>'); } $cl = openvpn_build_cert_list(false, true); @@ -787,7 +787,7 @@ if ($act=="new" || $act=="edit"): 'DH Parameter length (bits)', $pconfig['dh_length'], array_combine($openvpn_dh_lengths, $openvpn_dh_lengths) - ))->setHelp(count($a_cert) ? '':sprintf('No Certificates defined. You may create one here: %s', '<a href="system_camanager.php">System > Cert. Manager</a>')); + ))->setHelp(count($a_cert) ? '':sprintf('No Certificates defined. One may be created here: %s', '<a href="system_camanager.php">System > Cert. Manager</a>')); if (!$pconfig['shared_key']) { $section->addInput(new Form_Checkbox( @@ -802,7 +802,7 @@ if ($act=="new" || $act=="edit"): 'shared_key', 'Shared Key', $pconfig['shared_key'] - ))->setHelp('Paste your shared key here'); + ))->setHelp('Paste the shared key here'); $section->addInput(new Form_Select( 'crypto', @@ -876,8 +876,8 @@ if ($act=="new" || $act=="edit"): 'Bridge Interface', $pconfig['serverbridge_interface'], openvpn_build_bridge_list() - ))->setHelp('The interface to which this tap instance will be bridged. This is not done automatically. You must assign this ' . - 'interface and create the bridge separately. This setting controls which existing IP address and subnet ' . + ))->setHelp('The interface to which this tap instance will be bridged. This is not done automatically. This interface must be assigned ' . + 'and the bridge created separately. This setting controls which existing IP address and subnet ' . 'mask are used by OpenVPN for the bridge. Setting this to "none" will cause the Server Bridge DHCP settings below to be ignored.'); $section->addInput(new Form_Input( @@ -885,7 +885,7 @@ if ($act=="new" || $act=="edit"): 'Server Bridge DHCP Start', 'text', $pconfig['serverbridge_dhcp_start'] - ))->setHelp('When using tap mode as a multi-point server, you may optionally supply a DHCP range to use on the ' . + ))->setHelp('When using tap mode as a multi-point server, a DHCP range may optionally be supplied to use on the ' . 'interface to which this tap instance is bridged. If these settings are left blank, DHCP will be passed ' . 'through to the LAN, and the interface setting above will be ignored.'); @@ -910,8 +910,8 @@ if ($act=="new" || $act=="edit"): $pconfig['local_network'] ))->setHelp('IPv4 networks that will be accessible from the remote endpoint. ' . 'Expressed as a comma-separated list of one or more CIDR ranges. ' . - 'You may leave this blank if you don\'t want to add a route to the local network through this tunnel on the remote machine. ' . - 'This is generally set to your LAN network.'); + 'This may be left blank if not adding a route to the local network through this tunnel on the remote machine. ' . + 'This is generally set to the LAN network.'); $section->addInput(new Form_Input( 'local_networkv6', @@ -919,8 +919,8 @@ if ($act=="new" || $act=="edit"): 'text', $pconfig['local_networkv6'] ))->setHelp('IPv6 networks that will be accessible from the remote endpoint. ' . - 'Expressed as a comma-separated list of one or more IP/PREFIX. You may leave this blank if you don\'t want to add a ' . - 'route to the local network through this tunnel on the remote machine. This is generally set to your LAN network.'); + 'Expressed as a comma-separated list of one or more IP/PREFIX. This may be left blank if not adding a ' . + 'route to the local network through this tunnel on the remote machine. This is generally set to the LAN network.'); $section->addInput(new Form_Input( 'remote_network', @@ -929,7 +929,7 @@ if ($act=="new" || $act=="edit"): $pconfig['remote_network'] ))->setHelp('IPv4 networks that will be routed through the tunnel, so that a site-to-site VPN can be established without manually ' . 'changing the routing tables. Expressed as a comma-separated list of one or more CIDR ranges. ' . - 'If this is a site-to-site VPN, enter the remote LAN/s here. You may leave this blank if you don\'t want a site-to-site VPN.'); + 'If this is a site-to-site VPN, enter the remote LAN/s here. May be left blank for non site-to-site VPN.'); $section->addInput(new Form_Input( 'remote_networkv6', @@ -938,7 +938,7 @@ if ($act=="new" || $act=="edit"): $pconfig['remote_networkv6'] ))->setHelp('These are the IPv6 networks that will be routed through the tunnel, so that a site-to-site VPN can be established without manually ' . 'changing the routing tables. Expressed as a comma-separated list of one or more IP/PREFIX. ' . - 'If this is a site-to-site VPN, enter the remote LAN/s here. You may leave this blank if you don\'t want a site-to-site VPN.'); + 'If this is a site-to-site VPN, enter the remote LAN/s here. May be left blank for non site-to-site VPN.'); $section->addInput(new Form_Input( 'maxclients', @@ -1157,7 +1157,7 @@ if ($act=="new" || $act=="edit"): 'custom_options', 'Custom options', $pconfig['custom_options'] - ))->setHelp('Enter any additional options you would like to add to the OpenVPN server configuration here, separated by semicolon' . '<br />' . + ))->setHelp('Enter any additional options to add to the OpenVPN server configuration here, separated by semicolon' . '<br />' . 'EXAMPLE: push "route 10.0.0.0 255.255.255.0"'); $section->addInput(new Form_Select( @@ -1165,7 +1165,7 @@ if ($act=="new" || $act=="edit"): 'Verbosity level', $pconfig['verbosity_level'], $openvpn_verbosity_level - ))->setHelp('Each level shows all info from the previous levels. Level 3 is recommended if you want a good summary of what\'s happening without being swamped by output' . '<br /><br />' . + ))->setHelp('Each level shows all info from the previous levels. Level 3 is recommended for a good summary of what\'s happening without being swamped by output' . '<br /><br />' . 'None: Only fatal errors' . '<br />' . 'Default through 4: Normal usage range' . '<br />' . '5: Output R and W characters to the console for each packet read and write, uppercase is used for TCP/UDP packets and lowercase is used for TUN/TAP packets' .'<br />' . diff --git a/src/usr/local/www/widgets/widgets/installed_packages.widget.php b/src/usr/local/www/widgets/widgets/installed_packages.widget.php index 2fa5d6f..ba291f8 100644 --- a/src/usr/local/www/widgets/widgets/installed_packages.widget.php +++ b/src/usr/local/www/widgets/widgets/installed_packages.widget.php @@ -73,7 +73,7 @@ if ($_REQUEST && $_REQUEST['ajax']) { }); if (empty($installed_packages)) { - print_info_box(gettext("No packages installed.") . " " . gettext('You can install packages <a href="pkg_mgr.php" class="alert-link">here</a>.'), 'warning', false); + print_info_box(gettext("No packages installed.") . " " . gettext('Packages can be installed <a href="pkg_mgr.php" class="alert-link">here</a>.'), 'warning', false); exit; } diff --git a/src/usr/local/www/widgets/widgets/ipsec.widget.php b/src/usr/local/www/widgets/widgets/ipsec.widget.php index 42f9258..0fcdc75 100644 --- a/src/usr/local/www/widgets/widgets/ipsec.widget.php +++ b/src/usr/local/www/widgets/widgets/ipsec.widget.php @@ -261,7 +261,7 @@ if (isset($config['ipsec']['phase2'])): ?> <?php else: ?> <div> <h5 style="padding-left:10px;"><?=gettext("There are no configured IPsec Tunnels")?></h5> - <p style="padding-left:10px;"><?=gettext('You can configure your IPsec <a href="vpn_ipsec.php">here</a>.')?></p> + <p style="padding-left:10px;"><?=gettext('IPsec can be configured <a href="vpn_ipsec.php">here</a>.')?></p> </div> <?php endif; diff --git a/src/usr/local/www/widgets/widgets/openvpn.widget.php b/src/usr/local/www/widgets/widgets/openvpn.widget.php index f23e95c..756b235 100644 --- a/src/usr/local/www/widgets/widgets/openvpn.widget.php +++ b/src/usr/local/www/widgets/widgets/openvpn.widget.php @@ -255,10 +255,6 @@ $clients = openvpn_get_active_clients(); <?php } -if ($DisplayNote) { - echo "<br /><b>". gettext("NOTE") . ":</b> ". gettext("You need to bind each OpenVPN client to enable its management daemon: use 'Local port' setting in the OpenVPN client screen"); -} - if ((empty($clients)) && (empty($servers)) && (empty($sk_servers))) { echo gettext("No OpenVPN instances defined"); } diff --git a/src/usr/local/www/widgets/widgets/system_information.widget.php b/src/usr/local/www/widgets/widgets/system_information.widget.php index a033a58..b1cb040 100644 --- a/src/usr/local/www/widgets/widgets/system_information.widget.php +++ b/src/usr/local/www/widgets/widgets/system_information.widget.php @@ -91,10 +91,10 @@ if ($_REQUEST['getupdatestatus']) { <?php break; case '=': - print(gettext("You are on the latest version.")); + print(gettext("The system is on the latest version.")); break; case '>': - print(gettext("You are on a later version than<br />the official release.")); + print(gettext("The system is on a later version than<br />the official release.")); break; default: print(gettext( "<i>Error comparing installed version<br />with latest available</i>")); diff --git a/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php b/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php index 587fcac..e6c4d0b 100644 --- a/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php +++ b/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php @@ -276,7 +276,7 @@ function getBoolValueFromConfig(&$configArray, $valueKey, $defaultValue) { </tr> <tr> <td class="text-left" colspan="3"> - <span><?=gettext('* You can configure a proper Thermal Sensor / Module under')?> <br /> + <span><?=gettext('* A proper Thermal Sensor / Module can be configured under')?> <br /> <a href="system_advanced_misc.php"><?=gettext('System')?> > <?=gettext('Advanced')?> > <?=gettext('Miscellaneous')?> : <?=gettext('Thermal Sensors')?> <?=gettext('section')?></a>.</span> </td> </tr> diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 33ceb10..759a1fc 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -152,6 +152,26 @@ core_pkg_create() { rm -f ${_plist}.tmp ${plist}.exclude fi + # Add license information + local _portname=$(sed '/^name: /!d; s,^[^"]*",,; s,",,' ${_metadir}/+MANIFEST) + local _licenses_dir="/usr/local/share/licenses/${_portname}-${_version}" + mkdir -p ${_root}${_licenses_dir} + cp ${BUILDER_ROOT}/license.txt ${_root}${_licenses_dir}/ESF + echo "This package has a single license: ESF (Electric Sheep Fencing License)." \ + > ${_root}${_licenses_dir}/LICENSE + cat <<EOF >${_root}${_licenses_dir}/catalog.mk +_LICENSE=ESF +_LICENSE_NAME=Electric Sheep Fencing License +_LICENSE_PERMS=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +_LICENSE_GROUPS= +_LICENSE_DISTFILES= +EOF + cat <<EOF >>${_plist} +${_licenses_dir}/catalog.mk +${_licenses_dir}/LICENSE +${_licenses_dir}/ESF +EOF + mkdir -p ${CORE_PKG_REAL_PATH}/All if ! pkg create -o ${CORE_PKG_REAL_PATH}/All -p ${_plist} -r ${_root} -m ${_metadir}; then echo ">>> ERROR: Error building package ${_template} ${_flavor}" @@ -1510,7 +1530,7 @@ setup_pkg_repo() { mkdir -p $(dirname ${_target}) >/dev/null 2>&1 sed \ - -e "s/%%ARCH%%/${_arch}_${_target_arch}/" \ + -e "s/%%ARCH%%/${_target_arch}/" \ -e "s/%%GIT_REPO_BRANCH_OR_TAG%%/${_branch}/g" \ -e "s,%%PKG_REPO_SERVER%%,${PKG_REPO_SERVER},g" \ -e "s/%%PRODUCT_NAME%%/${PRODUCT_NAME}/g" \ @@ -1844,7 +1864,7 @@ pkg_repo_rsync() { } poudriere_create_patch() { - local _jail_patch="${SCRATCHDIR}/poudriere_jail.${GIT_REPO_BRANCH_OR_TAG}.patch" + local _jail_patch="${SCRATCHDIR}/poudriere_jail.${POUDRIERE_BRANCH}.patch" if [ -z "${FREEBSD_PARENT_BRANCH}" ]; then echo ">>> ERROR: FREEBSD_PARENT_BRANCH is not set" @@ -1917,10 +1937,8 @@ poudriere_jail_name() { return 1 fi - # Poudriere doesn't like periods in jail names - _jail_arch=$(echo "${_jail_arch}" | tr '.' '_') - - echo "${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}_${_jail_arch}" + # Remove arch + echo "${PRODUCT_NAME}_${POUDRIERE_BRANCH}_${_jail_arch##*.}" } poudriere_rename_ports() { @@ -2009,7 +2027,7 @@ poudriere_create_ports_tree() { poudriere_init() { local _error=0 local _archs=$(poudriere_possible_archs) - local _jail_patch="${SCRATCHDIR}/poudriere_jail.${GIT_REPO_BRANCH_OR_TAG}.patch" + local _jail_patch="${SCRATCHDIR}/poudriere_jail.${POUDRIERE_BRANCH}.patch" LOGFILE=${BUILDER_LOGS}/poudriere.log @@ -2141,7 +2159,7 @@ EOF poudriere_update_jails() { local _archs=$(poudriere_possible_archs) - local _jail_patch="${SCRATCHDIR}/poudriere_jail.${GIT_REPO_BRANCH_OR_TAG}.patch" + local _jail_patch="${SCRATCHDIR}/poudriere_jail.${POUDRIERE_BRANCH}.patch" LOGFILE=${BUILDER_LOGS}/poudriere.log @@ -2233,7 +2251,7 @@ poudriere_bulk() { _ref_bulk="${POUDRIERE_BULK}" fi - _bulk=${SCRATCHDIR}/poudriere_bulk.${GIT_REPO_BRANCH_OR_TAG} + _bulk=${SCRATCHDIR}/poudriere_bulk.${POUDRIERE_BRANCH} sed -e "s,%%PRODUCT_NAME%%,${PRODUCT_NAME},g" ${_ref_bulk} > ${_bulk} if ! poudriere bulk -f ${_bulk} -j ${jail_name} -p ${POUDRIERE_PORTS_NAME}; then diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 300c4fb..9299228 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -135,6 +135,8 @@ if [ "${_cur_git_repo_branch_or_tag}" = "HEAD" ]; then else export GIT_REPO_BRANCH_OR_TAG="${_cur_git_repo_branch_or_tag}" fi +# Use vX_Y instead of RELENG_X_Y for poudriere to make it shorter +POUDRIERE_BRANCH=$(echo "${GIT_REPO_BRANCH_OR_TAG}" | sed 's,RELENG_,v,') GIT_REPO_BASE=$(git -C ${BUILDER_ROOT} config --get remote.origin.url | sed -e 's,/[^/]*$,,') @@ -262,7 +264,7 @@ echo "$BUILTDATESTRING" > $BUILTDATESTRINGFILE # Poudriere export ZFS_TANK=${ZFS_TANK:-"zroot"} export ZFS_ROOT=${ZFS_ROOT:-"/poudriere"} -export POUDRIERE_PORTS_NAME=${POUDRIERE_PORTS_NAME:-"${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}"} +export POUDRIERE_PORTS_NAME=${POUDRIERE_PORTS_NAME:-"${PRODUCT_NAME}_${POUDRIERE_BRANCH}"} export POUDRIERE_BULK=${POUDRIERE_BULK:-"${BUILDER_TOOLS}/conf/pfPorts/poudriere_bulk"} export POUDRIERE_PORTS_GIT_URL=${POUDRIERE_PORTS_GIT_URL:-"${GIT_REPO_BASE}/freebsd-ports.git"} @@ -274,7 +276,7 @@ export PKG_RSYNC_SSH_PORT=${PKG_RSYNC_SSH_PORT:-"22"} export PKG_RSYNC_DESTDIR=${PKG_RSYNC_DESTDIR:-"/usr/local/www/beta/packages"} export PKG_RSYNC_LOGS=${PKG_RSYNC_LOGS:-"/usr/local/www/beta"} export PKG_REPO_SERVER=${PKG_REPO_SERVER:-"pkg+http://beta.pfsense.org/packages"} -export PKG_REPO_CONF_BRANCH=${PKG_REPO_CONF_BRANCH:-"${GIT_REPO_BRANCH_OR_TAG}"} +export PKG_REPO_CONF_BRANCH=${PKG_REPO_CONF_BRANCH:-"${POUDRIERE_BRANCH}"} # Command used to sign pkg repo export PKG_REPO_SIGNING_COMMAND=${PKG_REPO_SIGNING_COMMAND:-""} @@ -305,7 +307,7 @@ esac # Define base package version, based on date for snaps export CORE_PKG_VERSION="${PRODUCT_VERSION%%-*}${CORE_PKG_DATESTRING}" -export CORE_PKG_PATH=${CORE_PKG_PATH:-"${SCRATCHDIR}/${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}_${TARGET}_${TARGET_ARCH}-core"} +export CORE_PKG_PATH=${CORE_PKG_PATH:-"${SCRATCHDIR}/${PRODUCT_NAME}_${POUDRIERE_BRANCH}_${TARGET_ARCH}-core"} export CORE_PKG_REAL_PATH="${CORE_PKG_PATH}/.real_${DATESTRING}" export CORE_PKG_TMP=${CORE_PKG_TMP:-"${SCRATCHDIR}/core_pkg_tmp"} diff --git a/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST b/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST index b1a31a7..f4a209b 100644 --- a/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST +++ b/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST @@ -11,5 +11,5 @@ deps: { } categories [ security, ] licenselogic: single -licenses: [ BSD2CLAUSE, ] +licenses: [ ESF, ] options: { } diff --git a/tools/templates/core_pkg/base/metadir/+MANIFEST b/tools/templates/core_pkg/base/metadir/+MANIFEST index 0f5ed85..ae0ba60 100644 --- a/tools/templates/core_pkg/base/metadir/+MANIFEST +++ b/tools/templates/core_pkg/base/metadir/+MANIFEST @@ -11,5 +11,5 @@ deps: { } categories [ security, ] licenselogic: single -licenses: [ BSD2CLAUSE, ] +licenses: [ ESF, ] options: { } diff --git a/tools/templates/core_pkg/default-config-serial/metadir/+MANIFEST b/tools/templates/core_pkg/default-config-serial/metadir/+MANIFEST index 471ed8b..aca3abd 100644 --- a/tools/templates/core_pkg/default-config-serial/metadir/+MANIFEST +++ b/tools/templates/core_pkg/default-config-serial/metadir/+MANIFEST @@ -11,5 +11,5 @@ deps: { } categories [ security, ] licenselogic: single -licenses: [ BSD2CLAUSE, ] +licenses: [ ESF, ] options: { } diff --git a/tools/templates/core_pkg/default-config/metadir/+MANIFEST b/tools/templates/core_pkg/default-config/metadir/+MANIFEST index 8528dec..8809948 100644 --- a/tools/templates/core_pkg/default-config/metadir/+MANIFEST +++ b/tools/templates/core_pkg/default-config/metadir/+MANIFEST @@ -11,5 +11,5 @@ deps: { } categories [ security, ] licenselogic: single -licenses: [ BSD2CLAUSE, ] +licenses: [ ESF, ] options: { } diff --git a/tools/templates/core_pkg/kernel-debug/metadir/+MANIFEST b/tools/templates/core_pkg/kernel-debug/metadir/+MANIFEST index 53bec29..6830977 100644 --- a/tools/templates/core_pkg/kernel-debug/metadir/+MANIFEST +++ b/tools/templates/core_pkg/kernel-debug/metadir/+MANIFEST @@ -11,5 +11,5 @@ deps: { } categories [ security, ] licenselogic: single -licenses: [ BSD2CLAUSE, ] +licenses: [ ESF, ] options: { } diff --git a/tools/templates/core_pkg/kernel/metadir/+MANIFEST b/tools/templates/core_pkg/kernel/metadir/+MANIFEST index 91e6fa7..2961d9a 100644 --- a/tools/templates/core_pkg/kernel/metadir/+MANIFEST +++ b/tools/templates/core_pkg/kernel/metadir/+MANIFEST @@ -11,5 +11,5 @@ deps: { } categories [ security, ] licenselogic: single -licenses: [ BSD2CLAUSE, ] +licenses: [ ESF, ] options: { } diff --git a/tools/templates/core_pkg/rc/metadir/+MANIFEST b/tools/templates/core_pkg/rc/metadir/+MANIFEST index 3099d1f..4c8595d 100644 --- a/tools/templates/core_pkg/rc/metadir/+MANIFEST +++ b/tools/templates/core_pkg/rc/metadir/+MANIFEST @@ -11,5 +11,5 @@ deps: { } categories [ security, ] licenselogic: single -licenses: [ BSD2CLAUSE, ] +licenses: [ ESF, ] options: { } diff --git a/tools/templates/core_pkg/repo-devel/metadir/+MANIFEST b/tools/templates/core_pkg/repo-devel/metadir/+MANIFEST index 745383a..4f9de45 100644 --- a/tools/templates/core_pkg/repo-devel/metadir/+MANIFEST +++ b/tools/templates/core_pkg/repo-devel/metadir/+MANIFEST @@ -11,5 +11,5 @@ deps: { } categories [ security, ] licenselogic: single -licenses: [ BSD2CLAUSE, ] +licenses: [ ESF, ] options: { } diff --git a/tools/templates/core_pkg/repo/metadir/+MANIFEST b/tools/templates/core_pkg/repo/metadir/+MANIFEST index 9487b7b..944c084 100644 --- a/tools/templates/core_pkg/repo/metadir/+MANIFEST +++ b/tools/templates/core_pkg/repo/metadir/+MANIFEST @@ -11,5 +11,5 @@ deps: { } categories [ security, ] licenselogic: single -licenses: [ BSD2CLAUSE, ] +licenses: [ ESF, ] options: { } |
