This commit is contained in:
Josh Soref 2022-07-18 07:59:03 -04:00 committed by GitHub
parent 48e5f9f2ab
commit 20a3c3da38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
99 changed files with 162 additions and 162 deletions

View File

@ -25,7 +25,7 @@ All issues reported will have to be triaged and prioritised. As we
are a small team we may not always have the time to implement and help,
but reporting an issue may help others to fill in.
The issue catetories are as follows:
The issue categories are as follows:
* support: community-based help figuring out setup issues or code problems
* cleanup: cosmetic changes or non-operational bugs (display issues, etc.)

View File

@ -94,7 +94,7 @@ Fetch changes from the running system for all known files.
make lint
---------
Run serveral syntax checks on the repository. This is recommended
Run several syntax checks on the repository. This is recommended
before issuing a pull request on GitHub.
make style

View File

@ -163,7 +163,7 @@ function write_config($desc = '', $backup = true)
return -1;
}
/* on succesfull save, serialize config back to global */
/* on successful save, serialize config back to global */
$config = $cnf->toArray(listtags());
return $config;

View File

@ -266,12 +266,12 @@ function filter_core_rules_system($fw, $defaults)
'to' => 'ff02::/16', 'direction' => 'in' ),
$defaults['pass']
);
// block all targetting port 0
// block all targeting port 0
foreach (array('from_port', 'to_port') as $target) {
$fw->registerFilterRule(
1,
array('ipprotocol' => 'inet46', 'protocol' => 'tcp/udp', $target => '0',
'descr' => 'block all targetting port 0'),
'descr' => 'block all targeting port 0'),
$defaults['block']
);
}

View File

@ -209,7 +209,7 @@ function _interfaces_vlan_configure($vlan)
{
interfaces_bring_up($vlan['if']); /* XXX overreach? */
/* destroy is a safety precaution, when confguring via api or gui this function should only be called on new vlans */
/* destroy is a safety precaution, when configuring via api or gui this function should only be called on new vlans */
legacy_interface_destroy($vlan['vlanif']);
legacy_interface_create('vlan', $vlan['vlanif']);
@ -1709,7 +1709,7 @@ function interface_wireless_configure($if, &$wancfg)
$wlcmd[] = "-mediaopt adhoc";
}
/* Not neccesary to set BSS mode as this is default if adhoc and/or hostap is NOT set */
/* Not necessary to set BSS mode as this is default if adhoc and/or hostap is NOT set */
/* handle hide ssid option */
if (isset($wlcfg['hidessid']['enable'])) {

View File

@ -234,7 +234,7 @@ function legacy_interfaces_details($intf = null)
$cmd = '/sbin/ifconfig -m -v ' . $tmp_intf;
exec($cmd . ' 2>&1', $ifconfig_data, $ret);
if ($ret) {
/* only error if no explicit interface was choosen */
/* only error if no explicit interface was chosen */
if (empty($intf)) {
log_error('The command `' . $cmd . '\' failed to execute ' . implode(' ', $ifconfig_data));
}

View File

@ -1863,7 +1863,7 @@ function dhcpd_staticmap($domain_fallback = 'not.found', $ifconfig_details = nul
}
// XXX: dhcpdv6 domain entries have been superseded by domainsearchlist,
// for backward compatibilty support both here.
// for backward compatibility support both here.
if ($inet == 6 && !empty($host['domainsearchlist'])) {
$domain = $host['domainsearchlist'];
} elseif (!empty($host['domain'])) {

View File

@ -133,7 +133,7 @@ function dpinger_configure_do($verbose = false, $gwname = null, $bootup = false)
if (is_ipaddrv4($gateway['gateway'])) {
foreach (interfaces_addresses($gateway['interface'], false, $ifconfig_details) as $addr) {
/* explictly do not require $addr['alias'] to be true here */
/* explicitly do not require $addr['alias'] to be true here */
if ($addr['family'] != 'inet') {
continue;
}

View File

@ -94,7 +94,7 @@ function loopback_configure_do($verbose = false, $device = null)
}
}
// destroy non existing interfaces
// destroy nonexistent interfaces
foreach ($configured_interfaces as $intf) {
if (strpos($intf, "lo") === 0) {
if (!in_array($intf, $configured_devices)) {

View File

@ -497,7 +497,7 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
* If a specific IP address (VIP) is requested, use it.
* Otherwise, if a specific interface is requested, use
* it unless "any" interface was selected, then the local
* directive will be ommited.
* directive will be omitted.
*/
if (is_ipaddr($settings['ipaddr'])) {
$iface_ip = $settings['ipaddr'];
@ -972,7 +972,7 @@ function openvpn_delete($mode, &$settings)
* generate config (text) data for a single client specific override
* @param array $settings csc item
* @param array $server openvpn server item
* @param string $target_filename write to filename, or use configured/generated path when emtpy
* @param string $target_filename write to filename, or use configured/generated path when empty
* @return string|boolean filename or false when unable to (missing common name or vpnid)
*/
function openvpn_csc_conf_write($settings, $server, $target_filename = null)

View File

@ -136,7 +136,7 @@ function vxlan_configure_do($verbose = false, $device = null)
}
}
// destroy non existing interfaces
// destroy nonexistent interfaces
foreach ($interfaces_details as $intf => $data) {
if (strpos($intf, "vxlan") === 0) {
if (!in_array($intf, $configured_devices)) {

View File

@ -100,7 +100,7 @@ function webgui_configure_do($verbose = false, $interface = '')
if ($config['system']['webgui']['protocol'] == "https") {
$cert =& lookup_cert($config['system']['webgui']['ssl-certref']);
if (!is_array($cert) && !$cert['crt'] && !$cert['prv']) {
/* XXX for now only if a certificate is not availabe */
/* XXX for now only if a certificate is not available */
webgui_create_selfsigned(false);
$cert =& lookup_cert($config['system']['webgui']['ssl-certref']);
}
@ -139,7 +139,7 @@ function webgui_configure_do($verbose = false, $interface = '')
*/
killbyname('php-cgi', 'HUP');
/* start lighthttpd */
/* start lighttpd */
if (!count($listeners) || mwexec('/usr/local/sbin/lighttpd -f /var/etc/lighty-webConfigurator.conf')) {
if ($verbose) {
echo "failed.\n";
@ -361,7 +361,7 @@ mimetype.assign = (
url.access-deny = ( "~", ".inc" )
######### Options that are good to be but not neccesary to be changed #######
######### Options that are good to be but not necessary to be changed #######
## bind to port (default: 80)

View File

@ -147,7 +147,7 @@ function restore_config_section_xmlrpc($new_config)
$old_config = $config;
// Some sections should just be copied and not merged, namely if there's a risk of attributes being removed
// without being seen by the remote remote (backup) side.
// without being seen by the remote (backup) side.
// (ipsec, openvpn, nat can probably moved out later by specifying a better path to the attribute)
$sync_full = array('ipsec', 'wol', 'dnsmasq', 'load_balancer', 'openvpn', 'nat', 'dhcpd', 'dhcpv6');
$sync_full_done = array();

View File

@ -181,7 +181,7 @@ function carp_sync_xml($url, $username, $password, $sections, $debug)
// remove items which may not be synced
remove_nosync($transport_data);
// ***** post proccessing *****
// ***** post processing *****
// dhcpd, unchanged from legacy code (may need some inspection later)
if (is_array($transport_data['dhcpd'])) {
foreach($transport_data['dhcpd'] as $dhcpif => $dhcpifconf) {

View File

@ -80,7 +80,7 @@ system_resolvconf_generate();
system_hosts_generate();
if ($config['interfaces'][$interface]['ipaddrv6'] == 'slaac') {
/* require immediate recofiguration before reconfiguring clients */
/* require immediate reconfiguration before reconfiguring clients */
plugins_configure('dhcp', false, ['inet6']);
}

View File

@ -100,7 +100,7 @@ else
chmod 755 /root # XXX 750 when ready
fi
# XXX remove all renmants of /root/var handling after 22.7
# XXX remove all remnants of /root/var handling after 22.7
for DIR in ${MFS_DIRS}; do
# unconditionally remove old /var links now that the
# feature is constrained to /var/log directory

View File

@ -45,7 +45,7 @@ certs = $dir/certs # Where the issued certs are kept
crl_dir = $dir/crl # Where the issued crl are kept
database = $dir/index.txt # database index file.
#unique_subject = no # Set to 'no' to allow creation of
# several ctificates with same subject.
# several certificates with same subject.
new_certs_dir = $dir/newcerts # default place for new certs.
certificate = $dir/cacert.pem # The CA certificate
@ -56,7 +56,7 @@ crl = $dir/crl.pem # The current CRL
private_key = $dir/private/cakey.pem# The private key
RANDFILE = $dir/private/.rand # private random number file
x509_extensions = usr_cert # The extentions to add to the cert
x509_extensions = usr_cert # The extensions to add to the cert
# Comment out the following two lines for the "traditional"
# (and highly broken) format.
@ -108,7 +108,7 @@ default_bits = 1024
default_keyfile = privkey.pem
distinguished_name = req_distinguished_name
attributes = req_attributes
x509_extensions = v3_ca # The extentions to add to the self signed cert
x509_extensions = v3_ca # The extensions to add to the self signed cert
# Passwords for private keys if not present they will be prompted for
# input_password = secret

View File

@ -53,7 +53,7 @@ parameter, but not intended to handle operating system information.
.Pp
The default package is assumed to be
.Ar core ,
unless another package has been specificed.
unless another package has been specified.
Other packages can be
.Ar base ,
.Ar kernel ,

View File

@ -83,7 +83,7 @@ $di->setShared('session', function () {
]);
$session->setAdapter($files);
$session->start();
// Set session response cookie, unfortunalty we need to read the config here to determine if secure option is
// Set session response cookie, unfortunately we need to read the config here to determine if secure option is
// a valid choice.
$cnf = Config::getInstance();
if ((string)$cnf->object()->system->webgui->protocol == 'https') {

View File

@ -70,7 +70,7 @@ $di->setShared('session', function () {
]);
$session->setAdapter($files);
$session->start();
// Set session response cookie, unfortunalty we need to read the config here to determine if secure option is
// Set session response cookie, unfortunately we need to read the config here to determine if secure option is
// a valid choice.
$cnf = Config::getInstance();
if ((string)$cnf->object()->system->webgui->protocol == 'https') {

View File

@ -92,7 +92,7 @@ class AccessController extends ApiControllerBase
*/
private function getClientIp()
{
// determine orginal sender of this request
// determine original sender of this request
if (
$this->request->getHeader('X-Forwarded-For') != "" &&
explode('.', $this->request->getClientAddress())[0] == '127'

View File

@ -139,19 +139,19 @@ class FirmwareController extends ApiControllerBase
switch (isset($matches[2]) ? strtolower($matches[2]) : 'b') {
case 'p':
$factor *= 1024;
/* FALLTROUGH */
/* FALLTHROUGH */
case 't':
$factor *= 1024;
/* FALLTROUGH */
/* FALLTHROUGH */
case 'g':
$factor *= 1024;
/* FALLTROUGH */
/* FALLTHROUGH */
case 'm':
$factor *= 1024;
/* FALLTROUGH */
/* FALLTHROUGH */
case 'k':
$factor *= 1024;
/* FALLTROUGH */
/* FALLTHROUGH */
default:
break;
}
@ -338,7 +338,7 @@ class FirmwareController extends ApiControllerBase
/**
* Retrieve specific changelog in text and html format
* @param string $version changelog to retrieve
* @return array correspondng changelog in both formats
* @return array corresponding changelog in both formats
* @throws \Exception
*/
public function changelogAction($version)
@ -758,7 +758,7 @@ class FirmwareController extends ApiControllerBase
}
/**
* retrieve exectution status
* retrieve execution status
*/
public function runningAction()
{

View File

@ -140,7 +140,7 @@ class NetflowController extends ApiControllerBase
// aggregation process maybe restarted at all time
$backend->configdRun("netflow aggregate restart");
} else {
// stop collector and agreggator
// stop collector and aggregator
$backend->configdRun("netflow collect stop");
$backend->configdRun("netflow aggregate stop");
}

View File

@ -255,7 +255,7 @@ class AliasUtilController extends ApiControllerBase
$backend->configdpRun("filter add table", array($alias, $address));
return array("status" => "done");
} else {
return array("status" => "failed", "status_msg" => sprintf("non existing alias %s", $alias));
return array("status" => "failed", "status_msg" => sprintf("nonexistent alias %s", $alias));
}
} else {
return array("status" => "failed");

View File

@ -39,7 +39,7 @@ use OPNsense\Core\Config;
class SadController extends ApiControllerBase
{
/**
* Search SAD entrys
* Search SAD entries
* @return array
*/
public function searchAction()

View File

@ -39,7 +39,7 @@ use OPNsense\Core\Config;
class SpdController extends ApiControllerBase
{
/**
* Search SPD entrys
* Search SPD entries
* @return array
*/
public function searchAction()

View File

@ -54,7 +54,7 @@ class TunnelController extends ApiControllerBase
'cast128' => 'CAST128',
'des' => 'DES'
];
$ph1authmethos = [
$ph1authmethods = [
'hybrid_rsa_server' => 'Hybrid RSA + Xauth',
'xauth_rsa_server' => 'Mutual RSA + Xauth',
'xauth_psk_server' => 'Mutual PSK + Xauth',
@ -109,7 +109,7 @@ class TunnelController extends ApiControllerBase
"mobile" => !empty((string)$p1->mobile),
"mode" => (string)$p1->mode,
"proposal" => $ph1proposal,
"authentication" => $ph1authmethos[(string)$p1->authentication_method],
"authentication" => $ph1authmethods[(string)$p1->authentication_method],
"description" => (string)$p1->descr
];
$item['type'] = "{$item['protocol']} {$item['iketype']}";

View File

@ -127,7 +127,7 @@ class ExportController extends ApiControllerBase
* @return array
* @throws \OPNsense\Base\ModelException when unable to create model
*/
private function configuredSetttings($vpnid)
private function configuredSettings($vpnid)
{
$result = array();
$serverModel = $this->getModel()->getServer($vpnid);
@ -191,7 +191,7 @@ class ExportController extends ApiControllerBase
// relevant properties
$result[$vpnid]["mode"] = (string)$server->mode;
$result[$vpnid]["vpnid"] = $vpnid;
$result[$vpnid] = array_merge($result[$vpnid], $this->configuredSetttings($vpnid));
$result[$vpnid] = array_merge($result[$vpnid], $this->configuredSettings($vpnid));
}
return $result;
}

View File

@ -232,7 +232,7 @@
<id>proxy.general.traffic.OverallBandwidthTrotteling</id>
<label>Overall bandwidth throttling (kbps)</label>
<type>text</type>
<help>Enter the allowed overall bandtwith in kilobits per second (leave empty to disable).</help>
<help>Enter the allowed overall bandwidth in kilobits per second (leave empty to disable).</help>
</field>
<field>
<id>proxy.general.traffic.perHostTrotteling</id>

View File

@ -93,7 +93,7 @@ class ServiceController extends ApiControllerBase
$this->sessionClose();
$ipfwstats = json_decode((new Backend())->configdRun("ipfw stats"), true);
if ($ipfwstats != null) {
// ipfw stats are stuctured as they would be using the various ipfw commands, let's reformat
// ipfw stats are structured as they would be using the various ipfw commands, let's reformat
// into something easier to handle from the UI and attach model data.
$result['status'] = "ok";
$result['items'] = array();

View File

@ -28,9 +28,9 @@
<label>Mask</label>
<type>dropdown</type>
<help><![CDATA[Dynamic pipe creation by source or destination address.
<li>Choose destination to give every IP in destination field of rules the specified bandwith. A pipe with 1Mbit e.g. would let 3 clients lend 1Mbit each so 3Mbit max. Normally this is used for download pipes.</li>
<li>Choose source to give every IP in the source field of rules the specified bandwith. Normally this is used for upload pipes.</li>
<li>Leave this value empty if you want to create a pipe with a fixed bandwith.</li>
<li>Choose destination to give every IP in destination field of rules the specified bandwidth. A pipe with 1Mbit e.g. would let 3 clients lend 1Mbit each so 3Mbit max. Normally this is used for download pipes.</li>
<li>Choose source to give every IP in the source field of rules the specified bandwidth. Normally this is used for upload pipes.</li>
<li>Leave this value empty if you want to create a pipe with a fixed bandwidth.</li>
]]></help>
</field>
<field>

View File

@ -22,8 +22,8 @@
<label>mask</label>
<type>dropdown</type>
<help><![CDATA[Dynamic queue creation by source or destination address.
<li>Choose destination to evenly share every IP in destination field of rules the specified bandwith. A pipe with 1Mbit e.g. would let 4 clients lend 250Kbit each. Normally this is used for download queues.</li>
<li>Choose source to evenly share every IP in the source field of rules the specified bandwith. Normally this is used for upload queues.</li>
<li>Choose destination to evenly share every IP in destination field of rules the specified bandwidth. A pipe with 1Mbit e.g. would let 4 clients lend 250Kbit each. Normally this is used for download queues.</li>
<li>Choose source to evenly share every IP in the source field of rules the specified bandwidth. Normally this is used for upload queues.</li>
<li>Leave this value empty if you want to specify multiple queues with different weights.</li>
]]></help>
</field>

View File

@ -53,7 +53,7 @@ interface IService
public function supportedAuthenticators();
/**
* set the username for this service, in some scenarios this might be prefixed with some addtional
* set the username for this service, in some scenarios this might be prefixed with some additional
* logic to determine which authenticators are actually supported.
* (in case one pam service has multiple real services assigned)
* @param $username string
@ -68,7 +68,7 @@ interface IService
/**
* When authenticated, validate if this user is actually allowed to access the service, there might be
* other constraints, such as required gropu memberships.
* other constraints, such as required group memberships.
* @return boolean is authenticated
*/
public function checkConstraints();

View File

@ -530,7 +530,7 @@ class Config extends Singleton
if (file_exists($target_dir . "config-" . $timestamp . ".xml")) {
// The new target backup filename shouldn't exists, because of the use of microtime.
// in the unlikely event that we can process events too fast for microtime(), suffix with a more
// precise tiestamp to ensure we can't miss a backup
// precise timestamp to ensure we can't miss a backup
$target_filename = "config-" . $timestamp . "_" . hrtime()[1] . ".xml";
} else {
$target_filename = "config-" . $timestamp . ".xml";
@ -679,7 +679,7 @@ class Config extends Singleton
if ($backup_filename) {
$this->auditLogChange($backup_filename, $revision);
// use syslog to trigger a new configd event, which should signal a syshook config (in batch).
// Althought we include the backup filename, the event handler is responsible to determine the
// Although we include the backup filename, the event handler is responsible to determine the
// last processed event itself. (it's merely added for debug purposes)
$logger = new Logger(
'messages',

View File

@ -285,7 +285,7 @@ class Util
*/
public static function calcRuleHash($rule)
{
// remove irrelavant fields
// remove irrelevant fields
foreach (array('updated', 'created', 'descr') as $key) {
unset($rule[$key]);
}

View File

@ -290,7 +290,7 @@ class Gateways
/**
* determine default gateway, exclude gateways in skip list
* since getGateways() is correcly ordered, we just need to find the first active, not down gateway
* since getGateways() is correctly ordered, we just need to find the first active, not down gateway
* @param array|null $skip list of gateways to ignore
* @param string $ipproto inet/inet6 type
* @return string type name
@ -489,7 +489,7 @@ class Gateways
}
}
}
// exit when tier has (a) usuable gateway(s)
// exit when tier has (a) usable gateway(s)
if (!empty($result[(string)$gw_group->name])) {
break;
}

View File

@ -645,7 +645,7 @@ abstract class BaseModel
if ($this->internal_mountpoint == ':memory:') {
return false;
} elseif (version_compare($this->internal_current_model_version, $this->internal_model_version, '<')) {
$upgradePerfomed = false;
$upgradePerformed = false;
$migObjects = array();
$logger = new Logger(
'messages',
@ -687,7 +687,7 @@ abstract class BaseModel
try {
$migobj->run($this);
$migObjects[] = $migobj;
$upgradePerfomed = true;
$upgradePerformed = true;
} catch (Exception $e) {
$logger->error("failed migrating from version " .
$this->internal_current_model_version .
@ -701,7 +701,7 @@ abstract class BaseModel
}
// serialize to config after last migration step, keep the config data static as long as not all
// migrations have completed.
if ($upgradePerfomed) {
if ($upgradePerformed) {
try {
$this->serializeToConfig();
foreach ($migObjects as $migobj) {

View File

@ -67,7 +67,7 @@ class ComparedToFieldConstraint extends BaseConstraint
}
if (
!$this->is_contraint_fulfilled(
!$this->is_constraint_fulfilled(
$operator,
floatval((string)$node),
floatval((string)$other_node_content)
@ -83,9 +83,9 @@ class ComparedToFieldConstraint extends BaseConstraint
* @param $operator string one of gt|gte|lt|lte|eq|neq
* @param $our_value float the value of this field
* @param $foreign_value float the value of the referenced field
* @return bool if the contraint is fulfilled
* @return bool if the constraint is fulfilled
*/
private function is_contraint_fulfilled($operator, $our_value, $foreign_value)
private function is_constraint_fulfilled($operator, $our_value, $foreign_value)
{
switch ($operator) {
case 'gt':

View File

@ -29,7 +29,7 @@
namespace OPNsense\Base\Constraints;
/**
* validate if a field is set depening on the setting of another field
* validate if a field is set depending on the setting of another field
* containing a specific value
* Class SetIfConstraint
* @package OPNsense\Base\Constraints

View File

@ -427,7 +427,7 @@ abstract class BaseField
}
/**
* check for existance of child attribute
* check for existence of child attribute
* @return bool if child exists
*/
public function hasChild($name)

View File

@ -31,7 +31,7 @@ namespace OPNsense\Base\FieldTypes;
use OPNsense\Core\Config;
/**
* Class LegacyLinkField field, read only referal to a config item in the legacy configuration.
* Class LegacyLinkField field, read only referral to a config item in the legacy configuration.
* @package OPNsense\Base\FieldTypes
*/
class LegacyLinkField extends BaseField

View File

@ -31,7 +31,7 @@
namespace OPNsense\Core\ACL;
/**
* Class ACL, access control list wrappper
* Class ACL, access control list wrapper
* @package OPNsense\Core
*/
class ACL

View File

@ -118,7 +118,7 @@ class Category extends BaseModel
/**
* collect unique categories from rules and updates the model with auto generated items.
* XXX: if this operation turns out to be a bottleneck, we should move the maintance responsibiliy to the caller
* XXX: if this operation turns out to be a bottleneck, we should move the maintenance responsibility to the caller
* for the item in question (rule update)
* @return bool true if changed
*/

View File

@ -45,11 +45,11 @@ class Monit extends BaseModel
'process' => ['Existence', 'ProcessResource', 'ProcessDiskIO',
'UID', 'GID', 'PID', 'PPID', 'Uptime', 'Connection', 'Custom'],
'file' => ['Existence', 'FileChecksum', 'Timestamp', 'FileSize',
'FileContent', 'Permisssion', 'UID', 'GID', 'Custom'],
'fifo' => ['Existence', 'Timestamp', 'Permisssion', 'UID', 'GID', 'Custom'],
'FileContent', 'Permission', 'UID', 'GID', 'Custom'],
'fifo' => ['Existence', 'Timestamp', 'Permission', 'UID', 'GID', 'Custom'],
'filesystem' => ['Existence', 'FilesystemMountFlags',
'SpaceUsage', 'InodeUsage', 'DiskIO', 'Permisssion', 'Custom'],
'directory' => ['Existence', 'Timestamp', 'Permisssion', 'UID', 'GID', 'Custom'],
'SpaceUsage', 'InodeUsage', 'DiskIO', 'Permission', 'Custom'],
'directory' => ['Existence', 'Timestamp', 'Permission', 'UID', 'GID', 'Custom'],
'host' => ['NetworkPing', 'Connection', 'Custom'],
'system' => ['SystemResource', 'Uptime', 'Custom'],
'custom' => ['ProgramStatus', 'Custom'],
@ -104,7 +104,7 @@ class Monit extends BaseModel
'write rate',
'service time'
],
'Permisssion' => [
'Permission' => [
'failed permission',
'changed permission'
],
@ -201,7 +201,7 @@ class Monit extends BaseModel
$key
));
} else {
// set the test tytpe according to the condition
// set the test type according to the condition
$parentNode->type = $type;
}
break;

View File

@ -305,7 +305,7 @@
<SpaceUsage>Space Usage</SpaceUsage>
<InodeUsage>Inode Usage</InodeUsage>
<DiskIO>Disk I/O</DiskIO>
<Permisssion>Permission</Permisssion>
<Permission>Permission</Permission>
<UID>UID</UID>
<GID>GID</GID>
<PID>PID</PID>

View File

@ -62,7 +62,7 @@ class TrafficShaper extends BaseModel
if ($currentval > $maximumval) {
$messages->appendMessage(new Message(
gettext(sprintf(
"%d %s/s exceeds the maximum bandwith of %d %s/s.",
"%d %s/s exceeds the maximum bandwidth of %d %s/s.",
$currentval,
$parentNode->bandwidthMetric,
$maximumval,

View File

@ -68,7 +68,7 @@
requestHandler: function(request){
if ( $('#severity_filter').val().length > 0) {
let selectedSeverity = $('#severity_filter').val();
// get selected severities or severeties below or equal to selected
// get selected severities or severities below or equal to selected
request['severity'] = filter_exact ? selectedSeverity : severities.slice(0,severities.indexOf(selectedSeverity) + 1);
}
return request;

View File

@ -89,7 +89,7 @@
{{ partial("layout_partials/base_form",['fields':captureForm,'id':'frm_CaptureSettings', 'apply_btn_id':'btn_save_capture'])}}
</div>
<div id="cache" class="tab-pane fade in">
<!-- tab page netfow cache -->
<!-- tab page netflow cache -->
<table class="table table-striped" id="cache_stats">
<thead>
<tr>

View File

@ -273,7 +273,7 @@
var stepsize = data["d3"]["stepSize"];
var scale = "{{ lang._('seconds') }}";
var dtformat = '%m/%d %H:%M';
var visable_time=to-from;
var visible_time=to-from;
// set defaults based on stepsize
if (stepsize >= 86400) {
@ -291,11 +291,11 @@
}
// if we have a focus area then change the x-scale to reflect current view
if (visable_time >= (86400*7)) { // one week
if (visible_time >= (86400*7)) { // one week
dtformat = '\'%y w%U%';
} else if (visable_time >= (3600*48)) { // 48 hours
} else if (visible_time >= (3600*48)) { // 48 hours
dtformat = '\'%y d%j%';
} else if (visable_time >= (60*maxitems)) { // max minutes
} else if (visible_time >= (60*maxitems)) { // max minutes
dtformat = '%H:%M';
}
@ -336,7 +336,7 @@
}
// Create tables (general and detail)
if ($('input:radio[name=show_table]:checked').val() == 1) { // check if togle table is on
if ($('input:radio[name=show_table]:checked').val() == 1) { // check if toggle table is on
table_head = "<th>#</th>";
if ($('input:radio[name=toggle_time]:checked').val() == 1) {
table_head += "<th>{{ lang._('full date & time') }}</th>";

View File

@ -247,7 +247,7 @@
break;
case 'urltable':
$("#row_alias\\.updatefreq").show();
/* FALLTROUGH */
/* FALLTHROUGH */
default:
$("#alias_type_default").show();
$("#alias\\.proto").selectpicker('hide');

View File

@ -103,7 +103,7 @@
}
}],
onshown: function(dialogRef) {
// Remove all pre-existing event listeners, just to be sure.
// Remove all preexisting event listeners, just to be sure.
$('#ip-search').off();
$('#ip-search').on('click', function(event) {
if (!$("#ip-search > span").hasClass('fa-search')) {

View File

@ -174,7 +174,7 @@
<script src="{{ cache_safe('/ui/js/tokenize2.js') }}"></script>
<link rel="stylesheet" type="text/css" href="{{ cache_safe(theme_file_or_default('/css/tokenize2.css', theme_name)) }}" rel="stylesheet" />
<!-- Bootgrind (grid system from http://www.jquery-bootgrid.com/ ) -->
<!-- Bootgrid (grid system from http://www.jquery-bootgrid.com/ ) -->
<link rel="stylesheet" type="text/css" href="{{ cache_safe(theme_file_or_default('/css/jquery.bootgrid.css', theme_name)) }}" />
<script src="{{ cache_safe('/ui/js/jquery.bootgrid.js') }}"></script>
<!-- Bootstrap type ahead -->

View File

@ -82,8 +82,8 @@ class ComparedToFieldConstraintTest extends \PHPUnit\Framework\TestCase
* @param $node_value integer field content
* @param $other_field_value integer field content
* @param $field string name of the field
* @param $operator string see the related documentaton
* @return ComparedToFieldConstraint the created contraint
* @param $operator string see the related documentation
* @return ComparedToFieldConstraint the created constraint
*/
private function make_validator($node_value, $other_field_value, $field, $operator)
{

View File

@ -209,7 +209,7 @@ class ModelRelationFieldTest extends Field_Framework_TestCase
}
/**
* Selecting none option, while blank desciption override.
* Selecting none option, while blank description override.
* Defined blank description should pass through to value, and show selected.
* Needs not required (default), and multiple false (default)
*/
@ -231,7 +231,7 @@ class ModelRelationFieldTest extends Field_Framework_TestCase
}
/**
* Selecting none option, while blank desciption override.
* Selecting none option, while blank description override.
* Empty Blank description should get override with word "none"
* Needs not required (default), and multiple false (default)
*/

View File

@ -83,7 +83,7 @@ class CPBackgroundProcess(object):
self.db.del_client(zoneid, session['sessionId'])
if sessions_deleted == len(sessions) or len(sessions) == 0:
# when there's no session active, add a new one
# (only administrative, the sync process will add it if neccesary)
# (only administrative, the sync process will add it if necessary)
if ip_address is not None:
self.db.add_client(zoneid, "---ip---", "", ip_address, "")
else:
@ -227,7 +227,7 @@ def main():
capture_output=True
)
except OSError:
# if accounting script crashes don't exit backgroung process
# if accounting script crashes don't exit background process
pass
# sleep

View File

@ -36,7 +36,7 @@ class Config(object):
_cnf_filename = "/usr/local/etc/captiveportal.conf"
def __init__(self):
""" consctruct new config object
""" construct new config object
"""
self.last_updated = 0
self._conf_handle = None

View File

@ -95,7 +95,7 @@ class IPFW(object):
@staticmethod
def list_accounting_info():
""" list accounting info per ip addres, addresses can't overlap in zone's so we just output all we know here
""" list accounting info per ip address, addresses can't overlap in zone's so we just output all we know here
instead of trying to map addresses back to zones.
:return: list accounting info per ip address
"""

View File

@ -97,7 +97,7 @@ def run_watcher(target_filename, default_domain, watch_file, service_pid):
if __name__ == '__main__':
parser = argparse.ArgumentParser()
parser.add_argument('--domain', help='default domain to use', default='local')
parser.add_argument('--foreground', help='run in forground', default=False, action='store_true')
parser.add_argument('--foreground', help='run in foreground', default=False, action='store_true')
parser.add_argument('--pid', help='pid file location', default='/var/run/dnsmasq_dhcpd.pid')
parser.add_argument('--servicepid', help='dnsmasq pid file location', default='/var/run/dnsmasq.pid')
parser.add_argument('--source', help='source leases file', default='/var/dhcpd/var/db/dhcpd.leases')

View File

@ -210,7 +210,7 @@ if __name__ == '__main__':
default='/var/dhcpd/var/db/dhcpd.leases')
parser.add_argument('--target', help='target config file, used when unbound restarts',
default='/var/unbound/dhcpleases.conf')
parser.add_argument('--foreground', help='run in forground', default=False, action='store_true')
parser.add_argument('--foreground', help='run in foreground', default=False, action='store_true')
parser.add_argument('--domain', help='default domain to use', default='local')
parser.add_argument('--config', help='configuration file to use', default='/usr/local/etc/unbound_dhcpd.conf')

View File

@ -170,7 +170,7 @@ if __name__ == '__main__':
# no id for translation rules
rule['label'] = "%s rule" % rule['action']
elif len(rulep) > 0 and len(rulep[-1]) == 32 and set(rulep[-1]).issubset(HEX_DIGITS):
# rule id apended in record format, don't use rule sequence number in that case either
# rule id appended in record format, don't use rule sequence number in that case either
rule['rid'] = rulep[-1]
if rulep[-1] in running_conf_descr:
rule['label'] = running_conf_descr[rulep[-1]]

View File

@ -29,7 +29,7 @@
#
# connection: error|unauthenticated|misconfigured|unresolved|ok
# repository: error|untrusted|unsigned|revoked|incomplete|forbidden|ok
# last_ckeck: <date_time_stamp>
# last_check: <date_time_stamp>
# download_size: <size_of_total_downloads>[,<size_of_total_downloads>]
# new_packages: array with { name: <package_name>, version: <package_version> }
# reinstall_packages: array with { name: <package_name>, version: <package_version> }

View File

@ -75,7 +75,7 @@
## (3Com Impact IQ only)
##
## We set $OptimizeNextTime to "yes" after a successful connection so we
## can avoid verifing configuration when things are working good.
## can avoid verifying configuration when things are working good.
##
## Internal variables:
##
@ -992,7 +992,7 @@ ImpactIQCheckDirnos:
if $TA_Bonding == "yes" set $checkValue "001"
if $TA_Bonding == "yes" set $checkValueNew "1"
set $checkCmd "S80"
set $checkMsg "Reprogramming mutli-link PPP setting..."
set $checkMsg "Reprogramming multi-link PPP setting..."
call ModemCheckValue
# Restart if necessary, and wait extra long if the switch type changed
@ -1185,7 +1185,7 @@ AdtranXRTDialError:
failure
##
## Check the last status bufffer entry for what the problem is
## Check the last status buffer entry for what the problem is
## XXX Figure out more stuff to look for and when it can happen
##

View File

@ -91,8 +91,8 @@ class AsyncLookup:
dnsResolver = Resolver()
dnsResolver.timeout = 2
tasks = []
for adres in addresses:
tasks.append(dnsResolver.resolve_address(adres))
for address in addresses:
tasks.append(dnsResolver.resolve_address(address))
responses = await asyncio.gather(*tasks, return_exceptions=True)
for response in responses:
if type(response) is dns.resolver.Answer:

View File

@ -106,7 +106,7 @@ class BaseFlowAggregator(object):
cur.close()
def _create_target_table(self):
""" construct target aggregate table, using resulution and list of agg_fields
""" construct target aggregate table, using resolution and list of agg_fields
:return: None
"""
if self._db_connection is not None:

View File

@ -57,7 +57,7 @@ class FlowInterfaceTotals(BaseFlowAggregator):
def __init__(self, resolution, database_dir='/var/netflow'):
"""
:param resolution: sample resultion (seconds)
:param resolution: sample resolution (seconds)
:return: None
"""
super(FlowInterfaceTotals, self).__init__(resolution, database_dir)

View File

@ -57,7 +57,7 @@ class FlowDstPortTotals(BaseFlowAggregator):
def __init__(self, resolution, database_dir='/var/netflow'):
"""
:param resolution: sample resultion (seconds)
:param resolution: sample resolution (seconds)
:return: None
"""
super(FlowDstPortTotals, self).__init__(resolution, database_dir)

View File

@ -57,7 +57,7 @@ class FlowSourceAddrTotals(BaseFlowAggregator):
def __init__(self, resolution, database_dir='/var/netflow'):
"""
:param resolution: sample resultion (seconds)
:param resolution: sample resolution (seconds)
:return: None
"""
super(FlowSourceAddrTotals, self).__init__(resolution, database_dir)

View File

@ -272,7 +272,7 @@ class DomainSorter(object):
def filename_in_ignorelist(bfilename, filename_ext):
""" ignore certain files from processing.
:param bfilename: basefilename to inspect
:param filename_ext: extention of the filename
:param filename_ext: extension of the filename
"""
if filename_ext in ['pdf', 'txt', 'doc']:
return True

View File

@ -27,7 +27,7 @@
set -e
# From this shell script never execute any remote work priror to user
# From this shell script never execute any remote work prior to user
# consent. The first action is the unconditional changelog fetch after
# script invoke. After that we opportunistically run the selected major
# "upgrade"/minor "update" request as it appears to be available.

View File

@ -55,7 +55,7 @@ if __name__ == '__main__':
for rule_info_record in RuleCache.list_rules(filename=filename):
# default behavior, do not touch rule, only copy to output
rule = rule_info_record['rule']
# change rule if in rule rule updates
# change rule if in rule updates
if rule_info_record['metadata'] is not None and 'sid' in rule_info_record['metadata'] \
and rule_info_record['metadata']['sid'] in rule_updates:
# search last comment marker

View File

@ -225,7 +225,7 @@ class RuleCache(object):
if last_mtime == results[0][0] and len(all_rule_files) == results[0][1] and table_count == 5:
return False
except sqlite3.DatabaseError:
# if some reason the cache is unreadble, continue and report changed
# if some reason the cache is unreadable, continue and report changed
pass
return True

View File

@ -115,7 +115,7 @@ class Helpers(object):
a list. The configuration doesn't know if a non repeating item is supposed to be a list of items, this makes
it explicit.
:param tag: tag in dot notation (section.item)
:param sortBy: resort result by specfied key
:param sortBy: resort result by specified key
:return: []
"""
result = self.getNodeByTag(tag)

View File

@ -303,7 +303,7 @@ class Template(object):
def iter_modules(self, module_name):
"""
:param module_name: module name in dot notation ( company.module ), may use wildcards
:return: templates matching paterns
:return: templates matching patterns
"""
for template_name in sorted(self.list_modules()):
wildcard_pos = module_name.find('*')

View File

@ -34,7 +34,7 @@ server.indexfiles = ( "index.php", "index.html",
url.access-deny = ( "~", ".inc" )
######### Options that are good to be but not neccesary to be changed #######
######### Options that are good to be but not necessary to be changed #######
## bind to port (default: 80)
server.bind = "127.0.0.1"

View File

@ -444,7 +444,7 @@ outputs:
- syslog:
enabled: {% if helpers.empty('OPNsense.IDS.general.syslog') %}no{% else %}yes{% endif %}
# reported identity to syslog. If ommited the program name (usually
# reported identity to syslog. If omitted the program name (usually
# suricata) will be used.
#identity: "suricata"
facility: local5
@ -855,7 +855,7 @@ app-layer:
# server-config: List of server configurations to use if address matches
# address: List of IP addresses or networks for this block
# personalitiy: List of personalities used by this block
# personality: List of personalities used by this block
#
# Then, all the fields from default-config can be overloaded
#
@ -903,7 +903,7 @@ app-layer:
# detection change between runs. It is set to 'yes' by default.
#randomize-inspection-sizes: yes
# If randomize-inspection-sizes is active, the value of various
# inspection size will be choosen in the [1 - range%, 1 + range%]
# inspection size will be chosen in the [1 - range%, 1 + range%]
# range
# Default value of randomize-inspection-range is 10.
#randomize-inspection-range: 10
@ -1491,7 +1491,7 @@ threading:
- worker-cpu-set:
cpu: [ "all" ]
mode: "exclusive"
# Use explicitely 3 threads and don't compute number by using
# Use explicitly 3 threads and don't compute number by using
# detect-thread-ratio variable:
# threads: 3
prio:
@ -1618,7 +1618,7 @@ profiling:
# accept the packet if Suricata is not able to keep pace.
# bypass mark and mask can be used to implement NFQ bypass. If bypass mark is
# set then the NFQ bypass is activated. Suricata will set the bypass mark/mask
# on packet of a flow that need to be bypassed. The Nefilter ruleset has to
# on packet of a flow that need to be bypassed. The Netfilter ruleset has to
# directly accept all packets of a flow once a packet has been marked.
nfq:
# mode: accept

View File

@ -414,7 +414,7 @@ via off
{% endif %}
{% if helpers.exists('OPNsense.proxy.general.suppressVersion') %}
{% if OPNsense.proxy.general.suppressVersion == '1' %}
# Suppres http version string (default=off)
# Suppress http version string (default=off)
httpd_suppress_version_string on
{% endif %}
{% endif %}
@ -424,7 +424,7 @@ icp_port {{OPNsense.proxy.general.icpPort}}
{% endif %}
{% endif %}
{% if helpers.exists('OPNsense.proxy.general.uriWhitespaceHandling') %}
# URI hanlding with Whitespaces (default=strip)
# URI handling with Whitespaces (default=strip)
uri_whitespace {{OPNsense.proxy.general.uriWhitespaceHandling}}
{% endif %}
{% if helpers.exists('OPNsense.proxy.general.forwardedForHandling') %}
@ -445,7 +445,7 @@ delay_pools 1
delay_class 1 3
delay_access 1 allow all
{% if helpers.exists('OPNsense.proxy.general.traffic.OverallBandwidthTrotteling') %}
# Define PerHost and Overall Bandwith Trotteling
# Define PerHost and Overall Bandwidth Trotteling
delay_parameters 1 {{OPNsense.proxy.general.traffic.OverallBandwidthTrotteling|int // 8 * 1000}}/{{OPNsense.proxy.general.traffic.OverallBandwidthTrotteling|int // 8 * 1000}} -1/-1 {{OPNsense.proxy.general.traffic.perHostTrotteling|int // 8 * 1000}}/{{OPNsense.proxy.general.traffic.OverallBandwidthTrotteling|int // 8 * 1000}}
{% else %}
# Define PerHost Trotteling

View File

@ -32,7 +32,7 @@ try {
if (method_exists($e, 'getTitle')) {
$response['errorTitle'] = $e->getTitle();
} else {
$response['errorTitle'] = gettext('An API exception occured');
$response['errorTitle'] = gettext('An API exception occurred');
$response['errorMessage'] = $e->getFile() . ':' . $e->getLine() . ': ' . $response['errorMessage'];
error_log($e);
}

View File

@ -254,7 +254,7 @@ function ajaxGet(url,sendData,callback) {
*/
function watchScrollPosition() {
function current_location() {
// concat url pieces to indentify this page and parameters
// concat url pieces to identify this page and parameters
return window.location.href.replace(/\/|\:|\.|\?|\#/gi, '');
}

View File

@ -135,7 +135,7 @@
font-size: 0;
white-space: nowrap;
// Negative margin for spacing, position for bringing hovered/focused/actived
// Negative margin for spacing, position for bringing hovered/focused/activated
// element above the siblings.
> .btn {
position: relative;

View File

@ -1,6 +1,6 @@
// CSS image replacement
//
// Heads up! v3 launched with with only `.hide-text()`, but per our pattern for
// Heads up! v3 launched with only `.hide-text()`, but per our pattern for
// mixins being reused as classes with the same name, this doesn't hold up. As
// of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`.
//

View File

@ -3,7 +3,7 @@
# Copyright (c) 2006 Scott Ullrich <sullrich@gmail.com>
# All rights reserved.
# Format of file should be deliminted by |
# Format of file should be delimited by |
# Field 1: Source ip
# Field 2: Destination ip
# Field 3: Ping count

View File

@ -452,7 +452,7 @@ if (!empty($_POST['pptplocalipaddress']) && !is_ipaddr($_POST['pptplocalipaddres
$input_errors[] = gettext('Invalid PPTP Local IP address.');
}
if (!empty($_POST['pptpremoteipaddress']) && !is_ipaddr($_POST['pptpremoteipaddress'])) {
$input_errors[] = gettext('Invalid PPTP Remopte IP address.');
$input_errors[] = gettext('Invalid PPTP Remote IP address.');
}
if (!empty($input_errors)) {
$stepid--;

View File

@ -370,7 +370,7 @@ function checkForRanges(){
function processEntries(){
var tempstr, starttimehour, starttimemin, stoptimehour, stoptimemin, errors = "";
var passedValidiation = true;
var passedValidation = true;
//get time specified
starttimehour = parseInt(document.getElementById("starttimehour").value);
@ -383,18 +383,18 @@ function processEntries(){
if (starttimehour > stoptimehour)
{
errors = "Error: Start Hour cannot be greater than Stop Hour.";
passedValidiation = false;
passedValidation = false;
}
else if (starttimehour == stoptimehour)
{
if (starttimemin > stoptimemin){
errors = "Error: Start Minute cannot be greater than Stop Minute.";
passedValidiation = false;
passedValidation = false;
}
}
if (passedValidiation){
if (passedValidation){
addTimeRange();
}
else {

View File

@ -86,7 +86,7 @@ function get_themed_filename($url)
require_once("authgui.inc");
/* Reserved table names to avoid colision */
/* Reserved table names to avoid collision */
$reserved_table_names = [
'bogons',
'bogonsv6',
@ -283,7 +283,7 @@ function get_std_save_message($plain = false)
}
return sprintf(
gettext("The changes have been applied successfully, ".
"remember to update your backup server in %sSystem: High availablity: status%s"),
"remember to update your backup server in %sSystem: High availability: status%s"),
$lnk_start, $lnk_end
);
} else {

View File

@ -562,7 +562,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$input_errors = array();
if (!empty($_POST['if']) && !empty($a_interfaces[$_POST['if']])) {
$if = $_POST['if'];
// read physcial interface name from config.xml
// read physical interface name from config.xml
$pconfig['if'] = $a_interfaces[$if]['if'];
}
$ifgroup = !empty($_GET['group']) ? $_GET['group'] : '';
@ -926,7 +926,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
do_input_validation($pconfig, $reqdfields, $reqdfieldsn, $input_errors);
// check_wireless_mode (more wireless weirness)
// check_wireless_mode (more wireless weirdness)
// validations shouldn't perform actual actions, needs serious fixing at some point
if ($a_interfaces[$if]['wireless']['mode'] != $pconfig['mode']) {
if (does_interface_exist(interface_get_wireless_clone($wlanbaseif))) {
@ -1308,7 +1308,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
// todo: it's probably better to choose one place to store wireless data
// this construction implements a lot of weirness (more info interface_sync_wireless_clones)
// this construction implements a lot of weirdness (more info interface_sync_wireless_clones)
$wlanbaseif = interface_get_wireless_base($a_interfaces[$if]['if']);
if (!empty($pconfig['persistcommonwireless'])) {
config_read_array('wireless', 'interfaces', $wlanbaseif);
@ -2026,7 +2026,7 @@ include("head.inc");
</thead>
<tbody>
<tr>
<td style="width:22%"><a id="help_for_hw_settings_overwrite" href="#" class="showhelp"> <i class="fa fa-info-circle"></i></a> <?=gettext("Overwite global settings"); ?></td>
<td style="width:22%"><a id="help_for_hw_settings_overwrite" href="#" class="showhelp"> <i class="fa fa-info-circle"></i></a> <?=gettext("Overwrite global settings"); ?></td>
<td style="width:78%">
<input id="hw_settings_overwrite" name="hw_settings_overwrite" type="checkbox" value="yes" <?=!empty($pconfig['hw_settings_overwrite']) ? 'checked="checked"' : '' ?>/>
<div class="hidden" data-for="help_for_hw_settings_overwrite">

View File

@ -182,7 +182,7 @@ function window_highlight_table_option()
/**
* load fireall categories and hook change events.
* load firewall categories and hook change events.
* in order to use this partial the html template should contain the following:
* - a <select> with the id "fw_category" to load categories in
* - <tr/> entities with class "rule" to identify the rows to filter

View File

@ -521,7 +521,7 @@ include("head.inc");
<script>
$( document ).ready(function() {
/**
* Additional BOOTP/DHCP Options extenable table
* Additional BOOTP/DHCP Options extendable table
*/
function removeRow() {
if ( $('#numberoptions_table > tbody > tr').length == 1 ) {

View File

@ -355,7 +355,7 @@ include("head.inc");
<script>
$( document ).ready(function() {
/**
* Additional BOOTP/DHCP Options extenable table
* Additional BOOTP/DHCP Options extendable table
*/
function removeRow() {
if ( $('#numberoptions_table > tbody > tr').length == 1 ) {

View File

@ -222,7 +222,7 @@ include("head.inc");
<script>
$( document ).ready(function() {
/**
* Additional BOOTP/DHCP Options extenable table
* Additional BOOTP/DHCP Options extendable table
*/
function removeRow() {
if ( $('#maintable > tbody > tr').length == 1 ) {

View File

@ -73,7 +73,7 @@ include("head.inc");
<?php
$mac_man = json_decode(configd_run('interface list macdb json'), true);
$pfctl_counters = json_decode(configd_run('filter list counters json'), true);
$vmstat_interupts = json_decode(configd_run('system list interrupts json'), true);
$vmstat_interrupts = json_decode(configd_run('system list interrupts json'), true);
foreach (get_interfaces_info(true) as $ifdescr => $ifinfo):
$ifpfcounters = $pfctl_counters[$ifinfo['if']];
legacy_html_escape_form_data($ifinfo);
@ -456,8 +456,8 @@ include("head.inc");
</tr>
<?php
endif;
if (!empty($vmstat_interupts['interrupt_map'][$ifinfo['if']])):
$intrpts = $vmstat_interupts['interrupt_map'][$ifinfo['if']];?>
if (!empty($vmstat_interrupts['interrupt_map'][$ifinfo['if']])):
$intrpts = $vmstat_interrupts['interrupt_map'][$ifinfo['if']];?>
<tr>
<td><?= gettext("Interrupts") ?></td>
<td>
@ -474,9 +474,9 @@ include("head.inc");
foreach ($intrpts as $intrpt):?>
<tr>
<td><?=$intrpt;?></td>
<td><?=implode(' ', $vmstat_interupts['interrupts'][$intrpt]['devices']);?></td>
<td><?=$vmstat_interupts['interrupts'][$intrpt]['total'];?></td>
<td><?=$vmstat_interupts['interrupts'][$intrpt]['rate'];?></td>
<td><?=implode(' ', $vmstat_interrupts['interrupts'][$intrpt]['devices']);?></td>
<td><?=$vmstat_interrupts['interrupts'][$intrpt]['total'];?></td>
<td><?=$vmstat_interrupts['interrupts'][$intrpt]['rate'];?></td>
</tr>
<?php
endforeach; ?>

View File

@ -727,7 +727,7 @@ $(document).ready(function() {
<?php endforeach ?>
</select>
<div class="hidden" data-for="help_for_sshlogingroup">
<?= gettext('Select the allowed groups for remote login. The "wheel" group is always set for recovery purposes and an additional local group can be selected at will. Do not yield remote access to non-adminstrators as every user can access system files using SSH or SFTP.') ?>
<?= gettext('Select the allowed groups for remote login. The "wheel" group is always set for recovery purposes and an additional local group can be selected at will. Do not yield remote access to non-administrators as every user can access system files using SSH or SFTP.') ?>
</div>
</td>
</tr>

View File

@ -1028,7 +1028,7 @@ include("head.inc");
BootstrapDialog.show({
type:BootstrapDialog.TYPE_DANGER,
title: "<?= gettext("Unknown Error");?>",
message: "<?= gettext("Unknown error occured. Try again.");?>",
message: "<?= gettext("Unknown error occurred. Try again.");?>",
buttons: [
{
label: "<?=gettext("OK");?>",
@ -1459,7 +1459,7 @@ $( document ).ready(function() {
<li><strong><?= gettext('Client Certificate'); ?></strong>: <?= $key_usages['nonRepudiation']; ?>, <?= $key_usages['digitalSignature']; ?>, <?= $key_usages['keyEncipherment']; ?></li>
<li><strong><?= gettext('Server Certificate'); ?></strong>: <?= $key_usages['digitalSignature']; ?>, <?= $key_usages['keyEncipherment']; ?></li>
<li><strong><?= gettext('Combined Client/Server Certificate'); ?></strong>: <?= $key_usages['nonRepudiation']; ?>, <?= $key_usages['digitalSignature']; ?>, <?= $key_usages['keyEncipherment'];?></li>
<li><strong><?= gettext('Certificate Authority'); ?></strong>: <i><?= gettext('None. Just add CA option in basicConstraits.'); ?></i></li>
<li><strong><?= gettext('Certificate Authority'); ?></strong>: <i><?= gettext('None. Just add CA option in basicConstraints.'); ?></i></li>
</ul>
</div>
</td>
@ -1482,7 +1482,7 @@ $( document ).ready(function() {
<li><strong><?= gettext('Client Certificate'); ?></strong>: <?= $extended_key_usages['1.3.6.1.5.5.7.3.2']; ?></li>
<li><strong><?= gettext('Server Certificate'); ?></strong>: <?= $extended_key_usages['1.3.6.1.5.5.7.3.1'] ?>, <?= $extended_key_usages['1.3.6.1.5.5.8.2.2']; ?></li>
<li><strong><?= gettext('Combined Client/Server Certificate'); ?></strong>: <?= $extended_key_usages['1.3.6.1.5.5.7.3.2']; ?>, <?= $extended_key_usages['1.3.6.1.5.5.7.3.1'] ?>, <?= $extended_key_usages['1.3.6.1.5.5.8.2.2']; ?></li>
<li><strong><?= gettext('Certificate Authority'); ?></strong>: <i><?= gettext('None. Just add CA option in basicConstraits.'); ?></i></li>
<li><strong><?= gettext('Certificate Authority'); ?></strong>: <i><?= gettext('None. Just add CA option in basicConstraints.'); ?></i></li>
</ul>
</div>
</td>

View File

@ -204,7 +204,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$config['system'][$dnsgwname] = "none";
if (!empty($pconfig[$dnsgwname])) {
// The indexes used to save the item don't have to correspond to the ones in the config, but since
// we always redirect after save, the configuration content is read after a successfull change.
// we always redirect after save, the configuration content is read after a successful change.
$outdnscounter++;
$outdnsgwname="dns{$outdnscounter}gw";
$config['system'][$outdnsgwname] = $thisdnsgwname;

View File

@ -292,7 +292,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
* format may be used. to keep it simple for the enduser, we only
* claim to accept MM/DD/YYYY as inputs. Advanced users may use inputs
* like "+1 day", which will be converted to MM/DD/YYYY based on "now".
* Otherwhise such an entry would lead to an invalid expiration data.
* Otherwise such an entry would lead to an invalid expiration data.
*/
if (!empty($pconfig['expires'])) {
try {

View File

@ -294,7 +294,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
/* User is adding phase 2 for mobile phase1 */
foreach ($config['ipsec']['phase2'] as $key => $name) {
if (isset($name['mobile']) && $pconfig['ikeid'] == $name['ikeid'] && $name['uniqid'] != $pconfig['uniqid']) {
/* check duplicate localids only for mobile clents */
/* check duplicate localids only for mobile clients */
$localid_data = ipsec_idinfo_to_cidr($name['localid'], false, $name['mode']);
$entered = array();
$entered['type'] = $pconfig['localid_type'];

View File

@ -1051,7 +1051,7 @@ $( document ).ready(function() {
endforeach; ?>
</select>
<div class="hidden" data-for="help_for_compression">
<?=gettext("Compress tunnel packets using the LZ4/LZO algorithm. The LZ4 generally offers the best preformance with least CPU usage. For backwards compatibility use the LZO (which is identical to the older option --comp-lzo yes). In the partial mode (the option --compress with an empty algorithm) compression is turned off, but the packet framing for compression is still enabled, allowing a different setting to be pushed later. The legacy LZO algorithm with adaptive compression mode will dynamically disable compression for a period of time if OpenVPN detects that the data in the packets is not being compressed efficiently."); ?>
<?=gettext("Compress tunnel packets using the LZ4/LZO algorithm. The LZ4 generally offers the best performance with least CPU usage. For backwards compatibility use the LZO (which is identical to the older option --comp-lzo yes). In the partial mode (the option --compress with an empty algorithm) compression is turned off, but the packet framing for compression is still enabled, allowing a different setting to be pushed later. The legacy LZO algorithm with adaptive compression mode will dynamically disable compression for a period of time if OpenVPN detects that the data in the packets is not being compressed efficiently."); ?>
</div>
</td>
</tr>

View File

@ -1284,7 +1284,7 @@ $( document ).ready(function() {
endforeach; ?>
</select>
<div class="hidden" data-for="help_for_compression">
<?=gettext("Compress tunnel packets using the LZ4/LZO algorithm. The LZ4 generally offers the best preformance with least CPU usage. For backwards compatibility use the LZO (which is identical to the older option --comp-lzo yes). In the partial mode (the option --compress with an empty algorithm) compression is turned off, but the packet framing for compression is still enabled, allowing a different setting to be pushed later. The legacy LZO algorithm with adaptive compression mode will dynamically disable compression for a period of time if OpenVPN detects that the data in the packets is not being compressed efficiently."); ?>
<?=gettext("Compress tunnel packets using the LZ4/LZO algorithm. The LZ4 generally offers the best performance with least CPU usage. For backwards compatibility use the LZO (which is identical to the older option --comp-lzo yes). In the partial mode (the option --compress with an empty algorithm) compression is turned off, but the packet framing for compression is still enabled, allowing a different setting to be pushed later. The legacy LZO algorithm with adaptive compression mode will dynamically disable compression for a period of time if OpenVPN detects that the data in the packets is not being compressed efficiently."); ?>
</div>
</td>
</tr>
@ -1624,7 +1624,7 @@ $( document ).ready(function() {
<input name="cso_login_matching" type="checkbox" value="yes" <?=!empty($pconfig['cso_login_matching']) ? "checked=\"checked\"" : "" ;?> />
<div class="hidden" data-for="help_for_cso_login_matching">
<span>
<?=gettext("Use username instead of common name to match client specfic override."); ?><br />
<?=gettext("Use username instead of common name to match client specific override."); ?><br />
</span>
</div>
</td>

View File

@ -55,7 +55,7 @@ $gateways = (new \OPNsense\Routing\Gateways(legacy_interfaces_details()))->gatew
<script>
$(window).on("load", function() {
function fetch_gateway_statusses(){
function fetch_gateway_statuses(){
ajaxGet('/api/routes/gateway/status', {}, function(data, status) {
if (data.items !== undefined) {
$.each(data.items, function(key, gateway) {
@ -114,9 +114,9 @@ $gateways = (new \OPNsense\Routing\Gateways(legacy_interfaces_details()))->gatew
});
}
});
setTimeout(fetch_gateway_statusses, 5000);
setTimeout(fetch_gateway_statuses, 5000);
}
fetch_gateway_statusses();
fetch_gateway_statuses();
});
</script>

View File

@ -280,7 +280,7 @@ History: 1.0 2000-05-09 GIF-image digits
cookies to work around Win IE stale-time bug
2.1 2002-10-12 Noted Mozilla 1.0 compatibility; released PHP version.
2.1.1 2002-10-20 Fixed octal bug in the PHP translation; the number of
minutes & seconds were misinterpretes when less than 10
minutes & seconds were misinterprets when less than 10
2.1.2 2003-08-07 The previous fix had introduced a bug when the
minutes or seconds were exactly 0. Thanks to Man Bui
for reporting the bug.