diff options
| author | Stephen Beaver <sbeaver@netgate.com> | 2016-09-14 16:18:26 -0400 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2016-09-14 16:18:26 -0400 |
| commit | 176b8f789e9dffb068ba96898edc9dec778b82b8 (patch) | |
| tree | a3607763bd69a0bcecdd88d6f84be3741dc87a7c /src/usr/local/www | |
| parent | 1c402413913bab1938b967283b315adca364a23b (diff) | |
| parent | 0ae266afd3a2130398855ec2a5eddb71631defd0 (diff) | |
| download | pfsense-176b8f789e9dffb068ba96898edc9dec778b82b8.zip pfsense-176b8f789e9dffb068ba96898edc9dec778b82b8.tar.gz | |
Merge branch 'master' of git.pfmechanics.com:pfsense/pfsense
Diffstat (limited to 'src/usr/local/www')
295 files changed, 449 insertions, 419 deletions
diff --git a/src/usr/local/www/bandwidth_by_ip.php b/src/usr/local/www/bandwidth_by_ip.php index 44af2d6..d380322 100644 --- a/src/usr/local/www/bandwidth_by_ip.php +++ b/src/usr/local/www/bandwidth_by_ip.php @@ -3,7 +3,7 @@ * bandwidth_by_ip.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/classes/Form.class.php b/src/usr/local/www/classes/Form.class.php index 7c7e5f6..d3467f4 100644 --- a/src/usr/local/www/classes/Form.class.php +++ b/src/usr/local/www/classes/Form.class.php @@ -3,7 +3,7 @@ * Form.class.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2015 Sjon Hortensius * All rights reserved. * diff --git a/src/usr/local/www/classes/Form/Button.class.php b/src/usr/local/www/classes/Form/Button.class.php index 54e619c..e00f9b9 100644 --- a/src/usr/local/www/classes/Form/Button.class.php +++ b/src/usr/local/www/classes/Form/Button.class.php @@ -4,7 +4,7 @@ * * part of pfSense (https://www.pfsense.org) * Copyright (c) 2015 Sjon Hortensius - * Copyright (c) 2015-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2015-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/classes/Form/Checkbox.class.php b/src/usr/local/www/classes/Form/Checkbox.class.php index 0a3f236..286bdf5 100644 --- a/src/usr/local/www/classes/Form/Checkbox.class.php +++ b/src/usr/local/www/classes/Form/Checkbox.class.php @@ -4,7 +4,7 @@ * * part of pfSense (https://www.pfsense.org) * Copyright (c) 2015 Sjon Hortensius - * Copyright (c) 2015-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2015-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/classes/Form/Element.class.php b/src/usr/local/www/classes/Form/Element.class.php index e4d4a39..aea948e 100644 --- a/src/usr/local/www/classes/Form/Element.class.php +++ b/src/usr/local/www/classes/Form/Element.class.php @@ -4,7 +4,7 @@ * * part of pfSense (https://www.pfsense.org) * Copyright (c) 2015 Sjon Hortensius - * Copyright (c) 2015-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2015-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/classes/Form/Group.class.php b/src/usr/local/www/classes/Form/Group.class.php index b4c8e69..bcfdc42 100644 --- a/src/usr/local/www/classes/Form/Group.class.php +++ b/src/usr/local/www/classes/Form/Group.class.php @@ -3,7 +3,7 @@ * Group.class.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2015 Sjon Hortensius * All rights reserved. * diff --git a/src/usr/local/www/classes/Form/Input.class.php b/src/usr/local/www/classes/Form/Input.class.php index 43ec643..7a05d76 100644 --- a/src/usr/local/www/classes/Form/Input.class.php +++ b/src/usr/local/www/classes/Form/Input.class.php @@ -3,7 +3,7 @@ * Input.class.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2015 Sjon Hortensius * All rights reserved. * diff --git a/src/usr/local/www/classes/Form/IpAddress.class.php b/src/usr/local/www/classes/Form/IpAddress.class.php index 58548a7..036828f 100644 --- a/src/usr/local/www/classes/Form/IpAddress.class.php +++ b/src/usr/local/www/classes/Form/IpAddress.class.php @@ -3,7 +3,7 @@ * IpAddress.class.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2015 Sjon Hortensius * All rights reserved. * diff --git a/src/usr/local/www/classes/Form/MultiCheckbox.class.php b/src/usr/local/www/classes/Form/MultiCheckbox.class.php index 987a544..104f9e7 100644 --- a/src/usr/local/www/classes/Form/MultiCheckbox.class.php +++ b/src/usr/local/www/classes/Form/MultiCheckbox.class.php @@ -3,7 +3,7 @@ * MultiCheckbox.class.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2015 Sjon Hortensius * All rights reserved. * diff --git a/src/usr/local/www/classes/Form/MultiCheckboxGroup.class.php b/src/usr/local/www/classes/Form/MultiCheckboxGroup.class.php index 9eb3af1..d85421f 100644 --- a/src/usr/local/www/classes/Form/MultiCheckboxGroup.class.php +++ b/src/usr/local/www/classes/Form/MultiCheckboxGroup.class.php @@ -3,7 +3,7 @@ * MultiCheckboxGroup.class.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2015 Sjon Hortensius * All rights reserved. * diff --git a/src/usr/local/www/classes/Form/Section.class.php b/src/usr/local/www/classes/Form/Section.class.php index 99e9767..a14494f 100644 --- a/src/usr/local/www/classes/Form/Section.class.php +++ b/src/usr/local/www/classes/Form/Section.class.php @@ -3,7 +3,7 @@ * Section.class.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2015 Sjon Hortensius * All rights reserved. * diff --git a/src/usr/local/www/classes/Form/Select.class.php b/src/usr/local/www/classes/Form/Select.class.php index 649166d..891aa10 100644 --- a/src/usr/local/www/classes/Form/Select.class.php +++ b/src/usr/local/www/classes/Form/Select.class.php @@ -3,7 +3,7 @@ * Select.class.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2015 Sjon Hortensius * All rights reserved. * diff --git a/src/usr/local/www/classes/Form/StaticText.class.php b/src/usr/local/www/classes/Form/StaticText.class.php index 001b462..d2a410c 100644 --- a/src/usr/local/www/classes/Form/StaticText.class.php +++ b/src/usr/local/www/classes/Form/StaticText.class.php @@ -3,7 +3,7 @@ * StaticText.class.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2015 Sjon Hortensius * All rights reserved. * diff --git a/src/usr/local/www/classes/Form/Textarea.class.php b/src/usr/local/www/classes/Form/Textarea.class.php index 3e5c71c..2519719 100644 --- a/src/usr/local/www/classes/Form/Textarea.class.php +++ b/src/usr/local/www/classes/Form/Textarea.class.php @@ -3,7 +3,7 @@ * Textarea.class.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2015 Sjon Hortensius * All rights reserved. * diff --git a/src/usr/local/www/classes/Modal.class.php b/src/usr/local/www/classes/Modal.class.php index dff6bca..3a32e5e 100644 --- a/src/usr/local/www/classes/Modal.class.php +++ b/src/usr/local/www/classes/Modal.class.php @@ -3,7 +3,7 @@ * Modal.class.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2015 Sjon Hortensius * All rights reserved. * diff --git a/src/usr/local/www/classes/autoload.inc.php b/src/usr/local/www/classes/autoload.inc.php index bec1a4b..316ad9a 100644 --- a/src/usr/local/www/classes/autoload.inc.php +++ b/src/usr/local/www/classes/autoload.inc.php @@ -3,7 +3,7 @@ * autoload.inc.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/crash_reporter.php b/src/usr/local/www/crash_reporter.php index 7e1a9bc..9a74c3e 100644 --- a/src/usr/local/www/crash_reporter.php +++ b/src/usr/local/www/crash_reporter.php @@ -3,7 +3,7 @@ * crash_reporter.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/css/Compact-RED.css b/src/usr/local/www/css/Compact-RED.css index 9105de0..99b1675 100644 --- a/src/usr/local/www/css/Compact-RED.css +++ b/src/usr/local/www/css/Compact-RED.css @@ -3,7 +3,7 @@ * * part of pfSense (https://www.pfsense.org) * Copyright (c) 2016 PiBa-NL - * Copyright (c) 2016 Electric Sheep Fencing, LLC + * Copyright (c) 2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,6 +23,7 @@ body { font-size: 12px; + font-family: sans-serif; } .form-control { @@ -83,6 +84,11 @@ body { .dropdown-menu>li>a { padding: 0px 20px; + line-height: 26px; +} + +.dropdown-menu>li>a:focus, .dropdown-menu>li>a:hover { + background-color: rgb(224, 224, 224); } .navbar-right>li>a { @@ -95,6 +101,14 @@ body { } .panel-default>.panel-heading { background-color: #900; + padding: 2px 5px 2px 15px; +} + +.panel-title { + line-height: 18px; + font-size: 12px; + font-family: sans-serif; + font-weight: bold; } .form-control { @@ -108,6 +122,10 @@ body { padding:2px; } +.table-striped>tbody>tr:hover { + background-color: rgb(224, 224, 224); +} + .header .context-links { top: 1px; } diff --git a/src/usr/local/www/css/pfSense-BETA.css b/src/usr/local/www/css/pfSense-BETA.css index 8d25f05..4550601 100644 --- a/src/usr/local/www/css/pfSense-BETA.css +++ b/src/usr/local/www/css/pfSense-BETA.css @@ -2,7 +2,7 @@ * pfSense-BETA.css * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2016 Electric Sheep Fencing, LLC + * Copyright (c) 2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -82,3 +82,7 @@ a.fa, i.fa { .panel-heading { padding: 5px 10px; } + +.ui-widget { + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; +} diff --git a/src/usr/local/www/css/pfSense-dark-BETA.css b/src/usr/local/www/css/pfSense-dark-BETA.css index cb89447..a443e41 100644 --- a/src/usr/local/www/css/pfSense-dark-BETA.css +++ b/src/usr/local/www/css/pfSense-dark-BETA.css @@ -2,7 +2,7 @@ * pfSense-dark-BETA.css * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2016 Electric Sheep Fencing, LLC + * Copyright (c) 2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -86,3 +86,7 @@ a.fa, i.fa { .panel-heading { padding: 5px 10px; } + +.ui-widget { + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; +} diff --git a/src/usr/local/www/css/pfSense-dark.css b/src/usr/local/www/css/pfSense-dark.css index 1f6c763..da9debe 100644 --- a/src/usr/local/www/css/pfSense-dark.css +++ b/src/usr/local/www/css/pfSense-dark.css @@ -2,7 +2,7 @@ * pfSense-dark.css * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2016 Electric Sheep Fencing, LLC + * Copyright (c) 2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -43,9 +43,9 @@ h1 a:link, h1 a:visited { color: #fff; } -h1 a:hover, h1 a:active { - color: #fff; - text-decoration: none !important; +h1 a:hover, h1 a:active { + color: #fff; + text-decoration: none !important; } /** Content structure */ @@ -348,13 +348,13 @@ caption { a.list-group-item, .list-group-item { background-color: #424242; - color: #e0e0e0; - border: 1px solid #212121; + color: #e0e0e0; + border: 1px solid #212121; } a.list-group-item:focus, a.list-group-item:hover, .list-group-item:focus, .list-group-item:hover { background-color: #303030; - color: #e0e0e0; + color: #e0e0e0; } a.list-group-item .list-group-item-heading, .list-group-item .list-group-item-heading { @@ -406,12 +406,12 @@ ul.tree li A:link, ul.tree li A:hover, ul.tree li A:visited { table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"] { background-color: #000; - color: #009688; + color: #009688; border-bottom-color: #009688; } table[data-sortable].sortable-theme-bootstrap tbody td { - border-top: 1px solid #303030; + border-top: 1px solid #303030; } textarea { @@ -424,6 +424,10 @@ textarea { background-color: #e0e0e0; } +.ui-widget { + font-family: Roboto, sans-serif; +} + /* Callouts */ .bs-callout { padding: 10px 15px; diff --git a/src/usr/local/www/css/pfSense.css b/src/usr/local/www/css/pfSense.css index 770fc75..a2cb099 100644 --- a/src/usr/local/www/css/pfSense.css +++ b/src/usr/local/www/css/pfSense.css @@ -2,7 +2,7 @@ * pfSense.css * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2016 Electric Sheep Fencing, LLC + * Copyright (c) 2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -77,6 +77,10 @@ h1 a:hover, h1 a:active { cursor: move; } +.ui-widget { + font-family: Roboto, sans-serif; +} + tr.disabled td, tr.disabled th { opacity: .5; @@ -231,6 +235,12 @@ tr.disabled th { padding: inherit; } +/* location of bottom right drag icon on resizable elements */ +.ui-resizable-se { + bottom: 2px; + right: 46px; +} + #login .form-control { height: 34px; } diff --git a/src/usr/local/www/diag_arp.php b/src/usr/local/www/diag_arp.php index 9634ccf..4d13b0d 100644 --- a/src/usr/local/www/diag_arp.php +++ b/src/usr/local/www/diag_arp.php @@ -3,7 +3,7 @@ * diag_arp.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/diag_authentication.php b/src/usr/local/www/diag_authentication.php index 920f81d..e03bd55 100644 --- a/src/usr/local/www/diag_authentication.php +++ b/src/usr/local/www/diag_authentication.php @@ -3,7 +3,7 @@ * diag_authentication.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/diag_backup.php b/src/usr/local/www/diag_backup.php index 926841d..2eb882a 100644 --- a/src/usr/local/www/diag_backup.php +++ b/src/usr/local/www/diag_backup.php @@ -3,7 +3,7 @@ * diag_backup.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/diag_command.php b/src/usr/local/www/diag_command.php index 78a9d21..8ab67a2 100644 --- a/src/usr/local/www/diag_command.php +++ b/src/usr/local/www/diag_command.php @@ -3,7 +3,7 @@ * diag_command.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Exec+ v1.02-000 - Copyright 2001-2003, All rights reserved diff --git a/src/usr/local/www/diag_confbak.php b/src/usr/local/www/diag_confbak.php index a65aedc..d97ca17 100644 --- a/src/usr/local/www/diag_confbak.php +++ b/src/usr/local/www/diag_confbak.php @@ -3,7 +3,7 @@ * diag_confbak.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2005 Colin Smith * All rights reserved. * diff --git a/src/usr/local/www/diag_defaults.php b/src/usr/local/www/diag_defaults.php index 97eb00e..8c1ee6f 100644 --- a/src/usr/local/www/diag_defaults.php +++ b/src/usr/local/www/diag_defaults.php @@ -3,7 +3,7 @@ * diag_defaults.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/diag_dns.php b/src/usr/local/www/diag_dns.php index 0a88250..bb44e73 100644 --- a/src/usr/local/www/diag_dns.php +++ b/src/usr/local/www/diag_dns.php @@ -3,7 +3,7 @@ * diag_dns.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -62,7 +62,7 @@ function resolve_host_addresses($host) { } } error_reporting($errreporting);// restore original php warning/error settings. - + foreach ($dnsresult as $item) { $newitem = array(); $newitem['type'] = $item['type']; @@ -79,7 +79,6 @@ function resolve_host_addresses($host) { $newitem['data'] = $item['ipv6']; $resolved[] = $newitem; break; - } } return $resolved; @@ -152,7 +151,7 @@ if ($_POST) { } $type = "unknown"; - $resolved = ""; + $resolved = array(); $ipaddr = ""; if (!$input_errors) { if (is_ipaddr($host)) { @@ -167,26 +166,15 @@ if ($_POST) { } } elseif (is_hostname($host)) { $type = "hostname"; - $resolved = gethostbyname($host); - if ($host != $resolved) { - $resolved = resolve_host_addresses($host); - foreach ($resolved as $item) { - if ($item['type'] == 'A') { - $ipaddr = $item['data']; - break; - } - } - } - } - - if ($host == $resolved) { - $resolved = gettext("No record found"); + $ipaddr = gethostbyname($host); + $resolved = resolve_host_addresses($host); } } } -if (($_POST['host']) && ($_POST['dialog_output'])) { - display_host_results ($host, $resolved, $dns_speeds); +if ($_POST['host'] && $_POST['dialog_output']) { + $host = (isset($resolvedptr) ? $resolvedptr : $host); + display_host_results ($ipaddr, $host, $dns_speeds); exit; } @@ -268,7 +256,7 @@ if (!$input_errors && $type) { <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=gettext('Results')?></h2></div> <div class="panel-body"> - + <table class="table"> <thead> <tr> diff --git a/src/usr/local/www/diag_dump_states.php b/src/usr/local/www/diag_dump_states.php index b9b86d2..dadad14 100644 --- a/src/usr/local/www/diag_dump_states.php +++ b/src/usr/local/www/diag_dump_states.php @@ -3,7 +3,7 @@ * diag_dump_states.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2005 Colin Smith * All rights reserved. * diff --git a/src/usr/local/www/diag_dump_states_sources.php b/src/usr/local/www/diag_dump_states_sources.php index f787143..c245502 100644 --- a/src/usr/local/www/diag_dump_states_sources.php +++ b/src/usr/local/www/diag_dump_states_sources.php @@ -3,7 +3,7 @@ * diag_dump_states_source.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2005 Colin Smith * All rights reserved. * diff --git a/src/usr/local/www/diag_edit.php b/src/usr/local/www/diag_edit.php index e99aca8..c419136 100644 --- a/src/usr/local/www/diag_edit.php +++ b/src/usr/local/www/diag_edit.php @@ -3,7 +3,7 @@ * diag_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/diag_gmirror.php b/src/usr/local/www/diag_gmirror.php index 1f34185..869fb02 100644 --- a/src/usr/local/www/diag_gmirror.php +++ b/src/usr/local/www/diag_gmirror.php @@ -3,7 +3,7 @@ * diag_gmirror.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/diag_halt.php b/src/usr/local/www/diag_halt.php index d1495c9..38446d8 100644 --- a/src/usr/local/www/diag_halt.php +++ b/src/usr/local/www/diag_halt.php @@ -3,7 +3,7 @@ * diag_halt.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/diag_limiter_info.php b/src/usr/local/www/diag_limiter_info.php index 4b86bba..fa2ba38 100644 --- a/src/usr/local/www/diag_limiter_info.php +++ b/src/usr/local/www/diag_limiter_info.php @@ -3,7 +3,7 @@ * diag_limiter_info.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/diag_nanobsd.php b/src/usr/local/www/diag_nanobsd.php index 3839802..c8806bc 100644 --- a/src/usr/local/www/diag_nanobsd.php +++ b/src/usr/local/www/diag_nanobsd.php @@ -3,7 +3,7 @@ * diag_nanobsd.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/diag_ndp.php b/src/usr/local/www/diag_ndp.php index 70a377e..a27d4ba 100644 --- a/src/usr/local/www/diag_ndp.php +++ b/src/usr/local/www/diag_ndp.php @@ -3,7 +3,7 @@ * diag_ndp.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2011 Seth Mos <seth.mos@dds.nl> * All rights reserved. * diff --git a/src/usr/local/www/diag_packet_capture.php b/src/usr/local/www/diag_packet_capture.php index 43dc9c1..099906b 100644 --- a/src/usr/local/www/diag_packet_capture.php +++ b/src/usr/local/www/diag_packet_capture.php @@ -3,7 +3,7 @@ * diag_packet_capture.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/diag_pf_info.php b/src/usr/local/www/diag_pf_info.php index 78eefe6..0f73a00 100644 --- a/src/usr/local/www/diag_pf_info.php +++ b/src/usr/local/www/diag_pf_info.php @@ -3,7 +3,7 @@ * diag_pf_info.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/diag_pftop.php b/src/usr/local/www/diag_pftop.php index 5b42304..c625209 100644 --- a/src/usr/local/www/diag_pftop.php +++ b/src/usr/local/www/diag_pftop.php @@ -3,7 +3,7 @@ * diag_pftop.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/diag_ping.php b/src/usr/local/www/diag_ping.php index 7ad0804..492e98a 100644 --- a/src/usr/local/www/diag_ping.php +++ b/src/usr/local/www/diag_ping.php @@ -3,7 +3,7 @@ * diag_ping.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2003-2005 Bob Zoller (bob@kludgebox.com) * All rights reserved. * diff --git a/src/usr/local/www/diag_reboot.php b/src/usr/local/www/diag_reboot.php index 595d44e..8b6229e 100644 --- a/src/usr/local/www/diag_reboot.php +++ b/src/usr/local/www/diag_reboot.php @@ -3,7 +3,7 @@ * diag_reboot.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/diag_resetstate.php b/src/usr/local/www/diag_resetstate.php index 5742689..b5d7a2a 100644 --- a/src/usr/local/www/diag_resetstate.php +++ b/src/usr/local/www/diag_resetstate.php @@ -3,7 +3,7 @@ * diag_resetstate.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/diag_routes.php b/src/usr/local/www/diag_routes.php index 15e83ff..13bd65d 100644 --- a/src/usr/local/www/diag_routes.php +++ b/src/usr/local/www/diag_routes.php @@ -3,7 +3,7 @@ * diag_routes.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2006 Fernando Lamos * All rights reserved. * diff --git a/src/usr/local/www/diag_smart.php b/src/usr/local/www/diag_smart.php index f77e161..9858fd4 100644 --- a/src/usr/local/www/diag_smart.php +++ b/src/usr/local/www/diag_smart.php @@ -3,7 +3,7 @@ * diag_smart.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2006 Eric Friesen * All rights reserved. * diff --git a/src/usr/local/www/diag_sockets.php b/src/usr/local/www/diag_sockets.php index b962674..dcfc4c6 100644 --- a/src/usr/local/www/diag_sockets.php +++ b/src/usr/local/www/diag_sockets.php @@ -3,7 +3,7 @@ * diag_sockets.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/diag_states_summary.php b/src/usr/local/www/diag_states_summary.php index c870da9..72f4978 100644 --- a/src/usr/local/www/diag_states_summary.php +++ b/src/usr/local/www/diag_states_summary.php @@ -3,7 +3,7 @@ * diag_states_summary.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2005 Colin Smith * All rights reserved. * diff --git a/src/usr/local/www/diag_system_activity.php b/src/usr/local/www/diag_system_activity.php index 6725c33..96f6b2e 100644 --- a/src/usr/local/www/diag_system_activity.php +++ b/src/usr/local/www/diag_system_activity.php @@ -3,7 +3,7 @@ * diag_system_activity.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/diag_tables.php b/src/usr/local/www/diag_tables.php index 13f6372..9fe3a8b 100644 --- a/src/usr/local/www/diag_tables.php +++ b/src/usr/local/www/diag_tables.php @@ -3,7 +3,7 @@ * diag_tables.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/diag_testport.php b/src/usr/local/www/diag_testport.php index 15d7574..68e3a60 100644 --- a/src/usr/local/www/diag_testport.php +++ b/src/usr/local/www/diag_testport.php @@ -3,7 +3,7 @@ * diag_testport.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/diag_traceroute.php b/src/usr/local/www/diag_traceroute.php index 45b646d..efb0d85 100644 --- a/src/usr/local/www/diag_traceroute.php +++ b/src/usr/local/www/diag_traceroute.php @@ -3,7 +3,7 @@ * diag_traceroute.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2005 Paul Taylor (paultaylor@winndixie.com) * All rights reserved. * diff --git a/src/usr/local/www/easyrule.php b/src/usr/local/www/easyrule.php index c3842bc..161725e 100644 --- a/src/usr/local/www/easyrule.php +++ b/src/usr/local/www/easyrule.php @@ -3,7 +3,7 @@ * easyrule.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Originally Sponsored By Anathematic @ pfSense Forums * All rights reserved. * diff --git a/src/usr/local/www/firewall_aliases.php b/src/usr/local/www/firewall_aliases.php index 72e9849..55069d8 100644 --- a/src/usr/local/www/firewall_aliases.php +++ b/src/usr/local/www/firewall_aliases.php @@ -3,7 +3,7 @@ * firewall_aliases.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php index 43a23ac..56b13f0 100644 --- a/src/usr/local/www/firewall_aliases_edit.php +++ b/src/usr/local/www/firewall_aliases_edit.php @@ -3,7 +3,7 @@ * firewall_aliases_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/firewall_aliases_import.php b/src/usr/local/www/firewall_aliases_import.php index 9b6f71f..e70c453 100644 --- a/src/usr/local/www/firewall_aliases_import.php +++ b/src/usr/local/www/firewall_aliases_import.php @@ -3,7 +3,7 @@ * firewall_aliases_import.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/firewall_nat.php b/src/usr/local/www/firewall_nat.php index b0c35c3..71cd143 100644 --- a/src/usr/local/www/firewall_nat.php +++ b/src/usr/local/www/firewall_nat.php @@ -3,7 +3,7 @@ * firewall_nat.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php index b3bf479..5ae075b 100644 --- a/src/usr/local/www/firewall_nat_1to1.php +++ b/src/usr/local/www/firewall_nat_1to1.php @@ -3,7 +3,7 @@ * firewall_nat_1to1.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/firewall_nat_1to1_edit.php b/src/usr/local/www/firewall_nat_1to1_edit.php index 7fd19f4..a191a60 100644 --- a/src/usr/local/www/firewall_nat_1to1_edit.php +++ b/src/usr/local/www/firewall_nat_1to1_edit.php @@ -3,7 +3,7 @@ * firewall_nat_1to1_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/firewall_nat_edit.php b/src/usr/local/www/firewall_nat_edit.php index a16bbed..f7346ec 100644 --- a/src/usr/local/www/firewall_nat_edit.php +++ b/src/usr/local/www/firewall_nat_edit.php @@ -3,7 +3,7 @@ * firewall_nat_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/firewall_nat_npt.php b/src/usr/local/www/firewall_nat_npt.php index e54a0f0..b585d99 100644 --- a/src/usr/local/www/firewall_nat_npt.php +++ b/src/usr/local/www/firewall_nat_npt.php @@ -3,7 +3,7 @@ * firewall_nat_npt.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2011 Seth Mos <seth.mos@dds.nl> * All rights reserved. * diff --git a/src/usr/local/www/firewall_nat_npt_edit.php b/src/usr/local/www/firewall_nat_npt_edit.php index 0fdfb58..0d79e2c 100644 --- a/src/usr/local/www/firewall_nat_npt_edit.php +++ b/src/usr/local/www/firewall_nat_npt_edit.php @@ -3,7 +3,7 @@ * firewall_nat_npt_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2011 Seth Mos <seth.mos@dds.nl> * All rights reserved. * diff --git a/src/usr/local/www/firewall_nat_out.php b/src/usr/local/www/firewall_nat_out.php index 57cd4d1..6915780 100644 --- a/src/usr/local/www/firewall_nat_out.php +++ b/src/usr/local/www/firewall_nat_out.php @@ -3,7 +3,7 @@ * firewall_nat_out.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/firewall_nat_out_edit.php b/src/usr/local/www/firewall_nat_out_edit.php index 6c845e5..59ce4fa 100644 --- a/src/usr/local/www/firewall_nat_out_edit.php +++ b/src/usr/local/www/firewall_nat_out_edit.php @@ -3,7 +3,7 @@ * firewall_nat_out_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php index 57f0c2c..f5d4d5d 100644 --- a/src/usr/local/www/firewall_rules.php +++ b/src/usr/local/www/firewall_rules.php @@ -3,7 +3,7 @@ * firewall_rules.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index 43f2e5d..330191d 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -3,7 +3,7 @@ * firewall_rules_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) @@ -42,8 +42,8 @@ if (isset($_POST['referer'])) { } function is_posnumericint($arg) { - // Note that to be safe we do not allow any leading zero - "01", "007" - return (is_numericint($arg) && $arg[0] != '0' && $arg > 0); + // Integer > 0? (Note that to be safe we do not allow any leading zero - "01", "007") + return (is_numericint($arg) && $arg[0] != '0'); } function is_aoadv_used($rule_config) { @@ -305,33 +305,28 @@ if ($_POST) { if (($_POST['ipprotocol'] <> "") && ($_POST['gateway'] <> "")) { if (is_array($config['gateways']['gateway_group'])) { foreach ($config['gateways']['gateway_group'] as $gw_group) { - if ($gw_group['name'] == $_POST['gateway']) { - $family = $a_gatewaygroups[$_POST['gateway']]['ipprotocol']; - if ($_POST['ipprotocol'] == $family) { - continue; - } - if (($_POST['ipprotocol'] == "inet46") && ($_POST['ipprotocol'] != $family)) { - $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("An IPv4 gateway group can not be assigned on an IPv6 Address Family rule"); - } - if (($_POST['ipprotocol'] == "inet") && ($_POST['ipprotocol'] != $family)) { - $input_errors[] = gettext("An IPv6 gateway group can not be assigned on an IPv4 Address Family rule"); + if ($gw_group['name'] == $_POST['gateway'] && $_POST['ipprotocol'] != $a_gatewaygroups[$_POST['gateway']]['ipprotocol']) { + if ($_POST['ipprotocol'] == "inet46") { + $input_errors[] = gettext("Gateways can not be assigned in a rule that applies to both IPv4 and IPv6."); + } elseif ($_POST['ipprotocol'] == "inet6") { + $input_errors[] = gettext("An IPv4 gateway group can not be assigned in IPv6 rules."); + } elseif ($_POST['ipprotocol'] == "inet") { + $input_errors[] = gettext("An IPv6 gateway group can not be assigned in IPv4 rules."); } } } } - } - if (($_POST['ipprotocol'] <> "") && ($_POST['gateway'] <> "") && (is_ipaddr(lookup_gateway_ip_by_name($_POST['gateway'])))) { - if (($_POST['ipprotocol'] == "inet46") && ($_POST['gateway'] <> "")) { - $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("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("An IPv6 Gateway can not be assigned to an IPv4 Filter rule"); + if ($iptype = is_ipaddr(lookup_gateway_ip_by_name($_POST['gateway']))) { + // this also implies that $_POST['gateway'] was set and not empty + if ($_POST['ipprotocol'] == "inet46") { + $input_errors[] = gettext("Gateways can not be assigned in a rule that applies to both IPv4 and IPv6."); + } + if (($_POST['ipprotocol'] == "inet6") && ($iptype != 6)) { + $input_errors[] = gettext("An IPv4 gateway can not be assigned in IPv6 rules."); + } + if (($_POST['ipprotocol'] == "inet") && ($iptype != 4)) { + $input_errors[] = gettext("An IPv6 gateway can not be assigned in IPv4 rules."); + } } } if (($_POST['proto'] == "icmp") && ($_POST['icmptype'] <> "")) { @@ -528,7 +523,7 @@ if ($_POST) { } if ((is_ipaddr($_POST['src']) && is_ipaddr($_POST['dst']))) { if (!validate_address_family($_POST['src'], $_POST['dst'])) { - $input_errors[] = sprintf(gettext("The Source IP address %s Address Family differs from the destination %s."), $_POST['src'], $_POST['dst']); + $input_errors[] = gettext("The source and destination IP addresses must have the same family (IPv4 / IPv6)."); } } if ((is_ipaddrv6($_POST['src']) || is_ipaddrv6($_POST['dst'])) && ($_POST['ipprotocol'] == "inet")) { @@ -539,7 +534,7 @@ if ($_POST) { } if ((is_ipaddr($_POST['src']) || is_ipaddr($_POST['dst'])) && ($_POST['ipprotocol'] == "inet46")) { - $input_errors[] = gettext("An IPv4 or IPv6 address can not be used in combined IPv4 + IPv6 rules."); + $input_errors[] = gettext("IPv4 and IPv6 addresses can not be used in rules that apply to both IPv4 and IPv6."); } if ($_POST['srcbeginport'] > $_POST['srcendport']) { diff --git a/src/usr/local/www/firewall_schedule.php b/src/usr/local/www/firewall_schedule.php index e90c7ff..1c7b866 100644 --- a/src/usr/local/www/firewall_schedule.php +++ b/src/usr/local/www/firewall_schedule.php @@ -3,7 +3,7 @@ * firewall_schedule.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/firewall_schedule_edit.php b/src/usr/local/www/firewall_schedule_edit.php index 2168631..dcabeed 100644 --- a/src/usr/local/www/firewall_schedule_edit.php +++ b/src/usr/local/www/firewall_schedule_edit.php @@ -3,7 +3,7 @@ * firewall_schedule_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/firewall_shaper.php b/src/usr/local/www/firewall_shaper.php index 6abb201..54f38bb 100644 --- a/src/usr/local/www/firewall_shaper.php +++ b/src/usr/local/www/firewall_shaper.php @@ -3,7 +3,7 @@ * firewall_shaper.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/firewall_shaper_queues.php b/src/usr/local/www/firewall_shaper_queues.php index 27e4283..d91e16c 100644 --- a/src/usr/local/www/firewall_shaper_queues.php +++ b/src/usr/local/www/firewall_shaper_queues.php @@ -3,7 +3,7 @@ * firewall_shaper_queues.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/firewall_shaper_vinterface.php b/src/usr/local/www/firewall_shaper_vinterface.php index 171c44b..74526e9 100644 --- a/src/usr/local/www/firewall_shaper_vinterface.php +++ b/src/usr/local/www/firewall_shaper_vinterface.php @@ -3,7 +3,7 @@ * firewall_shaper_vinterface.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/firewall_shaper_wizards.php b/src/usr/local/www/firewall_shaper_wizards.php index 7c79141..440f8c8 100644 --- a/src/usr/local/www/firewall_shaper_wizards.php +++ b/src/usr/local/www/firewall_shaper_wizards.php @@ -3,7 +3,7 @@ * firewall_shaper_wizards.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/firewall_virtual_ip.php b/src/usr/local/www/firewall_virtual_ip.php index ad6cc57..33a1f4f 100644 --- a/src/usr/local/www/firewall_virtual_ip.php +++ b/src/usr/local/www/firewall_virtual_ip.php @@ -3,7 +3,7 @@ * firewall_virtual_ip.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2005 Bill Marquette <bill.marquette@gmail.com> * All rights reserved. * diff --git a/src/usr/local/www/firewall_virtual_ip_edit.php b/src/usr/local/www/firewall_virtual_ip_edit.php index 8bd2d89..951b53e 100644 --- a/src/usr/local/www/firewall_virtual_ip_edit.php +++ b/src/usr/local/www/firewall_virtual_ip_edit.php @@ -3,7 +3,7 @@ * firewall_virtual_ip_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2005 Bill Marquette <bill.marquette@gmail.com> * All rights reserved. * diff --git a/src/usr/local/www/foot.inc b/src/usr/local/www/foot.inc index c21e794..5037860 100644 --- a/src/usr/local/www/foot.inc +++ b/src/usr/local/www/foot.inc @@ -3,7 +3,7 @@ * foot.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/getserviceproviders.php b/src/usr/local/www/getserviceproviders.php index 2ae719a..12e3fa1 100644 --- a/src/usr/local/www/getserviceproviders.php +++ b/src/usr/local/www/getserviceproviders.php @@ -3,7 +3,7 @@ * getserviceproviders.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2010 Vinicius Coque <vinicius.coque@bluepex.com> * All rights reserved. * diff --git a/src/usr/local/www/getstats.php b/src/usr/local/www/getstats.php index fd8d88d..9bc913f 100644 --- a/src/usr/local/www/getstats.php +++ b/src/usr/local/www/getstats.php @@ -3,7 +3,7 @@ * getstats.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2009 Bill Marquette * All rights reserved. * diff --git a/src/usr/local/www/graph.php b/src/usr/local/www/graph.php index 1578418..f5ec63e 100644 --- a/src/usr/local/www/graph.php +++ b/src/usr/local/www/graph.php @@ -3,7 +3,7 @@ * graph.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2004-2006 T. Lechat <dev@lechat.org> * Copyright (c) 2004-2006 Jonathan Watt <jwatt@jwatt.org> * All rights reserved. diff --git a/src/usr/local/www/graph_cpu.php b/src/usr/local/www/graph_cpu.php index 58e2575..ac5538f 100644 --- a/src/usr/local/www/graph_cpu.php +++ b/src/usr/local/www/graph_cpu.php @@ -3,7 +3,7 @@ * graph_cpu.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2004-2006 T. Lechat <dev@lechat.org> * Copyright (c) 2004-2006 Jonathan Watt <jwatt@jwatt.org> * All rights reserved. diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc index 06f8701..1da88ce 100644 --- a/src/usr/local/www/guiconfig.inc +++ b/src/usr/local/www/guiconfig.inc @@ -3,7 +3,7 @@ * guiconfig.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc index b4cd4a2..615ce9a 100644 --- a/src/usr/local/www/head.inc +++ b/src/usr/local/www/head.inc @@ -3,7 +3,7 @@ * head.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/help.php b/src/usr/local/www/help.php index 6d64b89..e60726d 100644 --- a/src/usr/local/www/help.php +++ b/src/usr/local/www/help.php @@ -3,7 +3,7 @@ * help.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/ifstats.php b/src/usr/local/www/ifstats.php index 8f1c300..c06c51d 100644 --- a/src/usr/local/www/ifstats.php +++ b/src/usr/local/www/ifstats.php @@ -3,7 +3,7 @@ * ifstats.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/includes/functions.inc.php b/src/usr/local/www/includes/functions.inc.php index 144648c..3f727fb 100644 --- a/src/usr/local/www/includes/functions.inc.php +++ b/src/usr/local/www/includes/functions.inc.php @@ -3,7 +3,7 @@ * functions.inc.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2013-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2013-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/index.php b/src/usr/local/www/index.php index a295146..d1a5ed32 100644 --- a/src/usr/local/www/index.php +++ b/src/usr/local/www/index.php @@ -3,7 +3,7 @@ * index.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/interfaces.php b/src/usr/local/www/interfaces.php index 2e5bf0d..b976c2a 100644 --- a/src/usr/local/www/interfaces.php +++ b/src/usr/local/www/interfaces.php @@ -3,7 +3,7 @@ * interfaces.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2006 Daniel S. Haischt * All rights reserved. * diff --git a/src/usr/local/www/interfaces_assign.php b/src/usr/local/www/interfaces_assign.php index 695ded4..ef2b29b 100644 --- a/src/usr/local/www/interfaces_assign.php +++ b/src/usr/local/www/interfaces_assign.php @@ -3,7 +3,7 @@ * interfaces_assign.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/interfaces_bridge.php b/src/usr/local/www/interfaces_bridge.php index d928e91..c9631d7 100644 --- a/src/usr/local/www/interfaces_bridge.php +++ b/src/usr/local/www/interfaces_bridge.php @@ -3,7 +3,7 @@ * interfaces_bridge.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/interfaces_bridge_edit.php b/src/usr/local/www/interfaces_bridge_edit.php index cef6abe..3385a84 100644 --- a/src/usr/local/www/interfaces_bridge_edit.php +++ b/src/usr/local/www/interfaces_bridge_edit.php @@ -3,7 +3,7 @@ * interfaces_bridge_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/interfaces_gif.php b/src/usr/local/www/interfaces_gif.php index 9096ea4..1797092 100644 --- a/src/usr/local/www/interfaces_gif.php +++ b/src/usr/local/www/interfaces_gif.php @@ -3,7 +3,7 @@ * interfaces_gif.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/interfaces_gif_edit.php b/src/usr/local/www/interfaces_gif_edit.php index 36ddcba..c225fe7 100644 --- a/src/usr/local/www/interfaces_gif_edit.php +++ b/src/usr/local/www/interfaces_gif_edit.php @@ -3,7 +3,7 @@ * interfaces_gif_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/interfaces_gre.php b/src/usr/local/www/interfaces_gre.php index dbafbdf..a69edd6 100644 --- a/src/usr/local/www/interfaces_gre.php +++ b/src/usr/local/www/interfaces_gre.php @@ -3,7 +3,7 @@ * interfaces_gre.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/interfaces_gre_edit.php b/src/usr/local/www/interfaces_gre_edit.php index 3a768b8..1161251 100644 --- a/src/usr/local/www/interfaces_gre_edit.php +++ b/src/usr/local/www/interfaces_gre_edit.php @@ -3,7 +3,7 @@ * interfaces_gre_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/interfaces_groups.php b/src/usr/local/www/interfaces_groups.php index 197134e..51f4bd6 100644 --- a/src/usr/local/www/interfaces_groups.php +++ b/src/usr/local/www/interfaces_groups.php @@ -3,7 +3,7 @@ * interfaces_groups.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/interfaces_groups_edit.php b/src/usr/local/www/interfaces_groups_edit.php index c6edf42..73f63d6 100644 --- a/src/usr/local/www/interfaces_groups_edit.php +++ b/src/usr/local/www/interfaces_groups_edit.php @@ -3,7 +3,7 @@ * interfaces_groups_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/interfaces_lagg.php b/src/usr/local/www/interfaces_lagg.php index b6f9f8a..c521558 100644 --- a/src/usr/local/www/interfaces_lagg.php +++ b/src/usr/local/www/interfaces_lagg.php @@ -3,7 +3,7 @@ * interfaces_lagg.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/interfaces_lagg_edit.php b/src/usr/local/www/interfaces_lagg_edit.php index afd2c1d..c4428b7 100644 --- a/src/usr/local/www/interfaces_lagg_edit.php +++ b/src/usr/local/www/interfaces_lagg_edit.php @@ -3,7 +3,7 @@ * interfaces_lagg_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/interfaces_ppps.php b/src/usr/local/www/interfaces_ppps.php index f18034d..19afc48 100644 --- a/src/usr/local/www/interfaces_ppps.php +++ b/src/usr/local/www/interfaces_ppps.php @@ -3,7 +3,7 @@ * interfaces_ppps.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/interfaces_ppps_edit.php b/src/usr/local/www/interfaces_ppps_edit.php index 710a0f4..894607e 100644 --- a/src/usr/local/www/interfaces_ppps_edit.php +++ b/src/usr/local/www/interfaces_ppps_edit.php @@ -3,7 +3,7 @@ * interfaces_ppps_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2010 Gabriel B. <gnoahb@gmail.com> * All rights reserved. * diff --git a/src/usr/local/www/interfaces_qinq.php b/src/usr/local/www/interfaces_qinq.php index 0420d9f..63fa1b4 100644 --- a/src/usr/local/www/interfaces_qinq.php +++ b/src/usr/local/www/interfaces_qinq.php @@ -3,7 +3,7 @@ * interfaces_qinq.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/interfaces_qinq_edit.php b/src/usr/local/www/interfaces_qinq_edit.php index 0208f34..5ae39ee 100644 --- a/src/usr/local/www/interfaces_qinq_edit.php +++ b/src/usr/local/www/interfaces_qinq_edit.php @@ -3,7 +3,7 @@ * interfaces_qinq_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/interfaces_vlan.php b/src/usr/local/www/interfaces_vlan.php index c4236b7..ffd315e 100644 --- a/src/usr/local/www/interfaces_vlan.php +++ b/src/usr/local/www/interfaces_vlan.php @@ -3,7 +3,7 @@ * interfaces_vlan.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/interfaces_vlan_edit.php b/src/usr/local/www/interfaces_vlan_edit.php index 7698aa7..7e7b16e 100644 --- a/src/usr/local/www/interfaces_vlan_edit.php +++ b/src/usr/local/www/interfaces_vlan_edit.php @@ -3,7 +3,7 @@ * interfaces_vlan_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/interfaces_wireless.php b/src/usr/local/www/interfaces_wireless.php index 2144e29..dafe49d 100644 --- a/src/usr/local/www/interfaces_wireless.php +++ b/src/usr/local/www/interfaces_wireless.php @@ -3,7 +3,7 @@ * interfaces_wireless.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2010 Erik Fonnesbeck * All rights reserved. * diff --git a/src/usr/local/www/interfaces_wireless_edit.php b/src/usr/local/www/interfaces_wireless_edit.php index 65b3e25..634af76 100644 --- a/src/usr/local/www/interfaces_wireless_edit.php +++ b/src/usr/local/www/interfaces_wireless_edit.php @@ -3,7 +3,7 @@ * interfaces_wireless_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2010 Erik Fonnesbeck * All rights reserved. * diff --git a/src/usr/local/www/js/pfSense.js b/src/usr/local/www/js/pfSense.js index 2098dbe..8047d51 100644 --- a/src/usr/local/www/js/pfSense.js +++ b/src/usr/local/www/js/pfSense.js @@ -2,7 +2,7 @@ * pfSense.js * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -234,6 +234,11 @@ $(function() { // Focus first input $(':input:enabled:visible:first').focus(); + $(".resizable").each(function() { + $(this).css('height', 80).resizable({minHeight: 80, minWidth: 200}).parent().css('padding-bottom', 0); + $(this).css('height', 78); + }); + // Run in-page defined events while (func = window.events.shift()) func(); diff --git a/src/usr/local/www/js/pfSenseHelpers.js b/src/usr/local/www/js/pfSenseHelpers.js index 25a7e62..791e683 100644 --- a/src/usr/local/www/js/pfSenseHelpers.js +++ b/src/usr/local/www/js/pfSenseHelpers.js @@ -2,7 +2,7 @@ * pfSenseHelpers.js * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/js/traffic-graphs.js b/src/usr/local/www/js/traffic-graphs.js index 91acbfa..fcda786 100644 --- a/src/usr/local/www/js/traffic-graphs.js +++ b/src/usr/local/www/js/traffic-graphs.js @@ -1,6 +1,6 @@ /* * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2016 Electric Sheep Fencing, LLC + * Copyright (c) 2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -204,4 +204,4 @@ function draw_graph(refreshInterval, then) { }); -}
\ No newline at end of file +} diff --git a/src/usr/local/www/license.php b/src/usr/local/www/license.php index 601a5cd..d31c31d 100644 --- a/src/usr/local/www/license.php +++ b/src/usr/local/www/license.php @@ -3,7 +3,7 @@ * license.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/load_balancer_monitor.php b/src/usr/local/www/load_balancer_monitor.php index 8a6cd9a..a6875ca 100644 --- a/src/usr/local/www/load_balancer_monitor.php +++ b/src/usr/local/www/load_balancer_monitor.php @@ -3,7 +3,7 @@ * load_balancer_monitor.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2005-2008 Bill Marquette <bill.marquette@gmail.com> * All rights reserved. * diff --git a/src/usr/local/www/load_balancer_monitor_edit.php b/src/usr/local/www/load_balancer_monitor_edit.php index ad8e96f..7c24f8e 100644 --- a/src/usr/local/www/load_balancer_monitor_edit.php +++ b/src/usr/local/www/load_balancer_monitor_edit.php @@ -3,7 +3,7 @@ * load_balancer_monitor_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2005-2008 Bill Marquette <bill.marquette@gmail.com> * All rights reserved. * diff --git a/src/usr/local/www/load_balancer_pool.php b/src/usr/local/www/load_balancer_pool.php index 1b98c70..d9788cd 100644 --- a/src/usr/local/www/load_balancer_pool.php +++ b/src/usr/local/www/load_balancer_pool.php @@ -3,7 +3,7 @@ * load_balancer_pool.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2005-2008 Bill Marquette <bill.marquette@gmail.com> * All rights reserved. * diff --git a/src/usr/local/www/load_balancer_pool_edit.php b/src/usr/local/www/load_balancer_pool_edit.php index 36f4450..c1afb3b 100644 --- a/src/usr/local/www/load_balancer_pool_edit.php +++ b/src/usr/local/www/load_balancer_pool_edit.php @@ -3,7 +3,7 @@ * load_balancer_pool_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2005-2008 Bill Marquette <bill.marquette@gmail.com> * All rights reserved. * diff --git a/src/usr/local/www/load_balancer_setting.php b/src/usr/local/www/load_balancer_setting.php index 036b6b5..9ae4a95 100644 --- a/src/usr/local/www/load_balancer_setting.php +++ b/src/usr/local/www/load_balancer_setting.php @@ -3,7 +3,7 @@ * load_balancer_setting.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2005-2008 Bill Marquette <bill.marquette@gmail.com> * Copyright (c) 2012 Pierre POMES <pierre.pomes@gmail.com>. * All rights reserved. diff --git a/src/usr/local/www/load_balancer_virtual_server.php b/src/usr/local/www/load_balancer_virtual_server.php index 60a7275..f07c7ac 100644 --- a/src/usr/local/www/load_balancer_virtual_server.php +++ b/src/usr/local/www/load_balancer_virtual_server.php @@ -3,7 +3,7 @@ * load_balancer_virtual_server.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2005-2008 Bill Marquette <bill.marquette@gmail.com> * All rights reserved. * 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 84aa6ae..f4722ce 100644 --- a/src/usr/local/www/load_balancer_virtual_server_edit.php +++ b/src/usr/local/www/load_balancer_virtual_server_edit.php @@ -3,7 +3,7 @@ * load_balancer_virtual_server_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2005-2008 Bill Marquette <bill.marquette@gmail.com> * All rights reserved. * diff --git a/src/usr/local/www/pkg.php b/src/usr/local/www/pkg.php index 9a7d2bd..b5cf67e 100644 --- a/src/usr/local/www/pkg.php +++ b/src/usr/local/www/pkg.php @@ -3,7 +3,7 @@ * pkg.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/pkg_edit.php b/src/usr/local/www/pkg_edit.php index c0ef630..7a98908 100644 --- a/src/usr/local/www/pkg_edit.php +++ b/src/usr/local/www/pkg_edit.php @@ -3,7 +3,7 @@ * pkg_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/pkg_mgr.php b/src/usr/local/www/pkg_mgr.php index 4326471..cbb7a33 100644 --- a/src/usr/local/www/pkg_mgr.php +++ b/src/usr/local/www/pkg_mgr.php @@ -3,7 +3,7 @@ * pkg_mgr.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2013 Marcello Coutinho * All rights reserved. * diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php index e1b55b5..ff6c341 100644 --- a/src/usr/local/www/pkg_mgr_install.php +++ b/src/usr/local/www/pkg_mgr_install.php @@ -3,7 +3,7 @@ * pkg_mgr_install.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2005 Colin Smith * All rights reserved. * diff --git a/src/usr/local/www/pkg_mgr_installed.php b/src/usr/local/www/pkg_mgr_installed.php index 8c862ad..261de70 100644 --- a/src/usr/local/www/pkg_mgr_installed.php +++ b/src/usr/local/www/pkg_mgr_installed.php @@ -3,7 +3,7 @@ * pkg_mgr_installed.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/restart_httpd.php b/src/usr/local/www/restart_httpd.php index a8588bc..a1b715b 100644 --- a/src/usr/local/www/restart_httpd.php +++ b/src/usr/local/www/restart_httpd.php @@ -3,7 +3,7 @@ * restart_httpd.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2005 Bill Marquette <bill.marquette@gmail.com> * All rights reserved. * diff --git a/src/usr/local/www/services_captiveportal.php b/src/usr/local/www/services_captiveportal.php index a31e2fa..275ab86 100644 --- a/src/usr/local/www/services_captiveportal.php +++ b/src/usr/local/www/services_captiveportal.php @@ -3,7 +3,7 @@ * services_captiveportal.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/services_captiveportal_filemanager.php b/src/usr/local/www/services_captiveportal_filemanager.php index 8d48c31..82acfdb 100644 --- a/src/usr/local/www/services_captiveportal_filemanager.php +++ b/src/usr/local/www/services_captiveportal_filemanager.php @@ -3,7 +3,7 @@ * services_captiveportal_filemanager.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2005-2006 Jonathan De Graeve (jonathan.de.graeve@imelda.be) * Copyright (c) 2005-2006 Paul Taylor (paultaylor@winn-dixie.com) * All rights reserved. diff --git a/src/usr/local/www/services_captiveportal_hostname.php b/src/usr/local/www/services_captiveportal_hostname.php index e0c513f..a4e46b0 100644 --- a/src/usr/local/www/services_captiveportal_hostname.php +++ b/src/usr/local/www/services_captiveportal_hostname.php @@ -3,7 +3,7 @@ * services_captiveportal_hostname.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/services_captiveportal_hostname_edit.php b/src/usr/local/www/services_captiveportal_hostname_edit.php index 86712d6..6d8102d 100644 --- a/src/usr/local/www/services_captiveportal_hostname_edit.php +++ b/src/usr/local/www/services_captiveportal_hostname_edit.php @@ -3,7 +3,7 @@ * services_captiveportal_hostname_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/services_captiveportal_ip.php b/src/usr/local/www/services_captiveportal_ip.php index bbf08c5..b09cc94 100644 --- a/src/usr/local/www/services_captiveportal_ip.php +++ b/src/usr/local/www/services_captiveportal_ip.php @@ -3,7 +3,7 @@ * services_captiveportal_ip.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2004 Dinesh Nair <dinesh@alphaque.com> * All rights reserved. * diff --git a/src/usr/local/www/services_captiveportal_ip_edit.php b/src/usr/local/www/services_captiveportal_ip_edit.php index 91a7713..c014e86 100644 --- a/src/usr/local/www/services_captiveportal_ip_edit.php +++ b/src/usr/local/www/services_captiveportal_ip_edit.php @@ -3,7 +3,7 @@ * services_captiveportal_ip_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2004 Dinesh Nair <dinesh@alphaque.com> * All rights reserved. * diff --git a/src/usr/local/www/services_captiveportal_mac.php b/src/usr/local/www/services_captiveportal_mac.php index 366e949..2cdc077 100644 --- a/src/usr/local/www/services_captiveportal_mac.php +++ b/src/usr/local/www/services_captiveportal_mac.php @@ -3,7 +3,7 @@ * services_captiveportal_mac.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2004 Dinesh Nair <dinesh@alphaque.com> * All rights reserved. * diff --git a/src/usr/local/www/services_captiveportal_mac_edit.php b/src/usr/local/www/services_captiveportal_mac_edit.php index e3da8c6..0fba378 100644 --- a/src/usr/local/www/services_captiveportal_mac_edit.php +++ b/src/usr/local/www/services_captiveportal_mac_edit.php @@ -3,7 +3,7 @@ * services_captiveportal_mac_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2004 Dinesh Nair <dinesh@alphaque.com> * All rights reserved. * diff --git a/src/usr/local/www/services_captiveportal_vouchers.php b/src/usr/local/www/services_captiveportal_vouchers.php index b6cf157..5bb2b3d 100644 --- a/src/usr/local/www/services_captiveportal_vouchers.php +++ b/src/usr/local/www/services_captiveportal_vouchers.php @@ -3,7 +3,7 @@ * services_captiveportal_vouchers.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2007 Marcel Wiget <mwiget@mac.com> * All rights reserved. * @@ -290,65 +290,28 @@ if ($_POST) { } if ($newvoucher['vouchersyncpass'] && $newvoucher['vouchersyncusername'] && $newvoucher['vouchersyncport'] && $newvoucher['vouchersyncdbip']) { - // Synchronize the voucher DB from the master node - require_once("XML/RPC2/Client.php"); - - $protocol = "http"; - if (is_array($config['system']) && is_array($config['system']['webgui']) && !empty($config['system']['webgui']['protocol']) && - $config['system']['webgui']['protocol'] == "https") { - $protocol = "https"; - } - if ($protocol == "https" || $newvoucher['vouchersyncport'] == "443") { - $url = "https://{$newvoucher['vouchersyncdbip']}"; - } else { - $url = "http://{$newvoucher['vouchersyncdbip']}"; - } - $url .= ":{$newvoucher['vouchersyncport']}/xmlrpc.php"; + // Synchronize the voucher DB from the master node $execcmd = <<<EOF + global \$config; \$toreturn = array(); \$toreturn['voucher'] = \$config['voucher']['$cpzone']; unset(\$toreturn['vouchersyncport'], \$toreturn['vouchersyncpass'], \$toreturn['vouchersyncusername'], \$toreturn['vouchersyncdbip']); EOF; - - $options = array( - 'prefix' => 'pfsense.', - 'sslverify' => false, - 'connectionTimeout' => 240 - ); - - log_error(sprintf(gettext("voucher XMLRPC sync data %s"), $url)); - $cli = XML_RPC2_Client::create($url, $options); - if (!is_object($cli)) { - $error = sprintf(gettext("A communications error occurred while attempting CaptivePortalVoucherSync XMLRPC sync with %s (pfsense.exec_php)."), $url); - log_error($error); - file_notice("sync_settings", $error, "Settings Sync", ""); - $input_errors[] = $error; - } else { - try { - $resp = $cli->exec_php($newvoucher['vouchersyncusername'], $newvoucher['vouchersyncpass'], $execcmd); - } catch (XML_RPC2_FaultException $e) { - // The XMLRPC server returns a XMLRPC error - $error = 'Exception calling XMLRPC method exec_php #' . $e->getFaultCode() . ' : ' . $e->getFaultString(); - log_error($error); - file_notice("CaptivePortalVoucherSync", $error, "Communications error occurred", ""); - $input_errors[] = $error; - } catch (Exception $e) { - // Other errors (HTTP or networking problems...) - $error = 'Exception calling XMLRPC method exec_php #' . $e->getMessage(); - log_error($error); - file_notice("CaptivePortalVoucherSync", $error, gettext("Error code received"), ""); - $input_errors[] = $error; - } + require_once("xmlrpc_client.inc"); + $rpc_client = new pfsense_xmlrpc_client(); + $rpc_client->setConnectionData( + $newvoucher['vouchersyncdbip'], $newvoucher['vouchersyncport'], + $newvoucher['vouchersyncusername'], $newvoucher['vouchersyncpass']); + $rpc_client->set_noticefile("CaptivePortalVoucherSync"); + $resp = $rpc_client->xmlrpc_exec_php($execcmd); + if ($resp == null) { + $input_errors[] = $rpc_client->get_error(); } if (!$input_errors) { - if (!is_array($resp)) { - if ($resp == "Authentication failed") { - $input_errors[] = gettext("Could not synchronize the voucher database: Authentication Failed."); - } - } else { + if (is_array($resp)) { log_error(sprintf(gettext("The Captive Portal voucher database has been synchronized with %s (pfsense.exec_php)."), $url)); // If we received back the voucher roll and other information then store it. if ($resp['voucher']['roll']) { diff --git a/src/usr/local/www/services_captiveportal_vouchers_edit.php b/src/usr/local/www/services_captiveportal_vouchers_edit.php index 8a69439..c7eebc8 100644 --- a/src/usr/local/www/services_captiveportal_vouchers_edit.php +++ b/src/usr/local/www/services_captiveportal_vouchers_edit.php @@ -3,7 +3,7 @@ * services_captiveportal_vouchers_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2007 Marcel Wiget <mwiget@mac.com> * All rights reserved. * diff --git a/src/usr/local/www/services_captiveportal_zones.php b/src/usr/local/www/services_captiveportal_zones.php index 64b70ab..8014ca8 100644 --- a/src/usr/local/www/services_captiveportal_zones.php +++ b/src/usr/local/www/services_captiveportal_zones.php @@ -3,7 +3,7 @@ * services_captiveportal_zones.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/services_captiveportal_zones_edit.php b/src/usr/local/www/services_captiveportal_zones_edit.php index ef4df0b..4ad1013 100644 --- a/src/usr/local/www/services_captiveportal_zones_edit.php +++ b/src/usr/local/www/services_captiveportal_zones_edit.php @@ -3,7 +3,7 @@ * services_captiveportal_zones_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/services_checkip.php b/src/usr/local/www/services_checkip.php index cf740c2..b59d3d1 100644 --- a/src/usr/local/www/services_checkip.php +++ b/src/usr/local/www/services_checkip.php @@ -3,7 +3,7 @@ * services_checkip.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -156,9 +156,12 @@ endforeach; ?> </a> </nav> -<?php -print_info_box(gettext('The first (highest in list) enabled check ip service will be used to ' . - 'check IP addresses for Dynamic DNS services, and ' . - 'RFC 2136 entries that have the "Use public IP" option enabled.')); +<div class="infoblock"> + <?php print_info_box(gettext( + 'The first (highest in list) enabled check ip service will be used to ' . + 'check IP addresses for Dynamic DNS services, and ' . + 'RFC 2136 entries that have the "Use public IP" option enabled.' + ), 'info', false); ?> +</div> -include("foot.inc"); +<?php include("foot.inc"); diff --git a/src/usr/local/www/services_checkip_edit.php b/src/usr/local/www/services_checkip_edit.php index 99ba7a3..932366e 100644 --- a/src/usr/local/www/services_checkip_edit.php +++ b/src/usr/local/www/services_checkip_edit.php @@ -3,7 +3,7 @@ * services_checkip_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php index a9451b0..5c90fe3 100644 --- a/src/usr/local/www/services_dhcp.php +++ b/src/usr/local/www/services_dhcp.php @@ -3,7 +3,7 @@ * services_dhcp.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/services_dhcp_edit.php b/src/usr/local/www/services_dhcp_edit.php index 53dd933..f599610 100644 --- a/src/usr/local/www/services_dhcp_edit.php +++ b/src/usr/local/www/services_dhcp_edit.php @@ -3,7 +3,7 @@ * services_dhcp_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/services_dhcp_relay.php b/src/usr/local/www/services_dhcp_relay.php index 949fe3c..fa1018c 100644 --- a/src/usr/local/www/services_dhcp_relay.php +++ b/src/usr/local/www/services_dhcp_relay.php @@ -3,7 +3,7 @@ * services_dhcp_relay.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2003-2004 Justin Ellison <justin@techadvise.com> * All rights reserved. * diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php index 9f22a7c..835176c 100644 --- a/src/usr/local/www/services_dhcpv6.php +++ b/src/usr/local/www/services_dhcpv6.php @@ -3,7 +3,7 @@ * services_dhcpv6.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2010 Seth Mos <seth.mos@dds.nl> * All rights reserved. * diff --git a/src/usr/local/www/services_dhcpv6_edit.php b/src/usr/local/www/services_dhcpv6_edit.php index 8dde1f9..3882e0f 100644 --- a/src/usr/local/www/services_dhcpv6_edit.php +++ b/src/usr/local/www/services_dhcpv6_edit.php @@ -3,7 +3,7 @@ * services_dhcpv6_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2010 Seth Mos <seth.mos@dds.nl> * All rights reserved. * diff --git a/src/usr/local/www/services_dhcpv6_relay.php b/src/usr/local/www/services_dhcpv6_relay.php index cfeef93..a80b529 100644 --- a/src/usr/local/www/services_dhcpv6_relay.php +++ b/src/usr/local/www/services_dhcpv6_relay.php @@ -3,7 +3,7 @@ * services_dhcpv6_relay.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2003-2004 Justin Ellison <justin@techadvise.com> * Copyright (c) 2010 Seth Mos * All rights reserved. diff --git a/src/usr/local/www/services_dnsmasq.php b/src/usr/local/www/services_dnsmasq.php index 8f82bfa..5413583 100644 --- a/src/usr/local/www/services_dnsmasq.php +++ b/src/usr/local/www/services_dnsmasq.php @@ -3,7 +3,7 @@ * services_dnsmasq.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2003-2004 Bob Zoller <bob@kludgebox.com> * All rights reserved. * diff --git a/src/usr/local/www/services_dnsmasq_domainoverride_edit.php b/src/usr/local/www/services_dnsmasq_domainoverride_edit.php index 4fbb82e..7512e25 100644 --- a/src/usr/local/www/services_dnsmasq_domainoverride_edit.php +++ b/src/usr/local/www/services_dnsmasq_domainoverride_edit.php @@ -3,7 +3,7 @@ * services_dnsmasq_domainoverride_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2003-2004 Bob Zoller <bob@kludgebox.com> * All rights reserved. * diff --git a/src/usr/local/www/services_dnsmasq_edit.php b/src/usr/local/www/services_dnsmasq_edit.php index ea559fe..c0e456b 100644 --- a/src/usr/local/www/services_dnsmasq_edit.php +++ b/src/usr/local/www/services_dnsmasq_edit.php @@ -3,7 +3,7 @@ * services_dnsmasq_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2003-2004 Bob Zoller <bob@kludgebox.com> * All rights reserved. * diff --git a/src/usr/local/www/services_dyndns.php b/src/usr/local/www/services_dyndns.php index 9284c3c..eb4c16b 100644 --- a/src/usr/local/www/services_dyndns.php +++ b/src/usr/local/www/services_dyndns.php @@ -3,7 +3,7 @@ * services_dyndns.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/services_dyndns_edit.php b/src/usr/local/www/services_dyndns_edit.php index 060d624..0e7fb71 100644 --- a/src/usr/local/www/services_dyndns_edit.php +++ b/src/usr/local/www/services_dyndns_edit.php @@ -3,7 +3,7 @@ * services_dyndns_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/services_igmpproxy.php b/src/usr/local/www/services_igmpproxy.php index 7a8db1d..f3b8775 100644 --- a/src/usr/local/www/services_igmpproxy.php +++ b/src/usr/local/www/services_igmpproxy.php @@ -3,7 +3,7 @@ * services_igmpproxy.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/services_igmpproxy_edit.php b/src/usr/local/www/services_igmpproxy_edit.php index bc76256..9c7d495 100644 --- a/src/usr/local/www/services_igmpproxy_edit.php +++ b/src/usr/local/www/services_igmpproxy_edit.php @@ -3,7 +3,7 @@ * services_igmpproxy_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/services_ntpd.php b/src/usr/local/www/services_ntpd.php index c25d1b0..316e581 100644 --- a/src/usr/local/www/services_ntpd.php +++ b/src/usr/local/www/services_ntpd.php @@ -3,7 +3,7 @@ * services_ntpd.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2013 Dagorlad * All rights reserved. * diff --git a/src/usr/local/www/services_ntpd_acls.php b/src/usr/local/www/services_ntpd_acls.php index 1c3fb7f..a69a2a1 100644 --- a/src/usr/local/www/services_ntpd_acls.php +++ b/src/usr/local/www/services_ntpd_acls.php @@ -3,7 +3,7 @@ * services_ntpd_acls.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2013 Dagorlad * All rights reserved. * diff --git a/src/usr/local/www/services_ntpd_gps.php b/src/usr/local/www/services_ntpd_gps.php index 4cda5b5..971d57e 100644 --- a/src/usr/local/www/services_ntpd_gps.php +++ b/src/usr/local/www/services_ntpd_gps.php @@ -3,7 +3,7 @@ * services_ntpd_gps.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2013 Dagorlad * All rights reserved. * diff --git a/src/usr/local/www/services_ntpd_pps.php b/src/usr/local/www/services_ntpd_pps.php index c70e676..da987f7 100644 --- a/src/usr/local/www/services_ntpd_pps.php +++ b/src/usr/local/www/services_ntpd_pps.php @@ -3,7 +3,7 @@ * services_ntpd_pps.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2013 Dagorlad * All rights reserved. * diff --git a/src/usr/local/www/services_pppoe.php b/src/usr/local/www/services_pppoe.php index 5aa0874..a8b0f03 100644 --- a/src/usr/local/www/services_pppoe.php +++ b/src/usr/local/www/services_pppoe.php @@ -3,7 +3,7 @@ * services_pppoe.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/services_pppoe_edit.php b/src/usr/local/www/services_pppoe_edit.php index afcf478..633af97 100644 --- a/src/usr/local/www/services_pppoe_edit.php +++ b/src/usr/local/www/services_pppoe_edit.php @@ -3,7 +3,7 @@ * services_pppoe_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/services_rfc2136.php b/src/usr/local/www/services_rfc2136.php index 7d009bf..c7ef152 100644 --- a/src/usr/local/www/services_rfc2136.php +++ b/src/usr/local/www/services_rfc2136.php @@ -3,7 +3,7 @@ * services_rfc2136.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/services_rfc2136_edit.php b/src/usr/local/www/services_rfc2136_edit.php index 9153949..41a7c5b 100644 --- a/src/usr/local/www/services_rfc2136_edit.php +++ b/src/usr/local/www/services_rfc2136_edit.php @@ -3,7 +3,7 @@ * services_rfc2136_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php index 5f05d42..c805876 100644 --- a/src/usr/local/www/services_router_advertisements.php +++ b/src/usr/local/www/services_router_advertisements.php @@ -3,7 +3,7 @@ * services_router_advertisements.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2010 Seth Mos <seth.mos@dds.nl> * All rights reserved. * diff --git a/src/usr/local/www/services_snmp.php b/src/usr/local/www/services_snmp.php index 69c770d..6c4f0b2 100644 --- a/src/usr/local/www/services_snmp.php +++ b/src/usr/local/www/services_snmp.php @@ -3,7 +3,7 @@ * services_snmp.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/services_unbound.php b/src/usr/local/www/services_unbound.php index 37f5c91..b79548c 100644 --- a/src/usr/local/www/services_unbound.php +++ b/src/usr/local/www/services_unbound.php @@ -3,7 +3,7 @@ * services_unbound.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2014 Warren Baker (warren@pfsense.org) * All rights reserved. * @@ -285,7 +285,7 @@ $section->addInput(new Form_Select( $activeiflist['selected'], $activeiflist['options'], true -))->addClass('general')->setHelp('Interface IPs used by the DNS Resolver for responding to queries from clients. If an interface has both IPv4 and IPv6 IPs, both are used. Queries to other interface IPs not selected below are discarded. ' . +))->addClass('general', 'resizable')->setHelp('Interface IPs used by the DNS Resolver for responding to queries from clients. If an interface has both IPv4 and IPv6 IPs, both are used. Queries to other interface IPs not selected below are discarded. ' . 'The default behavior is to respond to queries on every available IPv4 and IPv6 address.'); $outiflist = build_if_list($pconfig['outgoing_interface']); @@ -296,7 +296,7 @@ $section->addInput(new Form_Select( $outiflist['selected'], $outiflist['options'], true -))->addClass('general')->setHelp('Utilize different network interface(s) that the DNS Resolver will use to send queries to authoritative servers and receive their replies. By default all interfaces are used.'); +))->addClass('general', 'resizable')->setHelp('Utilize different network interface(s) that the DNS Resolver will use to send queries to authoritative servers and receive their replies. By default all interfaces are used.'); $section->addInput(new Form_Select( 'system_domain_local_zone_type', diff --git a/src/usr/local/www/services_unbound_acls.php b/src/usr/local/www/services_unbound_acls.php index fdaf0b2..bec6357 100644 --- a/src/usr/local/www/services_unbound_acls.php +++ b/src/usr/local/www/services_unbound_acls.php @@ -3,7 +3,7 @@ * services_unbound_acls.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2014 Warren Baker (warren@pfsense.org) * All rights reserved. * diff --git a/src/usr/local/www/services_unbound_advanced.php b/src/usr/local/www/services_unbound_advanced.php index bed84f3..14bb376 100644 --- a/src/usr/local/www/services_unbound_advanced.php +++ b/src/usr/local/www/services_unbound_advanced.php @@ -3,7 +3,7 @@ * services_unbound_advanced.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2014 Warren Baker (warren@pfsense.org) * All rights reserved. * diff --git a/src/usr/local/www/services_unbound_domainoverride_edit.php b/src/usr/local/www/services_unbound_domainoverride_edit.php index ed3c631..f204684 100644 --- a/src/usr/local/www/services_unbound_domainoverride_edit.php +++ b/src/usr/local/www/services_unbound_domainoverride_edit.php @@ -3,7 +3,7 @@ * services_unbound_domainoverride_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2014 Warren Baker (warren@decoy.co.za) * Copyright (c) 2003-2005 Bob Zoller <bob@kludgebox.com> * All rights reserved. diff --git a/src/usr/local/www/services_unbound_host_edit.php b/src/usr/local/www/services_unbound_host_edit.php index 2b16380..93e01fe 100644 --- a/src/usr/local/www/services_unbound_host_edit.php +++ b/src/usr/local/www/services_unbound_host_edit.php @@ -3,7 +3,7 @@ * services_unbound_host_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2014 Warren Baker (warren@decoy.co.za) * Copyright (c) 2003-2005 Bob Zoller <bob@kludgebox.com> * All rights reserved. diff --git a/src/usr/local/www/services_wol.php b/src/usr/local/www/services_wol.php index 23832c0..7aefd0b 100644 --- a/src/usr/local/www/services_wol.php +++ b/src/usr/local/www/services_wol.php @@ -3,7 +3,7 @@ * services_wol.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/services_wol_edit.php b/src/usr/local/www/services_wol_edit.php index 0616a0d..bce57fc 100644 --- a/src/usr/local/www/services_wol_edit.php +++ b/src/usr/local/www/services_wol_edit.php @@ -3,7 +3,7 @@ * services_wol_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/shortcuts.inc b/src/usr/local/www/shortcuts.inc index 291eeb9..6f668bd 100644 --- a/src/usr/local/www/shortcuts.inc +++ b/src/usr/local/www/shortcuts.inc @@ -3,7 +3,7 @@ * shortcuts.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -247,10 +247,6 @@ $shortcuts['ntp']['log'] = "status_logs.php?logfile=ntpd"; $shortcuts['ntp']['status'] = "status_ntpd.php"; $shortcuts['ntp']['service'] = "ntpd"; -$shortcuts['pptps'] = array(); -$shortcuts['pptps']['main'] = "vpn_pptp.php"; -$shortcuts['pptps']['log'] = "status_logs_vpn.php"; - $shortcuts['pppoes'] = array(); $shortcuts['pppoes']['main'] = "services_pppoe.php"; $shortcuts['pppoes']['log'] = "status_logs_vpn.php?vpntype=poes"; diff --git a/src/usr/local/www/shortcuts/pkg_upnp.inc b/src/usr/local/www/shortcuts/pkg_upnp.inc index 909bc04..16f286d 100644 --- a/src/usr/local/www/shortcuts/pkg_upnp.inc +++ b/src/usr/local/www/shortcuts/pkg_upnp.inc @@ -3,7 +3,7 @@ * pkg_upnp.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/stats.php b/src/usr/local/www/stats.php index 117f930..bccb98c 100644 --- a/src/usr/local/www/stats.php +++ b/src/usr/local/www/stats.php @@ -3,7 +3,7 @@ * stats.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/status.php b/src/usr/local/www/status.php index a4a8c20..5dc890c 100644 --- a/src/usr/local/www/status.php +++ b/src/usr/local/www/status.php @@ -3,7 +3,7 @@ * status.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://neon1.net/m0n0wall) diff --git a/src/usr/local/www/status_captiveportal.php b/src/usr/local/www/status_captiveportal.php index 02de882..516eff8 100644 --- a/src/usr/local/www/status_captiveportal.php +++ b/src/usr/local/www/status_captiveportal.php @@ -3,7 +3,7 @@ * status_captiveportal.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/status_captiveportal_expire.php b/src/usr/local/www/status_captiveportal_expire.php index 1b6ccdf..d1e1292 100644 --- a/src/usr/local/www/status_captiveportal_expire.php +++ b/src/usr/local/www/status_captiveportal_expire.php @@ -3,7 +3,7 @@ * status_captiveportal_expire.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2007 Marcel Wiget <mwiget@mac.com> * All rights reserved. * diff --git a/src/usr/local/www/status_captiveportal_test.php b/src/usr/local/www/status_captiveportal_test.php index a353844..13363af 100644 --- a/src/usr/local/www/status_captiveportal_test.php +++ b/src/usr/local/www/status_captiveportal_test.php @@ -3,7 +3,7 @@ * status_captiveportal_test.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2007 Marcel Wiget <mwiget@mac.com> * All rights reserved. * diff --git a/src/usr/local/www/status_captiveportal_voucher_rolls.php b/src/usr/local/www/status_captiveportal_voucher_rolls.php index a27a05f..4f3e7a8 100644 --- a/src/usr/local/www/status_captiveportal_voucher_rolls.php +++ b/src/usr/local/www/status_captiveportal_voucher_rolls.php @@ -3,7 +3,7 @@ * status_captiveportal_voucher_rolls.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2007 Marcel Wiget <mwiget@mac.com> * All rights reserved. * diff --git a/src/usr/local/www/status_captiveportal_vouchers.php b/src/usr/local/www/status_captiveportal_vouchers.php index e77c2d5..63b39d1 100644 --- a/src/usr/local/www/status_captiveportal_vouchers.php +++ b/src/usr/local/www/status_captiveportal_vouchers.php @@ -3,7 +3,7 @@ * status_captiveportal_vouchers.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2007 Marcel Wiget <mwiget@mac.com> * All rights reserved. * diff --git a/src/usr/local/www/status_carp.php b/src/usr/local/www/status_carp.php index 8b0311f..eb5070d 100644 --- a/src/usr/local/www/status_carp.php +++ b/src/usr/local/www/status_carp.php @@ -3,7 +3,7 @@ * status_carp.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/status_dhcp_leases.php b/src/usr/local/www/status_dhcp_leases.php index dff4804..3f148a9 100644 --- a/src/usr/local/www/status_dhcp_leases.php +++ b/src/usr/local/www/status_dhcp_leases.php @@ -3,7 +3,7 @@ * status_dhcp_leases.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/status_dhcpv6_leases.php b/src/usr/local/www/status_dhcpv6_leases.php index 6fa390d..a8f8ad2 100644 --- a/src/usr/local/www/status_dhcpv6_leases.php +++ b/src/usr/local/www/status_dhcpv6_leases.php @@ -3,7 +3,7 @@ * status_dhcpv6_leases.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2011 Seth Mos * All rights reserved. * diff --git a/src/usr/local/www/status_filter_reload.php b/src/usr/local/www/status_filter_reload.php index dd7c3ec..eed3e37 100644 --- a/src/usr/local/www/status_filter_reload.php +++ b/src/usr/local/www/status_filter_reload.php @@ -3,7 +3,7 @@ * status_filter_reload.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/status_gateway_groups.php b/src/usr/local/www/status_gateway_groups.php index 17c7522..d1989b2 100644 --- a/src/usr/local/www/status_gateway_groups.php +++ b/src/usr/local/www/status_gateway_groups.php @@ -3,7 +3,7 @@ * status_gateway_groups.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2010 Seth Mos <seth.mos@dds.nl> * All rights reserved. * diff --git a/src/usr/local/www/status_gateways.php b/src/usr/local/www/status_gateways.php index 4663ad0..ab9fe07 100644 --- a/src/usr/local/www/status_gateways.php +++ b/src/usr/local/www/status_gateways.php @@ -3,7 +3,7 @@ * status_gateways.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2010 Seth Mos <seth.mos@dds.nl> * All rights reserved. * diff --git a/src/usr/local/www/status_graph.php b/src/usr/local/www/status_graph.php index f4a7a8c..4a36037 100644 --- a/src/usr/local/www/status_graph.php +++ b/src/usr/local/www/status_graph.php @@ -3,7 +3,7 @@ * status_graph.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/status_graph_cpu.php b/src/usr/local/www/status_graph_cpu.php index 5e66f90..9c4637d 100644 --- a/src/usr/local/www/status_graph_cpu.php +++ b/src/usr/local/www/status_graph_cpu.php @@ -3,7 +3,7 @@ * status_graph_cpu.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/status_interfaces.php b/src/usr/local/www/status_interfaces.php index 0a7d6b7..05e0671 100644 --- a/src/usr/local/www/status_interfaces.php +++ b/src/usr/local/www/status_interfaces.php @@ -3,7 +3,7 @@ * status_interfaces.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/status_ipsec.php b/src/usr/local/www/status_ipsec.php index bcc0515..da2c265 100644 --- a/src/usr/local/www/status_ipsec.php +++ b/src/usr/local/www/status_ipsec.php @@ -3,7 +3,7 @@ * status_ipsec.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/status_ipsec_leases.php b/src/usr/local/www/status_ipsec_leases.php index e025ebf..9f9e70d 100644 --- a/src/usr/local/www/status_ipsec_leases.php +++ b/src/usr/local/www/status_ipsec_leases.php @@ -3,7 +3,7 @@ * status_ipsec_leases.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/status_ipsec_sad.php b/src/usr/local/www/status_ipsec_sad.php index 3c7c852..0df5216 100644 --- a/src/usr/local/www/status_ipsec_sad.php +++ b/src/usr/local/www/status_ipsec_sad.php @@ -3,7 +3,7 @@ * status_ipsec_sad.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/status_ipsec_spd.php b/src/usr/local/www/status_ipsec_spd.php index 7061c2f..1488b27 100644 --- a/src/usr/local/www/status_ipsec_spd.php +++ b/src/usr/local/www/status_ipsec_spd.php @@ -3,7 +3,7 @@ * status_ipsec_spd.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/status_lb_pool.php b/src/usr/local/www/status_lb_pool.php index cd5b2d4..911e891 100644 --- a/src/usr/local/www/status_lb_pool.php +++ b/src/usr/local/www/status_lb_pool.php @@ -3,7 +3,7 @@ * status_lb_pool.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2010 Seth Mos <seth.mos@dds.nl> * All rights reserved. * diff --git a/src/usr/local/www/status_lb_vs.php b/src/usr/local/www/status_lb_vs.php index aab1cca..c28feca 100644 --- a/src/usr/local/www/status_lb_vs.php +++ b/src/usr/local/www/status_lb_vs.php @@ -3,7 +3,7 @@ * status_lb_vs.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2010 Seth Mos <seth.mos@dds.nl> * All rights reserved. * diff --git a/src/usr/local/www/status_logs.php b/src/usr/local/www/status_logs.php index 3350fec..7435974 100644 --- a/src/usr/local/www/status_logs.php +++ b/src/usr/local/www/status_logs.php @@ -3,7 +3,7 @@ * status_logs.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/status_logs_common.inc b/src/usr/local/www/status_logs_common.inc index 736c98e..f35b9a2 100644 --- a/src/usr/local/www/status_logs_common.inc +++ b/src/usr/local/www/status_logs_common.inc @@ -3,7 +3,7 @@ * status_logs_common.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/status_logs_filter.php b/src/usr/local/www/status_logs_filter.php index 4c0a3d2..4c37c91 100644 --- a/src/usr/local/www/status_logs_filter.php +++ b/src/usr/local/www/status_logs_filter.php @@ -3,7 +3,7 @@ * status_logs_filter.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/status_logs_filter_dynamic.php b/src/usr/local/www/status_logs_filter_dynamic.php index 21d7074..4ea4d4a 100644 --- a/src/usr/local/www/status_logs_filter_dynamic.php +++ b/src/usr/local/www/status_logs_filter_dynamic.php @@ -3,7 +3,7 @@ * status_logs_filter_dynamic.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/status_logs_filter_summary.php b/src/usr/local/www/status_logs_filter_summary.php index 1220c0b..124d190 100644 --- a/src/usr/local/www/status_logs_filter_summary.php +++ b/src/usr/local/www/status_logs_filter_summary.php @@ -3,7 +3,7 @@ * status_logs_filter_summary.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/status_logs_settings.php b/src/usr/local/www/status_logs_settings.php index b073d2f..62acf2b 100644 --- a/src/usr/local/www/status_logs_settings.php +++ b/src/usr/local/www/status_logs_settings.php @@ -3,7 +3,7 @@ * status_logs_settings.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) @@ -51,6 +51,10 @@ $pconfig['relayd'] = isset($config['syslog']['relayd']); $pconfig['hostapd'] = isset($config['syslog']['hostapd']); $pconfig['logall'] = isset($config['syslog']['logall']); $pconfig['system'] = isset($config['syslog']['system']); +$pconfig['resolver'] = isset($config['syslog']['resolver']); +$pconfig['ppp'] = isset($config['syslog']['ppp']); +$pconfig['routing'] = isset($config['syslog']['routing']); +$pconfig['ntpd'] = isset($config['syslog']['ntpd']); $pconfig['enable'] = isset($config['syslog']['enable']); $pconfig['logdefaultblock'] = !isset($config['syslog']['nologdefaultblock']); $pconfig['logdefaultpass'] = isset($config['syslog']['nologdefaultpass']); @@ -125,6 +129,10 @@ if ($_POST['resetlogs'] == gettext("Reset Log Files")) { $config['syslog']['hostapd'] = $_POST['hostapd'] ? true : false; $config['syslog']['logall'] = $_POST['logall'] ? true : false; $config['syslog']['system'] = $_POST['system'] ? true : false; + $config['syslog']['resolver'] = $_POST['resolver'] ? true : false; + $config['syslog']['ppp'] = $_POST['ppp'] ? true : false; + $config['syslog']['routing'] = $_POST['routing'] ? true : false; + $config['syslog']['ntpd'] = $_POST['ntpd'] ? true : false; $config['syslog']['disablelocallogging'] = $_POST['disablelocallogging'] ? true : false; $config['syslog']['enable'] = $_POST['enable'] ? true : false; $oldnologdefaultblock = isset($config['syslog']['nologdefaultblock']); @@ -397,44 +405,72 @@ $group->add(new Form_MultiCheckbox( )); $group->add(new Form_MultiCheckbox( + 'resolver', + null, + 'DNS Events (Resolver/unbound, Forwarder/dnsmasq, filterdns)', + $pconfig['resolver'] +)); + +$group->add(new Form_MultiCheckbox( 'dhcp', null, - 'DHCP service events', + 'DHCP Events (DHCP Daemon, DHCP Relay, DHCP Client)', $pconfig['dhcp'] )); $group->add(new Form_MultiCheckbox( + 'ppp', + null, + 'PPP Events (PPPoE WAN Client, L2TP WAN Client, PPTP WAN Client)', + $pconfig['ppp'] +)); + +$group->add(new Form_MultiCheckbox( 'portalauth', null, - 'Portal Auth events', + 'Captive Portal Events', $pconfig['portalauth'] )); $group->add(new Form_MultiCheckbox( 'vpn', null, - 'VPN (PPTP, IPsec, OpenVPN) events', + 'VPN Events (IPsec, OpenVPN, L2TP, PPPoE Server)', $pconfig['vpn'] )); $group->add(new Form_MultiCheckbox( 'dpinger', null, - 'Gateway Monitor events', + 'Gateway Monitor Events', $pconfig['dpinger'] )); $group->add(new Form_MultiCheckbox( + 'routing', + null, + 'Routing Daemon Events (RADVD, UPnP, RIP, OSPF, BGP)', + $pconfig['routing'] +)); + +$group->add(new Form_MultiCheckbox( 'relayd', null, - 'Server Load Balancer events', + 'Server Load Balancer Events (relayd)', $pconfig['relayd'] )); $group->add(new Form_MultiCheckbox( + 'ntpd', + null, + 'Network Time Protocol Events (NTP Daemon, NTP Client)', + $pconfig['ntpd'] +)); + +$group->add(new Form_MultiCheckbox( 'hostapd', null, - 'Wireless events', + 'Wireless Events (hostapd)', $pconfig['hostapd'] )); @@ -478,6 +514,10 @@ events.push(function() { disableInput('dpinger', hide); disableInput('relayd', hide); disableInput('hostapd', hide); + disableInput('resolver', hide); + disableInput('ppp', hide); + disableInput('routing', hide); + disableInput('ntpd', hide); } // ---------- On initial page load ------------------------------------------------------------ diff --git a/src/usr/local/www/status_logs_vpn.php b/src/usr/local/www/status_logs_vpn.php index bd191db..ea8c178 100644 --- a/src/usr/local/www/status_logs_vpn.php +++ b/src/usr/local/www/status_logs_vpn.php @@ -3,7 +3,7 @@ * status_logs_vpn.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/status_ntpd.php b/src/usr/local/www/status_ntpd.php index 6924abc..8df5c49 100644 --- a/src/usr/local/www/status_ntpd.php +++ b/src/usr/local/www/status_ntpd.php @@ -3,7 +3,7 @@ * status_ntpd.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2013 Dagorlad * All rights reserved. * diff --git a/src/usr/local/www/status_openvpn.php b/src/usr/local/www/status_openvpn.php index ff5ee45..c643b20 100644 --- a/src/usr/local/www/status_openvpn.php +++ b/src/usr/local/www/status_openvpn.php @@ -3,7 +3,7 @@ * status_openvpn.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2008 Shrew Soft Inc. * All rights reserved. * diff --git a/src/usr/local/www/status_pkglogs.php b/src/usr/local/www/status_pkglogs.php index 1bf209a..3070557 100644 --- a/src/usr/local/www/status_pkglogs.php +++ b/src/usr/local/www/status_pkglogs.php @@ -3,7 +3,7 @@ * status_pkglogs.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2005 Colin Smith * All rights reserved. * @@ -49,9 +49,9 @@ $i = 0; $pkgwithlogging = false; $apkg = $_GET['pkg']; if (!$apkg) { // If we aren't looking for a specific package, locate the first package that handles logging. - if ($config['installedpackages']['package'] <> "") { + if (isset($config['installedpackages']['package'])) { foreach ($config['installedpackages']['package'] as $package) { - if (is_array($package['logging'])) { + if (isset($package['logging']['logfilename']) && $package['logging']['logfilename'] != '') { $pkgwithlogging = true; $apkg = $package['name']; $apkgid = $i; diff --git a/src/usr/local/www/status_queues.php b/src/usr/local/www/status_queues.php index dfee786..53bac63 100644 --- a/src/usr/local/www/status_queues.php +++ b/src/usr/local/www/status_queues.php @@ -3,7 +3,7 @@ * status_queues.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/status_services.php b/src/usr/local/www/status_services.php index 2e7a0eb..f589d88 100644 --- a/src/usr/local/www/status_services.php +++ b/src/usr/local/www/status_services.php @@ -3,7 +3,7 @@ * status_services.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/status_upnp.php b/src/usr/local/www/status_upnp.php index c5c3faa..7bc223a 100644 --- a/src/usr/local/www/status_upnp.php +++ b/src/usr/local/www/status_upnp.php @@ -3,7 +3,7 @@ * status_upnp.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2010 Seth Mos <seth.mos@dds.nl> * All rights reserved. * diff --git a/src/usr/local/www/status_wireless.php b/src/usr/local/www/status_wireless.php index 1d9da5b..8516ff0 100644 --- a/src/usr/local/www/status_wireless.php +++ b/src/usr/local/www/status_wireless.php @@ -3,7 +3,7 @@ * status_wireless.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php index 6b0e9a9..2864fdd 100644 --- a/src/usr/local/www/system.php +++ b/src/usr/local/www/system.php @@ -3,7 +3,7 @@ * system.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/system_advanced_admin.php b/src/usr/local/www/system_advanced_admin.php index 205d3ea..01527c8 100644 --- a/src/usr/local/www/system_advanced_admin.php +++ b/src/usr/local/www/system_advanced_admin.php @@ -3,7 +3,7 @@ * system_advanced_admin.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2008 Shrew Soft Inc * All rights reserved. * diff --git a/src/usr/local/www/system_advanced_firewall.php b/src/usr/local/www/system_advanced_firewall.php index 858f5b8..b70ddcb 100644 --- a/src/usr/local/www/system_advanced_firewall.php +++ b/src/usr/local/www/system_advanced_firewall.php @@ -3,7 +3,7 @@ * system_advanced_firewall.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2008 Shrew Soft Inc * All rights reserved. * diff --git a/src/usr/local/www/system_advanced_misc.php b/src/usr/local/www/system_advanced_misc.php index baff8e6..aae6b8f 100644 --- a/src/usr/local/www/system_advanced_misc.php +++ b/src/usr/local/www/system_advanced_misc.php @@ -3,7 +3,7 @@ * system_advanced_misc.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2008 Shrew Soft Inc * All rights reserved. * diff --git a/src/usr/local/www/system_advanced_network.php b/src/usr/local/www/system_advanced_network.php index 38a7004..bf0b715 100644 --- a/src/usr/local/www/system_advanced_network.php +++ b/src/usr/local/www/system_advanced_network.php @@ -3,7 +3,7 @@ * system_advanced_network.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2008 Shrew Soft Inc * All rights reserved. * diff --git a/src/usr/local/www/system_advanced_notifications.php b/src/usr/local/www/system_advanced_notifications.php index 17092f2..4acbabb 100644 --- a/src/usr/local/www/system_advanced_notifications.php +++ b/src/usr/local/www/system_advanced_notifications.php @@ -3,7 +3,7 @@ * system_advanced_notifications.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/system_advanced_sysctl.php b/src/usr/local/www/system_advanced_sysctl.php index ab9af0e..3ab51fd 100644 --- a/src/usr/local/www/system_advanced_sysctl.php +++ b/src/usr/local/www/system_advanced_sysctl.php @@ -3,7 +3,7 @@ * system_advanced_sysctl.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2008 Shrew Soft Inc * All rights reserved. * diff --git a/src/usr/local/www/system_authservers.php b/src/usr/local/www/system_authservers.php index 1b343bf..782ad69 100644 --- a/src/usr/local/www/system_authservers.php +++ b/src/usr/local/www/system_authservers.php @@ -3,7 +3,7 @@ * system_authservers.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2008 Shrew Soft Inc * All rights reserved. * diff --git a/src/usr/local/www/system_camanager.php b/src/usr/local/www/system_camanager.php index d9112b1..fb03d27 100644 --- a/src/usr/local/www/system_camanager.php +++ b/src/usr/local/www/system_camanager.php @@ -3,7 +3,7 @@ * system_camanager.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2008 Shrew Soft Inc * All rights reserved. * diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php index f5fa3ca..4545ca6 100644 --- a/src/usr/local/www/system_certmanager.php +++ b/src/usr/local/www/system_certmanager.php @@ -3,7 +3,7 @@ * system_certmanager.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2008 Shrew Soft Inc * All rights reserved. * diff --git a/src/usr/local/www/system_crlmanager.php b/src/usr/local/www/system_crlmanager.php index efb79f5..b21b7b7 100644 --- a/src/usr/local/www/system_crlmanager.php +++ b/src/usr/local/www/system_crlmanager.php @@ -3,7 +3,7 @@ * system_crlmanager.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/system_gateway_groups.php b/src/usr/local/www/system_gateway_groups.php index 8d17dfa..c8f956d 100644 --- a/src/usr/local/www/system_gateway_groups.php +++ b/src/usr/local/www/system_gateway_groups.php @@ -3,7 +3,7 @@ * system_gateway_groups.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2010 Seth Mos <seth.mos@dds.nl> * All rights reserved. * diff --git a/src/usr/local/www/system_gateway_groups_edit.php b/src/usr/local/www/system_gateway_groups_edit.php index 858205b..60c704c 100644 --- a/src/usr/local/www/system_gateway_groups_edit.php +++ b/src/usr/local/www/system_gateway_groups_edit.php @@ -3,7 +3,7 @@ * system_gateway_groups_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2010 Seth Mos <seth.mos@dds.nl> * All rights reserved. * diff --git a/src/usr/local/www/system_gateways.php b/src/usr/local/www/system_gateways.php index b8452ed..3c74ff7 100644 --- a/src/usr/local/www/system_gateways.php +++ b/src/usr/local/www/system_gateways.php @@ -3,7 +3,7 @@ * system_gateways.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2010 Seth Mos <seth.mos@dds.nl> * All rights reserved. * diff --git a/src/usr/local/www/system_gateways_edit.php b/src/usr/local/www/system_gateways_edit.php index cba670c..659fb84 100644 --- a/src/usr/local/www/system_gateways_edit.php +++ b/src/usr/local/www/system_gateways_edit.php @@ -3,7 +3,7 @@ * system_gateways_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/system_groupmanager.php b/src/usr/local/www/system_groupmanager.php index 072a5d1..6668e57 100644 --- a/src/usr/local/www/system_groupmanager.php +++ b/src/usr/local/www/system_groupmanager.php @@ -3,7 +3,7 @@ * system_groupmanager.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2005 Paul Taylor <paultaylor@winn-dixie.com> * Copyright (c) 2008 Shrew Soft Inc * All rights reserved. diff --git a/src/usr/local/www/system_groupmanager_addprivs.php b/src/usr/local/www/system_groupmanager_addprivs.php index 07faab5..ad07c1c 100644 --- a/src/usr/local/www/system_groupmanager_addprivs.php +++ b/src/usr/local/www/system_groupmanager_addprivs.php @@ -3,7 +3,7 @@ * system_groupmanager_addprivs.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2006 Daniel S. Haischt. * All rights reserved. * diff --git a/src/usr/local/www/system_hasync.php b/src/usr/local/www/system_hasync.php index e6b9890..cc80028 100644 --- a/src/usr/local/www/system_hasync.php +++ b/src/usr/local/www/system_hasync.php @@ -3,7 +3,7 @@ * system_hasync.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/system_routes.php b/src/usr/local/www/system_routes.php index fe66f9f..cac6cce 100644 --- a/src/usr/local/www/system_routes.php +++ b/src/usr/local/www/system_routes.php @@ -3,7 +3,7 @@ * system_routes.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/system_routes_edit.php b/src/usr/local/www/system_routes_edit.php index 290e9aa..b86522e 100644 --- a/src/usr/local/www/system_routes_edit.php +++ b/src/usr/local/www/system_routes_edit.php @@ -3,7 +3,7 @@ * system_routes_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/system_update_settings.php b/src/usr/local/www/system_update_settings.php index 8d46099..23c30cd 100644 --- a/src/usr/local/www/system_update_settings.php +++ b/src/usr/local/www/system_update_settings.php @@ -3,7 +3,7 @@ * system_update_settings.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2005 Colin Smith * All rights reserved. * diff --git a/src/usr/local/www/system_user_settings.php b/src/usr/local/www/system_user_settings.php index 60b0932..7cf5c17 100644 --- a/src/usr/local/www/system_user_settings.php +++ b/src/usr/local/www/system_user_settings.php @@ -3,7 +3,7 @@ * system_user_settings.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php index 80265b1..8baa028 100644 --- a/src/usr/local/www/system_usermanager.php +++ b/src/usr/local/www/system_usermanager.php @@ -3,7 +3,7 @@ * system_usermanager.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2008 Shrew Soft Inc. * Copyright (c) 2005 Paul Taylor <paultaylor@winn-dixie.com> * All rights reserved. diff --git a/src/usr/local/www/system_usermanager_addprivs.php b/src/usr/local/www/system_usermanager_addprivs.php index fe29e5f..96a3225 100644 --- a/src/usr/local/www/system_usermanager_addprivs.php +++ b/src/usr/local/www/system_usermanager_addprivs.php @@ -3,7 +3,7 @@ * system_usermanager_addprivs.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2006 Daniel S. Haischt. * All rights reserved. * diff --git a/src/usr/local/www/system_usermanager_passwordmg.php b/src/usr/local/www/system_usermanager_passwordmg.php index db3a862..a06868a 100644 --- a/src/usr/local/www/system_usermanager_passwordmg.php +++ b/src/usr/local/www/system_usermanager_passwordmg.php @@ -3,7 +3,7 @@ * system_usermanager_passwordmg.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/system_usermanager_settings.php b/src/usr/local/www/system_usermanager_settings.php index 393ec76..5101526 100644 --- a/src/usr/local/www/system_usermanager_settings.php +++ b/src/usr/local/www/system_usermanager_settings.php @@ -3,7 +3,7 @@ * system_usermanager_settings.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2007 Bill Marquette <bill.marquette@gmail.com> * All rights reserved. * diff --git a/src/usr/local/www/uploadconfig.php b/src/usr/local/www/uploadconfig.php index a91a813..fbe7dc3 100644 --- a/src/usr/local/www/uploadconfig.php +++ b/src/usr/local/www/uploadconfig.php @@ -4,7 +4,7 @@ * uploadconfig.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/vendor/filebrowser/browser.php b/src/usr/local/www/vendor/filebrowser/browser.php index 54ab942..8ca1217 100644 --- a/src/usr/local/www/vendor/filebrowser/browser.php +++ b/src/usr/local/www/vendor/filebrowser/browser.php @@ -3,7 +3,7 @@ require_once("guiconfig.inc"); /* - Copyright (C) 2013-2015 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Rubicon Communications, LLC (Netgate) */ // Fetch a list of directories and files inside a given directory diff --git a/src/usr/local/www/vpn_ipsec.php b/src/usr/local/www/vpn_ipsec.php index 2a6d838..64b628d 100644 --- a/src/usr/local/www/vpn_ipsec.php +++ b/src/usr/local/www/vpn_ipsec.php @@ -3,7 +3,7 @@ * vpn_ipsec.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/vpn_ipsec_keys.php b/src/usr/local/www/vpn_ipsec_keys.php index f3f5711..46b2e7a 100644 --- a/src/usr/local/www/vpn_ipsec_keys.php +++ b/src/usr/local/www/vpn_ipsec_keys.php @@ -3,7 +3,7 @@ * vpn_ipsec_keys.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/vpn_ipsec_keys_edit.php b/src/usr/local/www/vpn_ipsec_keys_edit.php index 6c92f6e..03fc8fc 100644 --- a/src/usr/local/www/vpn_ipsec_keys_edit.php +++ b/src/usr/local/www/vpn_ipsec_keys_edit.php @@ -3,7 +3,7 @@ * vpn_ipsec_keys_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/vpn_ipsec_mobile.php b/src/usr/local/www/vpn_ipsec_mobile.php index c336928..05df61d 100644 --- a/src/usr/local/www/vpn_ipsec_mobile.php +++ b/src/usr/local/www/vpn_ipsec_mobile.php @@ -3,7 +3,7 @@ * vpn_ipsec_mobile.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2008 Shrew Soft Inc * All rights reserved. * diff --git a/src/usr/local/www/vpn_ipsec_phase1.php b/src/usr/local/www/vpn_ipsec_phase1.php index faed1d7..b34d15b 100644 --- a/src/usr/local/www/vpn_ipsec_phase1.php +++ b/src/usr/local/www/vpn_ipsec_phase1.php @@ -3,7 +3,7 @@ * vpn_ipsec_phase1.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2008 Shrew Soft Inc * All rights reserved. * diff --git a/src/usr/local/www/vpn_ipsec_phase2.php b/src/usr/local/www/vpn_ipsec_phase2.php index c332cf8..02f73db 100644 --- a/src/usr/local/www/vpn_ipsec_phase2.php +++ b/src/usr/local/www/vpn_ipsec_phase2.php @@ -3,7 +3,7 @@ * vpn_ipsec_phase2.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2008 Shrew Soft Inc * All rights reserved. * diff --git a/src/usr/local/www/vpn_ipsec_settings.php b/src/usr/local/www/vpn_ipsec_settings.php index 3875779..4360837 100644 --- a/src/usr/local/www/vpn_ipsec_settings.php +++ b/src/usr/local/www/vpn_ipsec_settings.php @@ -3,7 +3,7 @@ * vpn_ipsec_settings.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/vpn_l2tp.php b/src/usr/local/www/vpn_l2tp.php index 8645218..1adf21b 100644 --- a/src/usr/local/www/vpn_l2tp.php +++ b/src/usr/local/www/vpn_l2tp.php @@ -3,7 +3,7 @@ * vpn_l2tp.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/vpn_l2tp_users.php b/src/usr/local/www/vpn_l2tp_users.php index 1ec0ffd..3bfaec1 100644 --- a/src/usr/local/www/vpn_l2tp_users.php +++ b/src/usr/local/www/vpn_l2tp_users.php @@ -3,7 +3,7 @@ * vpn_l2tp_users.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/vpn_l2tp_users_edit.php b/src/usr/local/www/vpn_l2tp_users_edit.php index b0be760..92b2e9a 100644 --- a/src/usr/local/www/vpn_l2tp_users_edit.php +++ b/src/usr/local/www/vpn_l2tp_users_edit.php @@ -3,7 +3,7 @@ * vpn_l2tp_users_edit.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/vpn_openvpn_client.php b/src/usr/local/www/vpn_openvpn_client.php index 185d515..157b0c9 100644 --- a/src/usr/local/www/vpn_openvpn_client.php +++ b/src/usr/local/www/vpn_openvpn_client.php @@ -3,7 +3,7 @@ * vpn_openvpn_client.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2008 Shrew Soft Inc. * All rights reserved. * diff --git a/src/usr/local/www/vpn_openvpn_csc.php b/src/usr/local/www/vpn_openvpn_csc.php index 4bafa9c..74d4c7a 100644 --- a/src/usr/local/www/vpn_openvpn_csc.php +++ b/src/usr/local/www/vpn_openvpn_csc.php @@ -3,7 +3,7 @@ * vpn_openvpn_csc.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2008 Shrew Soft Inc. * All rights reserved. * diff --git a/src/usr/local/www/vpn_openvpn_server.php b/src/usr/local/www/vpn_openvpn_server.php index 140e248..0e9fe4a 100644 --- a/src/usr/local/www/vpn_openvpn_server.php +++ b/src/usr/local/www/vpn_openvpn_server.php @@ -3,7 +3,7 @@ * vpn_openvpn_server.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2008 Shrew Soft Inc. * All rights reserved. * diff --git a/src/usr/local/www/widgets/include/captiveportal.inc b/src/usr/local/www/widgets/include/captiveportal.inc index 9d8ccaa..bcc61d8 100644 --- a/src/usr/local/www/widgets/include/captiveportal.inc +++ b/src/usr/local/www/widgets/include/captiveportal.inc @@ -3,7 +3,7 @@ * captiveportal.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/include/carp_status.inc b/src/usr/local/www/widgets/include/carp_status.inc index d49e09e..675e53b 100644 --- a/src/usr/local/www/widgets/include/carp_status.inc +++ b/src/usr/local/www/widgets/include/carp_status.inc @@ -3,7 +3,7 @@ * carp_status.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/include/dyn_dns_status.inc b/src/usr/local/www/widgets/include/dyn_dns_status.inc index 140326f..628fbc6 100644 --- a/src/usr/local/www/widgets/include/dyn_dns_status.inc +++ b/src/usr/local/www/widgets/include/dyn_dns_status.inc @@ -3,7 +3,7 @@ * dyn_dns_status.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/include/gateways.inc b/src/usr/local/www/widgets/include/gateways.inc index b0f93f5..b2a1577 100644 --- a/src/usr/local/www/widgets/include/gateways.inc +++ b/src/usr/local/www/widgets/include/gateways.inc @@ -3,7 +3,7 @@ * gateways.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/include/gmirror_status.inc b/src/usr/local/www/widgets/include/gmirror_status.inc index 62e9867..7a9b5c7 100644 --- a/src/usr/local/www/widgets/include/gmirror_status.inc +++ b/src/usr/local/www/widgets/include/gmirror_status.inc @@ -3,7 +3,7 @@ * gmirror_status.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/include/installed_packages.inc b/src/usr/local/www/widgets/include/installed_packages.inc index f09fb1c..ca9d757 100644 --- a/src/usr/local/www/widgets/include/installed_packages.inc +++ b/src/usr/local/www/widgets/include/installed_packages.inc @@ -3,7 +3,7 @@ * installed_packages.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/include/interface_statistics.inc b/src/usr/local/www/widgets/include/interface_statistics.inc index d1812b4..25edeb3 100644 --- a/src/usr/local/www/widgets/include/interface_statistics.inc +++ b/src/usr/local/www/widgets/include/interface_statistics.inc @@ -3,7 +3,7 @@ * interface_statistics.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/include/interfaces.inc b/src/usr/local/www/widgets/include/interfaces.inc index 60b5890..e17add4 100644 --- a/src/usr/local/www/widgets/include/interfaces.inc +++ b/src/usr/local/www/widgets/include/interfaces.inc @@ -3,7 +3,7 @@ * interfaces.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/include/ipsec.inc b/src/usr/local/www/widgets/include/ipsec.inc index fe0fff2..d2d4e2d 100644 --- a/src/usr/local/www/widgets/include/ipsec.inc +++ b/src/usr/local/www/widgets/include/ipsec.inc @@ -3,7 +3,7 @@ * ipsec.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/include/load_balancer.inc b/src/usr/local/www/widgets/include/load_balancer.inc index e7fdbd6..017a40e 100644 --- a/src/usr/local/www/widgets/include/load_balancer.inc +++ b/src/usr/local/www/widgets/include/load_balancer.inc @@ -3,7 +3,7 @@ * load_balancer.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/include/log.inc b/src/usr/local/www/widgets/include/log.inc index 2863b00..c55fb44 100644 --- a/src/usr/local/www/widgets/include/log.inc +++ b/src/usr/local/www/widgets/include/log.inc @@ -3,7 +3,7 @@ * log.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/include/ntp_status.inc b/src/usr/local/www/widgets/include/ntp_status.inc index 91246fe..df85090 100644 --- a/src/usr/local/www/widgets/include/ntp_status.inc +++ b/src/usr/local/www/widgets/include/ntp_status.inc @@ -3,7 +3,7 @@ * ntp_status.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/include/openvpn.inc b/src/usr/local/www/widgets/include/openvpn.inc index 1d9a862..65ce59b 100644 --- a/src/usr/local/www/widgets/include/openvpn.inc +++ b/src/usr/local/www/widgets/include/openvpn.inc @@ -3,7 +3,7 @@ * openvpn.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/include/services_status.inc b/src/usr/local/www/widgets/include/services_status.inc index 22296c9..7d13c53 100644 --- a/src/usr/local/www/widgets/include/services_status.inc +++ b/src/usr/local/www/widgets/include/services_status.inc @@ -3,7 +3,7 @@ * services_status.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/include/smart_status.inc b/src/usr/local/www/widgets/include/smart_status.inc index 367fffd..6b236b2 100644 --- a/src/usr/local/www/widgets/include/smart_status.inc +++ b/src/usr/local/www/widgets/include/smart_status.inc @@ -3,7 +3,7 @@ * smart_status.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/include/thermal_sensors.inc b/src/usr/local/www/widgets/include/thermal_sensors.inc index 74d6f1f..192214a 100644 --- a/src/usr/local/www/widgets/include/thermal_sensors.inc +++ b/src/usr/local/www/widgets/include/thermal_sensors.inc @@ -3,7 +3,7 @@ * thermal_sensors.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/include/traffic_graph.inc b/src/usr/local/www/widgets/include/traffic_graph.inc index 0371c8c..4870060 100644 --- a/src/usr/local/www/widgets/include/traffic_graph.inc +++ b/src/usr/local/www/widgets/include/traffic_graph.inc @@ -3,7 +3,7 @@ * traffic_graph.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/include/wake_on_lan.inc b/src/usr/local/www/widgets/include/wake_on_lan.inc index 2f3389e..1120b4b 100644 --- a/src/usr/local/www/widgets/include/wake_on_lan.inc +++ b/src/usr/local/www/widgets/include/wake_on_lan.inc @@ -3,7 +3,7 @@ * wake_on_lan.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/javascript/ipsec.js b/src/usr/local/www/widgets/javascript/ipsec.js index c61d8d5..bb3837c 100644 --- a/src/usr/local/www/widgets/javascript/ipsec.js +++ b/src/usr/local/www/widgets/javascript/ipsec.js @@ -2,7 +2,7 @@ * ipsec.js * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/javascript/thermal_sensors.js b/src/usr/local/www/widgets/javascript/thermal_sensors.js index bbb7e9a..2ee8c3e 100644 --- a/src/usr/local/www/widgets/javascript/thermal_sensors.js +++ b/src/usr/local/www/widgets/javascript/thermal_sensors.js @@ -2,7 +2,7 @@ * thermal_sensors.js * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/javascript/traffic_graph.js b/src/usr/local/www/widgets/javascript/traffic_graph.js index a393e6e..d0f7ee0 100644 --- a/src/usr/local/www/widgets/javascript/traffic_graph.js +++ b/src/usr/local/www/widgets/javascript/traffic_graph.js @@ -2,7 +2,7 @@ * traffic_graph.js * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/widgets/captive_portal_status.widget.php b/src/usr/local/www/widgets/widgets/captive_portal_status.widget.php index 75b27b1..df98188 100644 --- a/src/usr/local/www/widgets/widgets/captive_portal_status.widget.php +++ b/src/usr/local/www/widgets/widgets/captive_portal_status.widget.php @@ -4,7 +4,7 @@ * * part of pfSense (https://www.pfsense.org) * Copyright (c) 2007 Sam Wenham - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/widgets/widgets/carp_status.widget.php b/src/usr/local/www/widgets/widgets/carp_status.widget.php index fd97b94..ecf2e08 100644 --- a/src/usr/local/www/widgets/widgets/carp_status.widget.php +++ b/src/usr/local/www/widgets/widgets/carp_status.widget.php @@ -4,7 +4,7 @@ * * part of pfSense (https://www.pfsense.org) * Copyright (c) 2007 Sam Wenham - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php b/src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php index 2c1a7b7..526fd0f 100644 --- a/src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php +++ b/src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php @@ -4,7 +4,7 @@ * * part of pfSense (https://www.pfsense.org) * Copyright (c) 2013 Stanley P. Miller \ stan-qaz - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/widgets/gateways.widget.php b/src/usr/local/www/widgets/widgets/gateways.widget.php index 4bb5b67..28aed43 100644 --- a/src/usr/local/www/widgets/widgets/gateways.widget.php +++ b/src/usr/local/www/widgets/widgets/gateways.widget.php @@ -4,7 +4,7 @@ * * part of pfSense (https://www.pfsense.org) * Copyright (c) 2008 Seth Mos - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/widgets/widgets/gmirror_status.widget.php b/src/usr/local/www/widgets/widgets/gmirror_status.widget.php index 6c3380b..046e9f3 100644 --- a/src/usr/local/www/widgets/widgets/gmirror_status.widget.php +++ b/src/usr/local/www/widgets/widgets/gmirror_status.widget.php @@ -3,7 +3,7 @@ * gmirror_status.widget.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally part of m0n0wall (http://m0n0.ch/wall) 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 90dd1be..1840d6f 100644 --- a/src/usr/local/www/widgets/widgets/installed_packages.widget.php +++ b/src/usr/local/www/widgets/widgets/installed_packages.widget.php @@ -6,7 +6,7 @@ * Copyright (c) Scott Dale * Copyright (c) 2004-2005 T. Lechat <dev@lechat.org> * Copyright (c) Jonathan Watt <jwatt@jwatt.org> - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/src/usr/local/www/widgets/widgets/interface_statistics.widget.php b/src/usr/local/www/widgets/widgets/interface_statistics.widget.php index bfaa82e..0dac8cd 100644 --- a/src/usr/local/www/widgets/widgets/interface_statistics.widget.php +++ b/src/usr/local/www/widgets/widgets/interface_statistics.widget.php @@ -3,7 +3,7 @@ * interface_statistics.widget.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2007 Scott Dale * Copyright (c) 2004-2005 T. Lechat <dev@lechat.org> * Copyright (c) 2004-2005 Jonathan Watt <jwatt@jwatt.org> diff --git a/src/usr/local/www/widgets/widgets/interfaces.widget.php b/src/usr/local/www/widgets/widgets/interfaces.widget.php index efc2527..0220794 100644 --- a/src/usr/local/www/widgets/widgets/interfaces.widget.php +++ b/src/usr/local/www/widgets/widgets/interfaces.widget.php @@ -3,7 +3,7 @@ * interfaces.widget.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2007 Scott Dale * All rights reserved. * diff --git a/src/usr/local/www/widgets/widgets/ipsec.widget.php b/src/usr/local/www/widgets/widgets/ipsec.widget.php index ce76f9e..81ec8be 100644 --- a/src/usr/local/www/widgets/widgets/ipsec.widget.php +++ b/src/usr/local/www/widgets/widgets/ipsec.widget.php @@ -3,7 +3,7 @@ * gmirror_status.widget.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2004-2005 T. Lechat <dev@lechat.org> (BSD 2 clause) * Copyright (c) 2007 Jonathan Watt <jwatt@jwatt.org> (BSD 2 clause) * Copyright (c) 2007 Scott Dale (BSD 2 clause) diff --git a/src/usr/local/www/widgets/widgets/load_balancer_status.widget.php b/src/usr/local/www/widgets/widgets/load_balancer_status.widget.php index e6fd8e0..2456d6a 100644 --- a/src/usr/local/www/widgets/widgets/load_balancer_status.widget.php +++ b/src/usr/local/www/widgets/widgets/load_balancer_status.widget.php @@ -3,7 +3,7 @@ * load_balancer_status.widget.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2010 Seth Mos <seth.mos@dds.nl>. * Copyright (c) 2005-2008 Bill Marquette * All rights reserved. diff --git a/src/usr/local/www/widgets/widgets/log.widget.php b/src/usr/local/www/widgets/widgets/log.widget.php index fab878f..c1cc81e 100644 --- a/src/usr/local/www/widgets/widgets/log.widget.php +++ b/src/usr/local/www/widgets/widgets/log.widget.php @@ -3,7 +3,7 @@ * log.widget.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2007 Scott Dale * All rights reserved. * diff --git a/src/usr/local/www/widgets/widgets/ntp_status.widget.php b/src/usr/local/www/widgets/widgets/ntp_status.widget.php index 29ce025..c23a02f 100644 --- a/src/usr/local/www/widgets/widgets/ntp_status.widget.php +++ b/src/usr/local/www/widgets/widgets/ntp_status.widget.php @@ -3,7 +3,7 @@ * ntp_status.widget.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/widgets/openvpn.widget.php b/src/usr/local/www/widgets/widgets/openvpn.widget.php index 0d555c0..6fdc069 100644 --- a/src/usr/local/www/widgets/widgets/openvpn.widget.php +++ b/src/usr/local/www/widgets/widgets/openvpn.widget.php @@ -3,7 +3,7 @@ * openvpn.widget.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/widgets/picture.widget.php b/src/usr/local/www/widgets/widgets/picture.widget.php index 6ceff9b..ae02f0f 100644 --- a/src/usr/local/www/widgets/widgets/picture.widget.php +++ b/src/usr/local/www/widgets/widgets/picture.widget.php @@ -3,7 +3,7 @@ * picture.widget.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/widgets/rss.widget.php b/src/usr/local/www/widgets/widgets/rss.widget.php index 3f67fa2..f5100c8 100644 --- a/src/usr/local/www/widgets/widgets/rss.widget.php +++ b/src/usr/local/www/widgets/widgets/rss.widget.php @@ -3,7 +3,7 @@ * rss.widget.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/widgets/services_status.widget.php b/src/usr/local/www/widgets/widgets/services_status.widget.php index 53cb8f9..1ef5b5b 100644 --- a/src/usr/local/www/widgets/widgets/services_status.widget.php +++ b/src/usr/local/www/widgets/widgets/services_status.widget.php @@ -3,7 +3,7 @@ * services_status.widget.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2007 Sam Wenham * All rights reserved. * diff --git a/src/usr/local/www/widgets/widgets/smart_status.widget.php b/src/usr/local/www/widgets/widgets/smart_status.widget.php index 9f4fc02..d0e2550 100644 --- a/src/usr/local/www/widgets/widgets/smart_status.widget.php +++ b/src/usr/local/www/widgets/widgets/smart_status.widget.php @@ -3,7 +3,7 @@ * smart_status.widget.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2012 mkirbst @ pfSense Forum * All rights reserved. * 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 da23d39..6520d09 100644 --- a/src/usr/local/www/widgets/widgets/system_information.widget.php +++ b/src/usr/local/www/widgets/widgets/system_information.widget.php @@ -3,7 +3,7 @@ * system_information.widget.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2007 Scott Dale * All rights reserved. * 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 0930b06..e776e4e 100644 --- a/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php +++ b/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php @@ -3,7 +3,7 @@ * thermal_sensors.widget.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php b/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php index 6eab990..2d1af03 100644 --- a/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php +++ b/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php @@ -3,7 +3,7 @@ * traffic_graphs.widget.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2007 Scott Dale * Copyright (c) 2004-2005 T. Lechat <dev@lechat.org> * Copyright (c) 2004-2005 Jonathan Watt <jwatt@jwatt.org>. diff --git a/src/usr/local/www/widgets/widgets/wake_on_lan.widget.php b/src/usr/local/www/widgets/widgets/wake_on_lan.widget.php index 6a95d44..0930a6a 100644 --- a/src/usr/local/www/widgets/widgets/wake_on_lan.widget.php +++ b/src/usr/local/www/widgets/widgets/wake_on_lan.widget.php @@ -3,7 +3,7 @@ * wake_on_lan.widget.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2010 Yehuda Katz * All rights reserved. * diff --git a/src/usr/local/www/wizard.php b/src/usr/local/www/wizard.php index 4f4a969..574c1e1 100644 --- a/src/usr/local/www/wizard.php +++ b/src/usr/local/www/wizard.php @@ -3,7 +3,7 @@ * wizard.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/wizards/openvpn_wizard.inc b/src/usr/local/www/wizards/openvpn_wizard.inc index d9d9235..7e9ab27 100644 --- a/src/usr/local/www/wizards/openvpn_wizard.inc +++ b/src/usr/local/www/wizards/openvpn_wizard.inc @@ -3,7 +3,7 @@ * openvpn_wizard.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/wizards/openvpn_wizard.xml b/src/usr/local/www/wizards/openvpn_wizard.xml index d7cea3c..9e9f021 100644 --- a/src/usr/local/www/wizards/openvpn_wizard.xml +++ b/src/usr/local/www/wizards/openvpn_wizard.xml @@ -5,7 +5,7 @@ * openvpn_wizard.xml * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/wizards/setup_wizard.xml b/src/usr/local/www/wizards/setup_wizard.xml index 9380d07..ecacf64 100644 --- a/src/usr/local/www/wizards/setup_wizard.xml +++ b/src/usr/local/www/wizards/setup_wizard.xml @@ -5,7 +5,7 @@ * setup_wizard.xml * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc index 40ec18a..b9d398c 100644 --- a/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc +++ b/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc @@ -3,7 +3,7 @@ * traffic_shaper_wizard_dedicated.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml b/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml index b218643..ce74605 100644 --- a/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml +++ b/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml @@ -5,7 +5,7 @@ * traffic_shaper_wizard_dedicated.xml * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc b/src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc index 99a014b..1b8be4e 100644 --- a/src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc +++ b/src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc @@ -3,7 +3,7 @@ * traffic_shaper_wizard_multi_all.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.xml b/src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.xml index 08869db..e0a5850 100644 --- a/src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.xml +++ b/src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.xml @@ -5,7 +5,7 @@ * traffic_shaper_wizard_multi_all.xml * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/usr/local/www/xmlrpc.php b/src/usr/local/www/xmlrpc.php index 2d4722f..0237130 100644 --- a/src/usr/local/www/xmlrpc.php +++ b/src/usr/local/www/xmlrpc.php @@ -3,7 +3,7 @@ * xmlrpc.php * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * Copyright (c) 2005 Colin Smith * All rights reserved. * |
