diff options
| author | Sjon Hortensius <sjon@hortensius.net> | 2015-01-11 15:24:58 +0100 |
|---|---|---|
| committer | Sjon Hortensius <sjon@hortensius.net> | 2015-01-11 15:24:58 +0100 |
| commit | 8a07e316827f816e9154ede8808b9f71fa66a212 (patch) | |
| tree | a4f8d3163fa62f7267be20f7669c4e27998e82f9 /usr | |
| parent | 41ea4cf39ff9d93f80489d588bef3c34f9539b32 (diff) | |
| parent | 6bdb02d36c8a8ada1b770414f0a98c4e0db51c3f (diff) | |
| download | pfsense-8a07e316827f816e9154ede8808b9f71fa66a212.zip pfsense-8a07e316827f816e9154ede8808b9f71fa66a212.tar.gz | |
Merge branch 'master' into bootstrap
Conflicts occured in copyright message (year-update) due to whitespace difference and themes/ which was removed
Diffstat (limited to 'usr')
277 files changed, 912 insertions, 873 deletions
diff --git a/usr/local/bin/3gstats.php b/usr/local/bin/3gstats.php index 02f1b17..a8a8fec 100755 --- a/usr/local/bin/3gstats.php +++ b/usr/local/bin/3gstats.php @@ -40,7 +40,7 @@ while(true) { $string = fgets($handle, 256); $elements = array(); - $elements = split(":", $string); + $elements = explode(':', $string); $elements[0] = trim($elements[0]); $elements[1] = trim($elements[1]); @@ -59,7 +59,7 @@ while(true) { break; case "^DSFLOWRPT": $items = array(); - $items = split(",", $elements[1]); + $items = explode(',', $elements[1]); $record['time'] = hexdec($items[0]); $record['upstream'] = round((floatval(hexdec($items[1])) * 8) /1024); $record['downstream'] = round((floatval(hexdec($items[2])) * 8) /1024); diff --git a/usr/local/bin/captiveportal_gather_stats.php b/usr/local/bin/captiveportal_gather_stats.php index 0ee49f6..c076636 100644 --- a/usr/local/bin/captiveportal_gather_stats.php +++ b/usr/local/bin/captiveportal_gather_stats.php @@ -4,7 +4,7 @@ /* captiveportal_gather_stats.php Copyright (C) 2011 Warren Baker - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/bin/filterparser.php b/usr/local/bin/filterparser.php index fb6bf39..da1f98e 100755 --- a/usr/local/bin/filterparser.php +++ b/usr/local/bin/filterparser.php @@ -7,7 +7,7 @@ originally based on m0n0wall (http://m0n0.ch/wall) Copyright (C) 2009 Jim Pingle <myfirstname>@<mylastname>.org - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/captiveportal/index.php b/usr/local/captiveportal/index.php index 7f561ba..19b35d7 100644 --- a/usr/local/captiveportal/index.php +++ b/usr/local/captiveportal/index.php @@ -3,8 +3,8 @@ $Id$ part of m0n0wall (http://m0n0.ch/wall) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP - Copyrigth (C) 2009 Ermal Luçi + Copyright (C) 2013-2015 Electric Sheep Fencing, LP + Copyright (C) 2009 Ermal Luçi Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>. All rights reserved. diff --git a/usr/local/sbin/WipePackages.php b/usr/local/sbin/WipePackages.php index aba29a1..d802521 100755 --- a/usr/local/sbin/WipePackages.php +++ b/usr/local/sbin/WipePackages.php @@ -5,7 +5,7 @@ WipePackages.php part of the pfSense project Copyright (C) 2008 Scott Ullrich <sullrich@gmail.com> - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/sbin/gmirror_status_check.php b/usr/local/sbin/gmirror_status_check.php index 09bfb5a..d5a55c1 100644 --- a/usr/local/sbin/gmirror_status_check.php +++ b/usr/local/sbin/gmirror_status_check.php @@ -3,7 +3,7 @@ /* gmirror_status_check.php Copyright (C) 2014 Jim Pingle - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/usr/local/sbin/ovpn_auth_verify b/usr/local/sbin/ovpn_auth_verify index c1e147f..5f19b9e 100755 --- a/usr/local/sbin/ovpn_auth_verify +++ b/usr/local/sbin/ovpn_auth_verify @@ -1,10 +1,12 @@ #!/bin/sh +password="asdfsad +%$" if [ "$1" = "tls" ]; then RESULT=$(/usr/local/sbin/fcgicli -f /etc/inc/openvpn.tls-verify.php -d "servercn=$2&depth=$3&certdepth=$4&certsubject=$5") else # Single quoting $password breaks getting the value from the variable. - password=$(echo ${password} | /usr/bin/sed -e 's/&/%26/g' -e 's/ /%20/g') + password=$(echo ${password} | openssl enc -base64 | sed -e 's/=/%3D/g') + echo "(/usr/local/sbin/fcgicli -f /etc/inc/openvpn.auth-user.php -d username=$username&password=$password&cn=$common_name&strictcn=$3&authcfg=$2&modeid=$4')" RESULT=$(/usr/local/sbin/fcgicli -f /etc/inc/openvpn.auth-user.php -d "username=$username&password=$password&cn=$common_name&strictcn=$3&authcfg=$2&modeid=$4") fi diff --git a/usr/local/sbin/prefixes.php b/usr/local/sbin/prefixes.php index 7c924c8..85cb496 100644 --- a/usr/local/sbin/prefixes.php +++ b/usr/local/sbin/prefixes.php @@ -5,10 +5,12 @@ if(!file_exists($leases_file)) { exit(1); } +$fd = fopen($leases_file, 'r'); + $duid_arr = array(); -foreach(file($leases_file) as $line) { +while (( $line = fgets($fd, 4096)) !== false) { // echo "$line"; - if(preg_match("/^(ia-[np][ad])[ ]+\"(.*?)\"/i ", $line, $duidmatch)) { + if(preg_match("/^(ia-[np][ad])[ ]+\"(.*?)\"/i", $line, $duidmatch)) { $type = $duidmatch[1]; $duid = $duidmatch[2]; continue; @@ -31,7 +33,7 @@ foreach(file($leases_file) as $line) { } /* closing bracket */ - if(preg_match("/^}/i ", $line)) { + if(preg_match("/^}/i", $line)) { switch($type) { case "ia-na": $duid_arr[$duid][$type] = $ia_na; @@ -48,13 +50,13 @@ foreach(file($leases_file) as $line) { continue; } } +fclose($fd); $routes = array(); foreach ($duid_arr as $entry) { - if($entry['ia-pd'] <> "") { + if(!empty($entry['ia-pd'])) { $routes[$entry['ia-na']] = $entry['ia-pd']; } - array_shift($duid_arr); } // echo "add routes\n"; @@ -66,28 +68,24 @@ if(count($routes) > 0) { /* get clog from dhcpd */ $dhcpdlogfile = "/var/log/dhcpd.log"; -$clog = array(); -if(file_exists($dhcpdlogfile)) - exec("clog $dhcpdlogfile", $clog, $ret); - -if($ret > 0) - $clog = array(); - $expires = array(); -foreach($clog as $line) { - if(preg_match("/releases[ ]+prefix[ ]+([0-9a-f:]+\/[0-9]+)/i", $line, $expire)) { - if(in_array($expire[1], $routes)) - continue; - $expires[$expire[1]] = $expire[1]; +if(file_exists($dhcpdlogfile)) { + $fd = popen("clog $dhcpdlogfile", 'r'); + while (($line = fgets($fd)) !== false) { + //echo $line; + if(preg_match("/releases[ ]+prefix[ ]+([0-9a-f:]+\/[0-9]+)/i", $line, $expire)) { + if(in_array($expire[1], $routes)) + continue; + $expires[$expire[1]] = $expire[1]; + } } - array_shift($clog); + pclose($fd); } // echo "remove routes\n"; if(count($expires) > 0) { foreach ($expires as $prefix) { echo "/sbin/route delete -inet6 {$prefix['prefix']}\n"; - array_shift($expires); } } diff --git a/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot b/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot index 9556dd2..c9ba3be 100644 --- a/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot +++ b/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot @@ -13428,7 +13428,7 @@ msgstr "" #: usr/local/www/interfaces.php:618 #, php-format -msgid "This track6 prefix id is already being used in %s." +msgid "This track6 prefix ID is already being used in %s." msgstr "" #: usr/local/www/interfaces.php:631 @@ -14204,7 +14204,7 @@ msgstr "" #: usr/local/www/interfaces.php:2569 msgid "" -"The value in this field is the (Delegated) IPv6 prefix id. This determines " +"The value in this field is the (Delegated) IPv6 prefix ID. This determines " "the configurable network ID based on the dynamic IPv6 connection" msgstr "" diff --git a/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po b/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po index 29f89bc..cbcc770 100644 --- a/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po +++ b/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po @@ -1,5 +1,5 @@ # Language translation for pfSense project. -# Copyright (C) 2011-2014 Electric Sheep Fencing LLC +# Copyright (C) 2011-2015 Electric Sheep Fencing LLC # This file is distributed under the same license as the pfSense package. # Kiyo Takami and Isaac (.ike) Levy, 2013. # @@ -45348,7 +45348,7 @@ msgstr "IPv6のプレフィックス番号" #: usr/local/www/interfaces.php:1862 usr/local/www/interfaces.php:1908 #: usr/local/www/interfaces.php:1898 usr/local/www/interfaces.php:1898 msgid "" -"The value in this field is the (Delegated) IPv6 prefix id. This determines " +"The value in this field is the (Delegated) IPv6 prefix ID. This determines " "the configurable network ID based on the dynamic IPv6 connection" msgstr ""このフィールドの値は、 （委任） IPv6プレフィックスIDです。これが決定「動的なIPv6接続に基づいて構成可能なネットワークIDを" diff --git a/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po b/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po index 9207e62..2ffb829 100644 --- a/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po +++ b/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po @@ -1,5 +1,5 @@ # Language translation for pfSense project. -# Copyright (C) 2011-2014 Electric Sheep Fencing LLC +# Copyright (C) 2011-2015 Electric Sheep Fencing LLC # This file is distributed under the same license as the pfSense package. # Vinicius Coque <vcoque@gmail.com>, 2011. # Luiz Gustavo <luizgustavo@luizgustavo.pro>, 2014 Powered by: TrustUX Network (www.trustux.com) @@ -38283,7 +38283,7 @@ msgstr "Prefixo ID IPv6" #: usr/local/www/interfaces.php:1853 usr/local/www/interfaces.php:1841 #: usr/local/www/interfaces.php:1862 usr/local/www/interfaces.php:1908 #: usr/local/www/interfaces.php:1898 usr/local/www/interfaces.php:1934 -msgid "The value in this field is the (Delegated) IPv6 prefix id. This determines the configurable network ID based on the dynamic IPv6 connection" +msgid "The value in this field is the (Delegated) IPv6 prefix ID. This determines the configurable network ID based on the dynamic IPv6 connection" msgstr "" #: usr/local/www/interfaces.php:1855 usr/local/www/interfaces.php:1843 diff --git a/usr/local/share/locale/tr/LC_MESSAGES/pfSense.mo b/usr/local/share/locale/tr/LC_MESSAGES/pfSense.mo Binary files differindex d0daf52..544d667 100644 --- a/usr/local/share/locale/tr/LC_MESSAGES/pfSense.mo +++ b/usr/local/share/locale/tr/LC_MESSAGES/pfSense.mo diff --git a/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po b/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po index 7ba4452..0edc757 100644 --- a/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po +++ b/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po @@ -13973,7 +13973,7 @@ msgstr "IPv6 ön-eki kimliği için geçerli bir ondalık numara girmelisiniz." #: usr/local/www/interfaces.php:618 #, php-format -msgid "This track6 prefix id is already being used in %s." +msgid "This track6 prefix ID is already being used in %s." msgstr "" #: usr/local/www/interfaces.php:631 @@ -14779,7 +14779,7 @@ msgstr "IPv6 Ön-ek kimliği" #: usr/local/www/interfaces.php:2569 msgid "" -"The value in this field is the (Delegated) IPv6 prefix id. This determines " +"The value in this field is the (Delegated) IPv6 prefix ID. This determines " "the configurable network ID based on the dynamic IPv6 connection" msgstr "" "Bu alandaki değer (yetkilendirimiş) IPv6 ön-ek kimliğidir. Bu dinamik IPv6 " diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php index 6f59623..e1319c7 100644 --- a/usr/local/www/carp_status.php +++ b/usr/local/www/carp_status.php @@ -2,7 +2,7 @@ /* carp_status.php Copyright (C) 2004 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/crash_reporter.php b/usr/local/www/crash_reporter.php index e0c2efd..139bc30 100644 --- a/usr/local/www/crash_reporter.php +++ b/usr/local/www/crash_reporter.php @@ -4,7 +4,7 @@ crash_reporter.php part of pfSense Copyright (C) 2011 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/diag_arp.php b/usr/local/www/diag_arp.php index 23d74b6..6066dee 100644 --- a/usr/local/www/diag_arp.php +++ b/usr/local/www/diag_arp.php @@ -3,7 +3,7 @@ diag_arp.php part of the pfSense project (https://www.pfsense.org) Copyright (C) 2004-2009 Scott Ullrich <sullrich@gmail.com> - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP originally part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2005 Paul Taylor (paultaylor@winndixie.com) and Manuel Kasper <mk@neon1.net>. diff --git a/usr/local/www/diag_authentication.php b/usr/local/www/diag_authentication.php index a5d30d1..90a20f9 100644 --- a/usr/local/www/diag_authentication.php +++ b/usr/local/www/diag_authentication.php @@ -3,7 +3,7 @@ diag_authentication.php part of the pfSense project (https://www.pfsense.org) Copyright (C) 2010 Ermal Luçi - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php index fae6ceb..d3ec821 100644 --- a/usr/local/www/diag_backup.php +++ b/usr/local/www/diag_backup.php @@ -3,7 +3,7 @@ /* diag_backup.php Copyright (C) 2004-2009 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) @@ -204,7 +204,7 @@ function spit_out_select_items($name, $showall) { "wol" => gettext("Wake on LAN") ); - $select = "<select name=\"{$name}\" id=\"{$name}\" multiple=\"multiple\">"; + $select = "<select name=\"{$name}\" id=\"{$name}\">"; $select .= "<option value=\"\">" . gettext("ALL") . "</option>"; if($showall == true) diff --git a/usr/local/www/diag_confbak.php b/usr/local/www/diag_confbak.php index baacb8b..e22abf6 100644 --- a/usr/local/www/diag_confbak.php +++ b/usr/local/www/diag_confbak.php @@ -4,7 +4,7 @@ diag_confbak.php Copyright (C) 2005 Colin Smith Copyright (C) 2010 Jim Pingle - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/diag_defaults.php b/usr/local/www/diag_defaults.php index d2f7b8e..8edf68c 100755 --- a/usr/local/www/diag_defaults.php +++ b/usr/local/www/diag_defaults.php @@ -3,7 +3,7 @@ /* diag_defaults.php Copyright (C) 2004-2009 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/diag_dns.php b/usr/local/www/diag_dns.php index a79c3e8..d03ec7a 100644 --- a/usr/local/www/diag_dns.php +++ b/usr/local/www/diag_dns.php @@ -3,7 +3,7 @@ diag_dns.php Copyright (C) 2009 Jim Pingle (jpingle@gmail.com) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/diag_dump_states.php b/usr/local/www/diag_dump_states.php index de11a90..f41a4fd 100755 --- a/usr/local/www/diag_dump_states.php +++ b/usr/local/www/diag_dump_states.php @@ -3,7 +3,7 @@ diag_dump_states.php Copyright (C) 2005 Colin Smith Copyright (C) 2005-2009 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/diag_dump_states_sources.php b/usr/local/www/diag_dump_states_sources.php index 4950f83..ca01d32 100644 --- a/usr/local/www/diag_dump_states_sources.php +++ b/usr/local/www/diag_dump_states_sources.php @@ -1,9 +1,9 @@ <?php /* - diag_dump_states.php + diag_dump_states_sources.php Copyright (C) 2005 Colin Smith Copyright (C) 2005-2009 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/diag_gmirror.php b/usr/local/www/diag_gmirror.php index f36d6f5..adb61f5 100644 --- a/usr/local/www/diag_gmirror.php +++ b/usr/local/www/diag_gmirror.php @@ -2,7 +2,7 @@ /* diag_gmirror.php Copyright (C) 2014 Jim Pingle - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/usr/local/www/diag_ipsec.php b/usr/local/www/diag_ipsec.php index b14838f..460a23d 100644 --- a/usr/local/www/diag_ipsec.php +++ b/usr/local/www/diag_ipsec.php @@ -4,7 +4,7 @@ diag_ipsec.php Copyright (C) 2004-2009 Scott Ullrich Copyright (C) 2008 Shrew Soft Inc <mgrooms@shrew.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Parts of this code was originally based on vpn_ipsec_sad.php @@ -57,7 +57,7 @@ if ($_GET['act'] == 'connect') { if (ctype_digit($_GET['ikeid'])) { $ph1ent = ipsec_get_phase1($_GET['ikeid']); if (!empty($ph1ent)) { - if ($ph1ent['iketype'] == 'ikev1') { + if (empty($ph1ent['iketype']) || $ph1ent['iketype'] == 'ikev1') { $ph2entries = ipsec_get_number_of_phase2($_GET['ikeid']); for ($i = 0; $i < $ph2entries; $i++) { $connid = escapeshellarg("con{$_GET['ikeid']}00{$i}"); diff --git a/usr/local/www/diag_ipsec_leases.php b/usr/local/www/diag_ipsec_leases.php index 5d4ba63..173d516 100644 --- a/usr/local/www/diag_ipsec_leases.php +++ b/usr/local/www/diag_ipsec_leases.php @@ -3,7 +3,7 @@ /* diag_ipsec_leases.php Copyright (C) 2014 Ermal LUÇi - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/diag_ipsec_sad.php b/usr/local/www/diag_ipsec_sad.php index 2628f64..15bd995 100644 --- a/usr/local/www/diag_ipsec_sad.php +++ b/usr/local/www/diag_ipsec_sad.php @@ -3,7 +3,7 @@ /* diag_ipsec_sad.php Copyright (C) 2004-2009 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/diag_ipsec_spd.php b/usr/local/www/diag_ipsec_spd.php index 7b0b8fd..ba5231c 100644 --- a/usr/local/www/diag_ipsec_spd.php +++ b/usr/local/www/diag_ipsec_spd.php @@ -3,7 +3,7 @@ /* diag_ipsec_spd.php Copyright (C) 2004-2009 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/diag_ipsec_xml.php b/usr/local/www/diag_ipsec_xml.php index 0e899d8..2c76225 100644 --- a/usr/local/www/diag_ipsec_xml.php +++ b/usr/local/www/diag_ipsec_xml.php @@ -4,7 +4,7 @@ diag_ipsec_xml.php Copyright (C) 2007 pfSense Project Copyright (C) 2010 Seth Mos - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Parts of this code was originally based on vpn_ipsec_sad.php diff --git a/usr/local/www/diag_limiter_info.php b/usr/local/www/diag_limiter_info.php index a3e0eea..c3f8045 100644 --- a/usr/local/www/diag_limiter_info.php +++ b/usr/local/www/diag_limiter_info.php @@ -3,7 +3,7 @@ /* diag_limiter_info.php Copyright (C) 2010 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php index 2db05df..cb76724 100755 --- a/usr/local/www/diag_logs.php +++ b/usr/local/www/diag_logs.php @@ -3,7 +3,7 @@ /* diag_logs.php Copyright (C) 2004-2009 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php index a2b2bff..ce296bc 100644 --- a/usr/local/www/diag_logs_auth.php +++ b/usr/local/www/diag_logs_auth.php @@ -7,7 +7,7 @@ All rights reserved. part of pfSense - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php index 70dbafa..5cfa4d6 100644 --- a/usr/local/www/diag_logs_dhcp.php +++ b/usr/local/www/diag_logs_dhcp.php @@ -3,7 +3,7 @@ /* diag_logs_dhcp.php Copyright (C) 2004-2009 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index f903983..a0640c3 100644 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -4,7 +4,7 @@ diag_logs_filter.php part of pfSense Copyright (C) 2004-2009 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP originally based on m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2009 Manuel Kasper <mk@neon1.net>, diff --git a/usr/local/www/diag_logs_filter_dynamic.php b/usr/local/www/diag_logs_filter_dynamic.php index 2413bf2..c9fe2e3 100755 --- a/usr/local/www/diag_logs_filter_dynamic.php +++ b/usr/local/www/diag_logs_filter_dynamic.php @@ -4,7 +4,7 @@ diag_logs_filter_dynamic.php part of pfSesne Copyright (C) 2004-2009 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP originally based on m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. diff --git a/usr/local/www/diag_logs_filter_summary.php b/usr/local/www/diag_logs_filter_summary.php index fa7ddab..c239eec 100644 --- a/usr/local/www/diag_logs_filter_summary.php +++ b/usr/local/www/diag_logs_filter_summary.php @@ -2,7 +2,7 @@ /* diag_logs_filter_summary.php Copyright (C) 2009 Jim Pingle (jpingle@gmail.com) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/diag_logs_gateways.php b/usr/local/www/diag_logs_gateways.php index d1a9530..bd3f0a7 100755 --- a/usr/local/www/diag_logs_gateways.php +++ b/usr/local/www/diag_logs_gateways.php @@ -4,7 +4,7 @@ diag_logs_gateways.php Copyright (C) 2004-2009 Scott Ullrich Copyright (C) 2012 Seth Mos - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php index 47971cf..7966918 100644 --- a/usr/local/www/diag_logs_ipsec.php +++ b/usr/local/www/diag_logs_ipsec.php @@ -1,9 +1,9 @@ <?php /* $Id$ */ /* - diag_logs.php + diag_logs_ipsec.php Copyright (C) 2004-2009 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/diag_logs_ntpd.php b/usr/local/www/diag_logs_ntpd.php index e522ccb..0754dcb 100644 --- a/usr/local/www/diag_logs_ntpd.php +++ b/usr/local/www/diag_logs_ntpd.php @@ -5,7 +5,7 @@ part of pfSense Copyright (C) 2005 Bill Marquette <bill.marquette@gmail.com>. Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/diag_logs_openvpn.php b/usr/local/www/diag_logs_openvpn.php index 34ba70b..feda5ca 100644 --- a/usr/local/www/diag_logs_openvpn.php +++ b/usr/local/www/diag_logs_openvpn.php @@ -1,9 +1,9 @@ <?php /* $Id$ */ /* - diag_logs.php + diag_logs_openvpn.php Copyright (C) 2004-2009 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/diag_logs_ppp.php b/usr/local/www/diag_logs_ppp.php index 04a8ea4..8a53214 100644 --- a/usr/local/www/diag_logs_ppp.php +++ b/usr/local/www/diag_logs_ppp.php @@ -1,9 +1,9 @@ <?php /* $Id$ */ /* - diag_logs.php + diag_logs_ppp.php Copyright (C) 2004-2009 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/diag_logs_relayd.php b/usr/local/www/diag_logs_relayd.php index a87c583..e44b082 100644 --- a/usr/local/www/diag_logs_relayd.php +++ b/usr/local/www/diag_logs_relayd.php @@ -6,7 +6,7 @@ Copyright (C) 2008 Bill Marquette <bill.marquette@gmail.com>. Copyright (C) 2008 Seth Mos <seth.mos@dds.nl>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/diag_logs_resolver.php b/usr/local/www/diag_logs_resolver.php index c46c295..dd8f74a 100755 --- a/usr/local/www/diag_logs_resolver.php +++ b/usr/local/www/diag_logs_resolver.php @@ -4,7 +4,7 @@ diag_logs_resolver.php Copyright (C) 2004-2009 Scott Ullrich Copyright (C) 2012 Seth Mos - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/diag_logs_routing.php b/usr/local/www/diag_logs_routing.php index a17c447..bb14680 100644 --- a/usr/local/www/diag_logs_routing.php +++ b/usr/local/www/diag_logs_routing.php @@ -5,7 +5,7 @@ part of pfSense Copyright (C) 2012 Jim Pingle <jimp@pfsense.org>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index c0bac25..0984c5e 100644 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -3,7 +3,7 @@ /* diag_logs_settings.php Copyright (C) 2004-2009 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php index b8113af..6a7a7f8 100755 --- a/usr/local/www/diag_logs_vpn.php +++ b/usr/local/www/diag_logs_vpn.php @@ -5,7 +5,7 @@ part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/diag_logs_wireless.php b/usr/local/www/diag_logs_wireless.php index 18a5705..5dfbf72 100644 --- a/usr/local/www/diag_logs_wireless.php +++ b/usr/local/www/diag_logs_wireless.php @@ -7,7 +7,7 @@ Copyright (C) 2008 Bill Marquette <bill.marquette@gmail.com>. Copyright (C) 2008 Seth Mos <seth.mos@dds.nl>. Copyright (C) 2011 Jim Pingle <jimp@pfsense.org>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/diag_nanobsd.php b/usr/local/www/diag_nanobsd.php index a0f7881..206ed66 100644 --- a/usr/local/www/diag_nanobsd.php +++ b/usr/local/www/diag_nanobsd.php @@ -2,7 +2,7 @@ /* diag_nanobsd.php Copyright (C) 2009 Scott Ullrich <sullrich@gmail.com> - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/diag_packet_capture.php b/usr/local/www/diag_packet_capture.php index 372085b..73fb7c4 100644 --- a/usr/local/www/diag_packet_capture.php +++ b/usr/local/www/diag_packet_capture.php @@ -1,7 +1,7 @@ <?php /* - - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + diag_packet_capture.php + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/diag_pf_info.php b/usr/local/www/diag_pf_info.php index ef286d6..560ed7c 100644 --- a/usr/local/www/diag_pf_info.php +++ b/usr/local/www/diag_pf_info.php @@ -3,7 +3,7 @@ /* diag_pf_info.php Copyright (C) 2010 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/diag_ping.php b/usr/local/www/diag_ping.php index 687eeb7..2233f90 100644 --- a/usr/local/www/diag_ping.php +++ b/usr/local/www/diag_ping.php @@ -6,7 +6,7 @@ Copyright (C) 2003-2005 Bob Zoller (bob@kludgebox.com) and Manuel Kasper <mk@neon1.net>. All rights reserved. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/diag_pkglogs.php b/usr/local/www/diag_pkglogs.php index aab5c2a..cd1b833 100755 --- a/usr/local/www/diag_pkglogs.php +++ b/usr/local/www/diag_pkglogs.php @@ -6,7 +6,7 @@ Copyright (C) 2005 Colin Smith All rights reserved. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/diag_resetstate.php b/usr/local/www/diag_resetstate.php index 896bea6..88da499 100644 --- a/usr/local/www/diag_resetstate.php +++ b/usr/local/www/diag_resetstate.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_resetstate.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2004-2009 Scott Ullrich All rights reserved. diff --git a/usr/local/www/diag_routes.php b/usr/local/www/diag_routes.php index 9b88f0c..b126d71 100644 --- a/usr/local/www/diag_routes.php +++ b/usr/local/www/diag_routes.php @@ -3,7 +3,7 @@ /* $Id$ */ /* diag_routes.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2006 Fernando Lamos All rights reserved. diff --git a/usr/local/www/diag_smart.php b/usr/local/www/diag_smart.php index 6d5e6fb..dd9da79 100644 --- a/usr/local/www/diag_smart.php +++ b/usr/local/www/diag_smart.php @@ -1,8 +1,9 @@ <?php /* + diag_smart.php Part of pfSense - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved Some modifications: diff --git a/usr/local/www/diag_sockets.php b/usr/local/www/diag_sockets.php index d375e76..ca66649 100644 --- a/usr/local/www/diag_sockets.php +++ b/usr/local/www/diag_sockets.php @@ -3,7 +3,7 @@ /* $Id$ */ /* diag_sockets.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2012 All rights reserved. diff --git a/usr/local/www/diag_states_summary.php b/usr/local/www/diag_states_summary.php index c1118bd..e54061b 100644 --- a/usr/local/www/diag_states_summary.php +++ b/usr/local/www/diag_states_summary.php @@ -1,7 +1,7 @@ <?php /* diag_states_summary.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2010-2014 Jim Pingle Portions borrowed from diag_dump_states.php: diff --git a/usr/local/www/diag_system_activity.php b/usr/local/www/diag_system_activity.php index a7bd0b4..cc2c41e 100644 --- a/usr/local/www/diag_system_activity.php +++ b/usr/local/www/diag_system_activity.php @@ -1,8 +1,8 @@ <?php /* $Id$ */ /* - diag_cpu_activity.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + diag_system_activity.php + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2008-2009 Scott Ullrich All rights reserved. diff --git a/usr/local/www/diag_system_pftop.php b/usr/local/www/diag_system_pftop.php index 173027b..f5cc443 100644 --- a/usr/local/www/diag_system_pftop.php +++ b/usr/local/www/diag_system_pftop.php @@ -3,7 +3,7 @@ /* diag_system_pftop.php Copyright (C) 2008-2009 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/diag_tables.php b/usr/local/www/diag_tables.php index 753c965..09237e3 100644 --- a/usr/local/www/diag_tables.php +++ b/usr/local/www/diag_tables.php @@ -1,7 +1,7 @@ <?php /* diag_tables.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2010 Jim Pingle Portions borrowed from diag_dump_states.php: diff --git a/usr/local/www/diag_testport.php b/usr/local/www/diag_testport.php index 6bcde1e..7fda3a0 100644 --- a/usr/local/www/diag_testport.php +++ b/usr/local/www/diag_testport.php @@ -2,7 +2,7 @@ /* diag_testport.php Copyright (C) 2013 Jim P (jimp@pfsense.org) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Portions based on diag_ping.php @@ -50,10 +50,10 @@ $pgtitle = array(gettext("Diagnostics"), gettext("Test Port")); require("guiconfig.inc"); define('NC_TIMEOUT', 10); +$do_testport = false; if ($_POST || $_REQUEST['host']) { unset($input_errors); - unset($do_testport); /* input validation */ $reqdfields = explode(" ", "host port"); @@ -68,7 +68,7 @@ if ($_POST || $_REQUEST['host']) { $input_errors[] = gettext("Please enter a valid port number."); } - if (!is_numeric($_REQUEST['srcport']) || !is_port($_REQUEST['srcport'])) { + if (($_REQUEST['srcport'] != "") && (!is_numeric($_REQUEST['srcport']) || !is_port($_REQUEST['srcport']))) { $input_errors[] = gettext("Please enter a valid source port number, or leave the field blank."); } @@ -81,21 +81,16 @@ if ($_POST || $_REQUEST['host']) { if (!$input_errors) { $do_testport = true; - $host = $_REQUEST['host']; - $sourceip = $_REQUEST['sourceip']; - $port = $_REQUEST['port']; - $srcport = $_REQUEST['srcport']; - $showtext = isset($_REQUEST['showtext']); - $ipprotocol = $_REQUEST['ipprotocol']; $timeout = NC_TIMEOUT; } -} -if (!isset($do_testport)) { - $do_testport = false; - $host = ''; - $port = ''; - $srcport = ''; - unset($showtext); + + /* Save these request vars even if there were input errors. Then the fields are refilled for the user to correct. */ + $host = $_REQUEST['host']; + $sourceip = $_REQUEST['sourceip']; + $port = $_REQUEST['port']; + $srcport = $_REQUEST['srcport']; + $showtext = isset($_REQUEST['showtext']); + $ipprotocol = $_REQUEST['ipprotocol']; } include("head.inc"); ?> diff --git a/usr/local/www/diag_traceroute.php b/usr/local/www/diag_traceroute.php index c3ffb8e..da35654 100644 --- a/usr/local/www/diag_traceroute.php +++ b/usr/local/www/diag_traceroute.php @@ -3,7 +3,7 @@ diag_traceroute.php part of m0n0wall (http://m0n0.ch/wall) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2005 Paul Taylor (paultaylor@winndixie.com) and Manuel Kasper <mk@neon1.net>. All rights reserved. diff --git a/usr/local/www/easyrule.php b/usr/local/www/easyrule.php index 32be721..509fc67 100644 --- a/usr/local/www/easyrule.php +++ b/usr/local/www/easyrule.php @@ -2,7 +2,7 @@ /* easyrule.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2009-2010 Jim Pingle (jpingle@gmail.com) Originally Sponsored By Anathematic @ pfSense Forums All rights reserved. diff --git a/usr/local/www/edit.php b/usr/local/www/edit.php index 403cf8e..e3eedd5 100644 --- a/usr/local/www/edit.php +++ b/usr/local/www/edit.php @@ -2,7 +2,7 @@ /* edit.php Copyright (C) 2004, 2005 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/exec.php b/usr/local/www/exec.php index 9c142a0..61fbcc5 100644 --- a/usr/local/www/exec.php +++ b/usr/local/www/exec.php @@ -6,7 +6,7 @@ (modified for m0n0wall by Manuel Kasper <mk@neon1.net>) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/usr/local/www/filebrowser/browser.php b/usr/local/www/filebrowser/browser.php index 3d79018..dea747e 100644 --- a/usr/local/www/filebrowser/browser.php +++ b/usr/local/www/filebrowser/browser.php @@ -4,7 +4,7 @@ require_once("guiconfig.inc"); /* pfSense_MODULE: shell - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP */ // Fetch a list of directories and files inside a given directory diff --git a/usr/local/www/firewall_aliases.php b/usr/local/www/firewall_aliases.php index 3b307e7..f5d4d27 100644 --- a/usr/local/www/firewall_aliases.php +++ b/usr/local/www/firewall_aliases.php @@ -3,7 +3,7 @@ /* firewall_aliases.php Copyright (C) 2004 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php index 3e43d6d..c55658c 100755 --- a/usr/local/www/firewall_aliases_edit.php +++ b/usr/local/www/firewall_aliases_edit.php @@ -5,7 +5,7 @@ Copyright (C) 2004 Scott Ullrich Copyright (C) 2009 Ermal Luçi Copyright (C) 2010 Jim Pingle - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) @@ -171,13 +171,11 @@ if ($_POST) { if (preg_match("/urltable/i", $_POST['type'])) { $address = ""; - $isfirst = 0; /* item is a url table type */ if ($_POST['address0']) { /* fetch down and add in */ $_POST['address0'] = trim($_POST['address0']); - $isfirst = 0; $address[] = $_POST['address0']; $alias['url'] = $_POST['address0']; $alias['updatefreq'] = $_POST['address_subnet0'] ? $_POST['address_subnet0'] : 7; @@ -199,8 +197,6 @@ if ($_POST) { $final_address_details[] = sprintf(gettext("Entry added %s"), date('r')); } } else if ($_POST['type'] == "url" || $_POST['type'] == "url_ports") { - $isfirst = 0; - $address_count = 2; $desc_fmt_err_found = false; /* item is a url type */ @@ -208,7 +204,6 @@ if ($_POST) { $_POST['address' . $x] = trim($_POST['address' . $x]); if($_POST['address' . $x]) { /* fetch down and add in */ - $isfirst = 0; $temp_filename = tempnam("{$g['tmp_path']}/", "alias_import"); unlink_if_exists($temp_filename); $verify_ssl = isset($config['system']['checkaliasesurlcert']); @@ -241,31 +236,8 @@ if ($_POST) { $final_address_details[] = sprintf(gettext("Entry added %s"), date('r')); if(file_exists("{$temp_filename}/aliases")) { - $file_contents = file_get_contents("{$temp_filename}/aliases"); - $file_contents = str_replace("#", "\n#", $file_contents); - $file_contents_split = explode("\n", $file_contents); - foreach($file_contents_split as $fc) { - // Stop at 3000 items, aliases larger than that tend to break both pf and the WebGUI. - if ($address_count >= 3000) - break; - $tmp = trim($fc); - if(stristr($fc, "#")) { - $tmp_split = explode("#", $tmp); - $tmp = trim($tmp_split[0]); - } - $tmp = trim($tmp); - if ($_POST['type'] == "url") - $is_valid = (is_ipaddr($tmp) || is_subnet($tmp)); - else - $is_valid = (is_port($tmp) || is_portrange($tmp)); - - if (!empty($tmp) && $is_valid) { - $address[] = $tmp; - $isfirst = 1; - $address_count++; - } - } - if($isfirst == 0) { + $address = parse_aliases_file("{$temp_filename}/aliases", $_POST['type'], 3000); + if($address == null) { /* nothing was found */ $input_errors[] = sprintf(gettext("You must provide a valid URL. Could not fetch usable data from '%s'."), $_POST['address' . $x]); } diff --git a/usr/local/www/firewall_aliases_import.php b/usr/local/www/firewall_aliases_import.php index e4674a0..40bdf20 100755 --- a/usr/local/www/firewall_aliases_import.php +++ b/usr/local/www/firewall_aliases_import.php @@ -3,7 +3,7 @@ /* firewall_aliases_import.php Copyright (C) 2005 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php index 56451f9..fb09e3b 100644 --- a/usr/local/www/firewall_nat.php +++ b/usr/local/www/firewall_nat.php @@ -3,7 +3,7 @@ /* firewall_nat.php Copyright (C) 2004 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/firewall_nat_1to1.php b/usr/local/www/firewall_nat_1to1.php index 6087940..56adc69 100644 --- a/usr/local/www/firewall_nat_1to1.php +++ b/usr/local/www/firewall_nat_1to1.php @@ -7,7 +7,7 @@ Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. All rights reserved. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/usr/local/www/firewall_nat_1to1_edit.php b/usr/local/www/firewall_nat_1to1_edit.php index 2464db0..2b1a829 100644 --- a/usr/local/www/firewall_nat_1to1_edit.php +++ b/usr/local/www/firewall_nat_1to1_edit.php @@ -7,7 +7,7 @@ Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. All rights reserved. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php index c3469fd..d8f04d2 100644 --- a/usr/local/www/firewall_nat_edit.php +++ b/usr/local/www/firewall_nat_edit.php @@ -7,7 +7,7 @@ Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. All rights reserved. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/usr/local/www/firewall_nat_npt.php b/usr/local/www/firewall_nat_npt.php index a1e2543..2a9d2fe 100644 --- a/usr/local/www/firewall_nat_npt.php +++ b/usr/local/www/firewall_nat_npt.php @@ -7,7 +7,7 @@ Copyright (C) 2011 Seth Mos <seth.mos@dds.nl>. All rights reserved. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/firewall_nat_npt_edit.php b/usr/local/www/firewall_nat_npt_edit.php index a7707f9..734d5cc 100644 --- a/usr/local/www/firewall_nat_npt_edit.php +++ b/usr/local/www/firewall_nat_npt_edit.php @@ -4,7 +4,7 @@ firewall_nat_npt_edit.php part of pfSense (https://www.pfsense.org) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2011 Seth Mos <seth.mos@dds.nl>. All rights reserved. diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php index 077db67..89875a4 100644 --- a/usr/local/www/firewall_nat_out.php +++ b/usr/local/www/firewall_nat_out.php @@ -3,7 +3,7 @@ /* firewall_nat_out.php Copyright (C) 2004 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php index cbbbf9d..eedcfb9 100644 --- a/usr/local/www/firewall_nat_out_edit.php +++ b/usr/local/www/firewall_nat_out_edit.php @@ -3,7 +3,7 @@ /* firewall_nat_out_edit.php Copyright (C) 2004 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php index f68fd1b..dc2fcca 100644 --- a/usr/local/www/firewall_rules.php +++ b/usr/local/www/firewall_rules.php @@ -4,7 +4,7 @@ firewall_rules.php part of pfSense (https://www.pfsense.org) Copyright (C) 2005 Scott Ullrich (sullrich@gmail.com) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP originally part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php index ae12d96..376b2ed 100644 --- a/usr/local/www/firewall_rules_edit.php +++ b/usr/local/www/firewall_rules_edit.php @@ -4,7 +4,7 @@ firewall_rules_edit.php part of pfSense (https://www.pfsense.org) Copyright (C) 2005 Scott Ullrich (sullrich@gmail.com) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP originally part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. diff --git a/usr/local/www/firewall_schedule.php b/usr/local/www/firewall_schedule.php index 6f58a9d..56687f6 100644 --- a/usr/local/www/firewall_schedule.php +++ b/usr/local/www/firewall_schedule.php @@ -2,7 +2,7 @@ /* firewall_schedule.php Copyright (C) 2004 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/firewall_schedule_edit.php b/usr/local/www/firewall_schedule_edit.php index 8675d56..5759863 100644 --- a/usr/local/www/firewall_schedule_edit.php +++ b/usr/local/www/firewall_schedule_edit.php @@ -2,7 +2,7 @@ /* firewall_schedule_edit.php Copyright (C) 2004 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php index 2e38a39..99ec1f6 100644 --- a/usr/local/www/firewall_shaper.php +++ b/usr/local/www/firewall_shaper.php @@ -4,7 +4,7 @@ firewall_shaper.php Copyright (C) 2004, 2005 Scott Ullrich Copyright (C) 2008 Ermal Luçi - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/firewall_shaper_layer7.php b/usr/local/www/firewall_shaper_layer7.php index 8de2158..64e2457 100644 --- a/usr/local/www/firewall_shaper_layer7.php +++ b/usr/local/www/firewall_shaper_layer7.php @@ -3,7 +3,7 @@ /* firewall_shaper_layer7.php Copyright (C) 2008 Helder Pereira, André Ribeiro - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/firewall_shaper_queues.php b/usr/local/www/firewall_shaper_queues.php index 06a559b..c576794 100644 --- a/usr/local/www/firewall_shaper_queues.php +++ b/usr/local/www/firewall_shaper_queues.php @@ -4,7 +4,7 @@ firewall_shaper_queues.php Copyright (C) 2004, 2005 Scott Ullrich Copyright (C) 2008 Ermal Luçi - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/firewall_shaper_vinterface.php b/usr/local/www/firewall_shaper_vinterface.php index 9ed9f40..0930af1 100644 --- a/usr/local/www/firewall_shaper_vinterface.php +++ b/usr/local/www/firewall_shaper_vinterface.php @@ -4,7 +4,7 @@ firewall_shaper_vinterface.php Copyright (C) 2004, 2005 Scott Ullrich Copyright (C) 2008 Ermal Luçi - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/firewall_shaper_wizards.php b/usr/local/www/firewall_shaper_wizards.php index a066f76..e132835 100644 --- a/usr/local/www/firewall_shaper_wizards.php +++ b/usr/local/www/firewall_shaper_wizards.php @@ -4,7 +4,7 @@ firewall_shaper_wizards.php Copyright (C) 2004, 2005 Scott Ullrich Copyright (C) 2008 Ermal Luçi - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php index b04a7ab..67cd55f 100644 --- a/usr/local/www/firewall_virtual_ip.php +++ b/usr/local/www/firewall_virtual_ip.php @@ -5,7 +5,7 @@ part of pfSense (https://www.pfsense.org/) Copyright (C) 2005 Bill Marquette <bill.marquette@gmail.com>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Includes code from m0n0wall which is: diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php index 662ee5e..a26f61a 100644 --- a/usr/local/www/firewall_virtual_ip_edit.php +++ b/usr/local/www/firewall_virtual_ip_edit.php @@ -5,7 +5,7 @@ firewall_virtual_ip_edit.php part of pfSense (https://www.pfsense.org/) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2005 Bill Marquette <bill.marquette@gmail.com>. All rights reserved. diff --git a/usr/local/www/getserviceproviders.php b/usr/local/www/getserviceproviders.php index 07b00c2..d720d14 100644 --- a/usr/local/www/getserviceproviders.php +++ b/usr/local/www/getserviceproviders.php @@ -2,7 +2,7 @@ /* getserviceproviders.php Copyright (C) 2010 Vinicius Coque <vinicius.coque@bluepex.com> - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/getstats.php b/usr/local/www/getstats.php index 78c4c39..f9a5173 100644 --- a/usr/local/www/getstats.php +++ b/usr/local/www/getstats.php @@ -2,7 +2,7 @@ /* getstats.php Copyright (C) 2009 Bill Marquette - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/graph.php b/usr/local/www/graph.php index d04b877..ce65a55 100755 --- a/usr/local/www/graph.php +++ b/usr/local/www/graph.php @@ -3,7 +3,7 @@ graph.php part of m0n0wall (http://m0n0.ch/wall) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2004-2006 T. Lechat <dev@lechat.org>, Manuel Kasper <mk@neon1.net> and Jonathan Watt <jwatt@jwatt.org>. All rights reserved. diff --git a/usr/local/www/graph_cpu.php b/usr/local/www/graph_cpu.php index 00c2981..200b9ea 100644 --- a/usr/local/www/graph_cpu.php +++ b/usr/local/www/graph_cpu.php @@ -3,7 +3,7 @@ $Id$ part of m0n0wall (http://m0n0.ch/wall) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2004-2005 T. Lechat <dev@lechat.org>, Manuel Kasper <mk@neon1.net> and Jonathan Watt <jwatt@jwatt.org>. All rights reserved. diff --git a/usr/local/www/halt.php b/usr/local/www/halt.php index 865a0f1..e640e8a 100755 --- a/usr/local/www/halt.php +++ b/usr/local/www/halt.php @@ -3,7 +3,7 @@ /* halt.php part of pfSense - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2004 Scott Ullrich All rights reserved. diff --git a/usr/local/www/help.php b/usr/local/www/help.php index a6a5e27..26b1203 100644 --- a/usr/local/www/help.php +++ b/usr/local/www/help.php @@ -1,6 +1,6 @@ <?php /* Redirector for Contextual Help System - * Copyright (C) 2013-2014 Electric Sheep Fencing, LP + * Copyright (C) 2013-2015 Electric Sheep Fencing, LP * (c) 2009 Jim Pingle <jimp@pfsense.org> * */ diff --git a/usr/local/www/ifstats.php b/usr/local/www/ifstats.php index ded3ccc..fd7190f 100644 --- a/usr/local/www/ifstats.php +++ b/usr/local/www/ifstats.php @@ -4,7 +4,7 @@ ifstats.php part of pfSense (https://www.pfsense.org) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2005-2006 Scott Ullrich (sullrich@gmail.com) All rights reserved. diff --git a/usr/local/www/includes/functions.inc.php b/usr/local/www/includes/functions.inc.php index 4a212ec..f2e1191 100644 --- a/usr/local/www/includes/functions.inc.php +++ b/usr/local/www/includes/functions.inc.php @@ -1,7 +1,8 @@ <? /* + functions.inc.php pfSense_MODULE: ajax - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP */ if(Connection_Aborted()) { diff --git a/usr/local/www/index.php b/usr/local/www/index.php index d270eaf..d7c73bc 100644 --- a/usr/local/www/index.php +++ b/usr/local/www/index.php @@ -2,7 +2,7 @@ /* $Id$ */ /* index.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2004-2012 Scott Ullrich All rights reserved. diff --git a/usr/local/www/installer/installer.php b/usr/local/www/installer/installer.php index 05f10b9..90c138b 100644 --- a/usr/local/www/installer/installer.php +++ b/usr/local/www/installer/installer.php @@ -2,7 +2,7 @@ /* installer.php (pfSense webInstaller) part of pfSense (https://www.pfsense.org/) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com> All rights reserved. diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index 5498b64..981b253 100644 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -2,7 +2,7 @@ /* $Id$ */ /* interfaces.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2004-2008 Scott Ullrich Copyright (C) 2006 Daniel S. Haischt. Copyright (C) 2008-2010 Ermal Luçi @@ -610,7 +610,7 @@ if ($_POST['apply']) { $input_errors[] = gettext("You must enter a valid hexadecimal number for the IPv6 prefix ID."); } else { $track6_prefix_id = intval($_POST['track6-prefix-id--hex'], 16); - if ($track6_prefix_id < 0 || $track6_prefix_id >= $_POST['ipv6-num-prefix-ids-' . $_POST['track6-interface']]) { + if ($track6_prefix_id < 0 || $track6_prefix_id > $_POST['ipv6-num-prefix-ids-' . $_POST['track6-interface']]) { $input_errors[] = gettext("You specified an IPv6 prefix ID that is out of range. ({$_POST['track6-interface']}) - ({$_POST['ipv6-num-prefix-ids-' . $_POST['track6-interface']]}) - ({$ipv6_delegation_length})"); } else { foreach ($ifdescrs as $ifent => $ifdescr) { @@ -619,7 +619,7 @@ if ($_POST['apply']) { if ($config['interfaces'][$ifent]['ipaddrv6'] == 'track6' && $config['interfaces'][$ifent]['track6-interface'] == $_POST['track6-interface'] && $config['interfaces'][$ifent]['track6-prefix-id'] == $track6_prefix_id) - $input_errors[] = sprintf(gettext("This track6 prefix id is already being used in %s."), $ifdescr); + $input_errors[] = sprintf(gettext("This track6 prefix ID is already being used in %s."), $ifdescr); } } } @@ -1785,11 +1785,9 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"), <select name="subnet" class="formselect" id="subnet"> <?php for ($i = 32; $i > 0; $i--) { - if($i <> 31) { - echo "<option value=\"{$i}\" "; - if ($i == $pconfig['subnet']) echo "selected=\"selected\""; - echo ">" . $i . "</option>"; - } + echo "<option value=\"{$i}\" "; + if ($i == $pconfig['subnet']) echo "selected=\"selected\""; + echo ">" . $i . "</option>"; } ?> </select> @@ -1891,11 +1889,9 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"), <select name="subnetv6" class="formselect" id="subnetv6"> <?php for ($i = 128; $i > 0; $i--) { - if($i <> 127) { - echo "<option value=\"{$i}\" "; - if ($i == $pconfig['subnetv6']) echo "selected=\"selected\""; - echo ">" . $i . "</option>"; - } + echo "<option value=\"{$i}\" "; + if ($i == $pconfig['subnetv6']) echo "selected=\"selected\""; + echo ">" . $i . "</option>"; } ?> </select> @@ -2021,11 +2017,9 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"), <select name="alias-subnet" class="formselect" id="alias-subnet"> <?php for ($i = 32; $i > 0; $i--) { - if($i <> 31) { - echo "<option value=\"{$i}\" "; - if ($i == $pconfig['alias-subnet']) echo "selected=\"selected\""; - echo ">" . $i . "</option>"; - } + echo "<option value=\"{$i}\" "; + if ($i == $pconfig['alias-subnet']) echo "selected=\"selected\""; + echo ">" . $i . "</option>"; } ?> </select> @@ -2570,7 +2564,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"), <span id="track6-prefix-id-range"></span> <input type="hidden" id="track6-prefix-id-max" value="0"></input> <br /> - <?= gettext("The value in this field is the (Delegated) IPv6 prefix id. This determines the configurable network ID based on the dynamic IPv6 connection"); ?> + <?= gettext("The value in this field is the (Delegated) IPv6 prefix ID. This determines the configurable network ID based on the dynamic IPv6 connection"); ?> <br /> <?= gettext("default value is 0."); ?> </td> diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php index 894a03f..2de3055 100644 --- a/usr/local/www/interfaces_assign.php +++ b/usr/local/www/interfaces_assign.php @@ -4,7 +4,7 @@ part of m0n0wall (http://m0n0.ch/wall) Written by Jim McBeath based on existing m0n0wall files - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>. All rights reserved. @@ -196,7 +196,7 @@ if (isset($_POST['if_add'])) { /* Be sure this port is not being used */ $portused = false; foreach ($config['interfaces'] as $ifname => $ifdata) { - if ($ifdata['if'] == $_PORT['if_add']) { + if ($ifdata['if'] == $_POST['if_add']) { $portused = true; break; } diff --git a/usr/local/www/interfaces_bridge.php b/usr/local/www/interfaces_bridge.php index 44832f1..d28b023 100644 --- a/usr/local/www/interfaces_bridge.php +++ b/usr/local/www/interfaces_bridge.php @@ -3,7 +3,7 @@ /* interfaces_bridge.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2008 Ermal Luçi All rights reserved. diff --git a/usr/local/www/interfaces_bridge_edit.php b/usr/local/www/interfaces_bridge_edit.php index 731bb76..0fd62f0 100644 --- a/usr/local/www/interfaces_bridge_edit.php +++ b/usr/local/www/interfaces_bridge_edit.php @@ -3,7 +3,7 @@ /* interfaces_bridge_edit.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2008 Ermal Luçi All rights reserved. diff --git a/usr/local/www/interfaces_gif.php b/usr/local/www/interfaces_gif.php index 7512db1..bd3df05 100644 --- a/usr/local/www/interfaces_gif.php +++ b/usr/local/www/interfaces_gif.php @@ -3,7 +3,7 @@ /* interfaces_gif.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2008 Ermal Luçi All rights reserved. diff --git a/usr/local/www/interfaces_gif_edit.php b/usr/local/www/interfaces_gif_edit.php index 6e88b8e..a290e97 100644 --- a/usr/local/www/interfaces_gif_edit.php +++ b/usr/local/www/interfaces_gif_edit.php @@ -3,7 +3,7 @@ /* interfaces_gif_edit.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2008 Ermal Luçi All rights reserved. diff --git a/usr/local/www/interfaces_gre.php b/usr/local/www/interfaces_gre.php index f6f24ee..2b6e987 100644 --- a/usr/local/www/interfaces_gre.php +++ b/usr/local/www/interfaces_gre.php @@ -3,7 +3,7 @@ /* interfaces_gre.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2008 Ermal Luçi All rights reserved. diff --git a/usr/local/www/interfaces_gre_edit.php b/usr/local/www/interfaces_gre_edit.php index 5fa2328..b360f17 100644 --- a/usr/local/www/interfaces_gre_edit.php +++ b/usr/local/www/interfaces_gre_edit.php @@ -3,7 +3,7 @@ /* interfaces_gre_edit.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2008 Ermal Luçi All rights reserved. diff --git a/usr/local/www/interfaces_groups.php b/usr/local/www/interfaces_groups.php index fa57511..cdc99bf 100644 --- a/usr/local/www/interfaces_groups.php +++ b/usr/local/www/interfaces_groups.php @@ -1,6 +1,8 @@ <?php /* - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + interfaces_groups.php + + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2009 Ermal Luçi Copyright (C) 2004 Scott Ullrich All rights reserved. diff --git a/usr/local/www/interfaces_groups_edit.php b/usr/local/www/interfaces_groups_edit.php index 9096bfe..1012ca4 100644 --- a/usr/local/www/interfaces_groups_edit.php +++ b/usr/local/www/interfaces_groups_edit.php @@ -1,6 +1,8 @@ <?php /* - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + interfaces_groups_edit.php + + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2009 Ermal Luçi Copyright (C) 2004 Scott Ullrich All rights reserved. diff --git a/usr/local/www/interfaces_lagg.php b/usr/local/www/interfaces_lagg.php index 2a283fd..2c08fc4 100644 --- a/usr/local/www/interfaces_lagg.php +++ b/usr/local/www/interfaces_lagg.php @@ -3,7 +3,7 @@ /* interfaces_lagg.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2008 Ermal Luçi All rights reserved. diff --git a/usr/local/www/interfaces_lagg_edit.php b/usr/local/www/interfaces_lagg_edit.php index 5201e8e..fdf9b08 100644 --- a/usr/local/www/interfaces_lagg_edit.php +++ b/usr/local/www/interfaces_lagg_edit.php @@ -3,7 +3,7 @@ /* interfaces_lagg_edit.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2008 Ermal Luçi All rights reserved. diff --git a/usr/local/www/interfaces_ppps.php b/usr/local/www/interfaces_ppps.php index fa0b932..31080f6 100644 --- a/usr/local/www/interfaces_ppps.php +++ b/usr/local/www/interfaces_ppps.php @@ -4,7 +4,7 @@ interfaces_ppps.php part of m0n0wall (http://m0n0.ch/wall) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. All rights reserved. diff --git a/usr/local/www/interfaces_ppps_edit.php b/usr/local/www/interfaces_ppps_edit.php index 3847416..cad3708 100644 --- a/usr/local/www/interfaces_ppps_edit.php +++ b/usr/local/www/interfaces_ppps_edit.php @@ -8,7 +8,7 @@ All rights reserved. Copyright (C) 2010 Gabriel B. <gnoahb@gmail.com>. All rights reserved. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/interfaces_qinq.php b/usr/local/www/interfaces_qinq.php index 789a825..78cd46c 100644 --- a/usr/local/www/interfaces_qinq.php +++ b/usr/local/www/interfaces_qinq.php @@ -2,7 +2,7 @@ /* $Id$ */ /* interfaces_qinq.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2009 Ermal Luçi All rights reserved. diff --git a/usr/local/www/interfaces_qinq_edit.php b/usr/local/www/interfaces_qinq_edit.php index 1ea6a2c..085ab8d 100644 --- a/usr/local/www/interfaces_qinq_edit.php +++ b/usr/local/www/interfaces_qinq_edit.php @@ -1,6 +1,8 @@ <?php /* - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + interfaces_qinq_edit.php + + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2009 Ermal Luçi All rights reserved. diff --git a/usr/local/www/interfaces_vlan.php b/usr/local/www/interfaces_vlan.php index 38464aa..273c547 100644 --- a/usr/local/www/interfaces_vlan.php +++ b/usr/local/www/interfaces_vlan.php @@ -5,7 +5,7 @@ part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/interfaces_vlan_edit.php b/usr/local/www/interfaces_vlan_edit.php index ff1380e..4f40cce 100644 --- a/usr/local/www/interfaces_vlan_edit.php +++ b/usr/local/www/interfaces_vlan_edit.php @@ -5,7 +5,7 @@ part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/interfaces_wireless.php b/usr/local/www/interfaces_wireless.php index ff768e1..bb415f9 100644 --- a/usr/local/www/interfaces_wireless.php +++ b/usr/local/www/interfaces_wireless.php @@ -4,7 +4,7 @@ interfaces_wireless.php Copyright (C) 2010 Erik Fonnesbeck - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/interfaces_wireless_edit.php b/usr/local/www/interfaces_wireless_edit.php index 568060b..6a7f7b7 100644 --- a/usr/local/www/interfaces_wireless_edit.php +++ b/usr/local/www/interfaces_wireless_edit.php @@ -4,7 +4,7 @@ interfaces_wireless_edit.php Copyright (C) 2010 Erik Fonnesbeck - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/license.php b/usr/local/www/license.php index 1be6cd4..94a1a65 100644 --- a/usr/local/www/license.php +++ b/usr/local/www/license.php @@ -2,7 +2,7 @@ /* $Id$ */ /* license.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved Redistribution and use in source and binary forms, with or without @@ -49,7 +49,7 @@ include("head.inc"); <p><strong><?=$g['product_name'];?> <?=gettext("is Copyright");?> © <?=$g['product_copyright_years'];?> <?=gettext("by");?> <?=$g['product_copyright'];?><br /> <?=gettext("All rights reserved");?>.</strong></p> - <p><strong><?=gettext("m0n0wall is Copyright ");?>© <?=gettext("2002-2014 by Manuel Kasper");?> + <p><strong><?=gettext("m0n0wall is Copyright ");?>© <?=gettext("2002-2015 by Manuel Kasper");?> (<a href="mailto:mk@neon1.net">mk@neon1.net</a>).<br /> <?=gettext("All rights reserved");?>.</strong></p> <p> <?=gettext("Redistribution and use in source and binary forms, with or without");?><br /> @@ -88,10 +88,10 @@ include("head.inc"); <?php printf(gettext("The authors of %s would like to thank the authors of these " . "software packages for their efforts"),$g['product_name']);?>.</p> <p>FreeBSD (<a href="http://www.freebsd.org" target="_blank">http://www.freebsd.org</a>)<br /> - <?=gettext("Copyright");?> ©<?=gettext("1992-2014 The FreeBSD Project. All rights reserved");?>.<br /> + <?=gettext("Copyright");?> ©<?=gettext("1992-2015 The FreeBSD Project. All rights reserved");?>.<br /> <br /> <?=gettext("This product includes PHP, freely available from");?> <a href="http://www.php.net/" target="_blank">http://www.php.net</a>.<br /> - <?=gettext("Copyright"); ?> © <?=gettext("1999-2014 The PHP Group. All rights reserved.");?>.<br /> + <?=gettext("Copyright"); ?> © <?=gettext("1999-2015 The PHP Group. All rights reserved.");?>.<br /> <br /> <?=gettext("LightTPD"); ?> (<a href="http://www.lighttpd.net" target="_blank">http://www.lighttpd.net)</a><br /> <?=gettext("Copyright"); ?> ©<?=gettext("2004, Jan Knescke, incremental");?><jan@kneschke.de> diff --git a/usr/local/www/load_balancer_monitor.php b/usr/local/www/load_balancer_monitor.php index 69b21b8..3e72add 100644 --- a/usr/local/www/load_balancer_monitor.php +++ b/usr/local/www/load_balancer_monitor.php @@ -4,7 +4,7 @@ load_balancer_monitor.php part of pfSense (https://www.pfsense.org/) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2008 Bill Marquette <bill.marquette@gmail.com>. All rights reserved. diff --git a/usr/local/www/load_balancer_monitor_edit.php b/usr/local/www/load_balancer_monitor_edit.php index 02708de..1f30a4f 100644 --- a/usr/local/www/load_balancer_monitor_edit.php +++ b/usr/local/www/load_balancer_monitor_edit.php @@ -1,33 +1,33 @@ <?php /* $Id$ */ /* - load_balancer_monitor_edit.php - part of pfSense (https://www.pfsense.org/) + load_balancer_monitor_edit.php + part of pfSense (https://www.pfsense.org/) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP - Copyright (C) 2008 Bill Marquette <bill.marquette@gmail.com>. - All rights reserved. + Copyright (C) 2013-2015 Electric Sheep Fencing, LP + Copyright (C) 2008 Bill Marquette <bill.marquette@gmail.com>. + All rights reserved. - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ /* pfSense_MODULE: routing diff --git a/usr/local/www/load_balancer_pool.php b/usr/local/www/load_balancer_pool.php index 979e5c7..a52cc9a 100644 --- a/usr/local/www/load_balancer_pool.php +++ b/usr/local/www/load_balancer_pool.php @@ -4,7 +4,7 @@ load_balancer_pool.php part of pfSense (https://www.pfsense.org/) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2005-2008 Bill Marquette <bill.marquette@gmail.com>. All rights reserved. diff --git a/usr/local/www/load_balancer_pool_edit.php b/usr/local/www/load_balancer_pool_edit.php index 6c24f56..8993dee 100644 --- a/usr/local/www/load_balancer_pool_edit.php +++ b/usr/local/www/load_balancer_pool_edit.php @@ -1,33 +1,33 @@ <?php /* $Id$ */ /* - load_balancer_pool_edit.php - part of pfSense (https://www.pfsense.org/) - - Copyright (C) 2013-2014 Electric Sheep Fencing, LP - Copyright (C) 2005-2008 Bill Marquette <bill.marquette@gmail.com>. - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + load_balancer_pool_edit.php + part of pfSense (https://www.pfsense.org/) + + Copyright (C) 2013-2015 Electric Sheep Fencing, LP + Copyright (C) 2005-2008 Bill Marquette <bill.marquette@gmail.com>. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ /* pfSense_MODULE: routing diff --git a/usr/local/www/load_balancer_relay_action.php b/usr/local/www/load_balancer_relay_action.php index 39fde55..bb39846 100644 --- a/usr/local/www/load_balancer_relay_action.php +++ b/usr/local/www/load_balancer_relay_action.php @@ -1,10 +1,10 @@ <?php /* $Id$ */ /* - load_balancer_protocol.php + load_balancer_relay_action.php part of pfSense (https://www.pfsense.org/) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2008 Bill Marquette <bill.marquette@gmail.com>. All rights reserved. diff --git a/usr/local/www/load_balancer_relay_action_edit.php b/usr/local/www/load_balancer_relay_action_edit.php index 996d424..ec83402 100644 --- a/usr/local/www/load_balancer_relay_action_edit.php +++ b/usr/local/www/load_balancer_relay_action_edit.php @@ -1,33 +1,33 @@ <?php /* $Id$ */ /* - load_balancer_protocol_edit.php - part of pfSense (https://www.pfsense.org/) - - Copyright (C) 2013-2014 Electric Sheep Fencing, LP - Copyright (C) 2008 Bill Marquette <bill.marquette@gmail.com>. - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + load_balancer_relay_action_edit.php + part of pfSense (https://www.pfsense.org/) + + Copyright (C) 2013-2015 Electric Sheep Fencing, LP + Copyright (C) 2008 Bill Marquette <bill.marquette@gmail.com>. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ /* pfSense_MODULE: routing diff --git a/usr/local/www/load_balancer_relay_protocol.php b/usr/local/www/load_balancer_relay_protocol.php index 3ec0f38..845b444 100644 --- a/usr/local/www/load_balancer_relay_protocol.php +++ b/usr/local/www/load_balancer_relay_protocol.php @@ -4,7 +4,7 @@ load_balancer_relay_protocol.php part of pfSense (https://www.pfsense.org/) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2008 Bill Marquette <bill.marquette@gmail.com>. All rights reserved. diff --git a/usr/local/www/load_balancer_relay_protocol_edit.php b/usr/local/www/load_balancer_relay_protocol_edit.php index ea2820b..c9864c2 100644 --- a/usr/local/www/load_balancer_relay_protocol_edit.php +++ b/usr/local/www/load_balancer_relay_protocol_edit.php @@ -1,33 +1,33 @@ <?php /* $Id$ */ /* - load_balancer_protocol_edit.php - part of pfSense (https://www.pfsense.org/) - - Copyright (C) 2013-2014 Electric Sheep Fencing, LP - Copyright (C) 2008 Bill Marquette <bill.marquette@gmail.com>. - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + load_balancer_relay_protocol_edit.php + part of pfSense (https://www.pfsense.org/) + + Copyright (C) 2013-2015 Electric Sheep Fencing, LP + Copyright (C) 2008 Bill Marquette <bill.marquette@gmail.com>. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ /* pfSense_MODULE: routing diff --git a/usr/local/www/load_balancer_setting.php b/usr/local/www/load_balancer_setting.php index d6a1537..b91570f 100644 --- a/usr/local/www/load_balancer_setting.php +++ b/usr/local/www/load_balancer_setting.php @@ -6,7 +6,7 @@ Copyright (C) 2008 Bill Marquette <bill.marquette@gmail.com>. Copyright (C) 2012 Pierre POMES <pierre.pomes@gmail.com>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. diff --git a/usr/local/www/load_balancer_virtual_server.php b/usr/local/www/load_balancer_virtual_server.php index 3bb0b30..aa5e074 100644 --- a/usr/local/www/load_balancer_virtual_server.php +++ b/usr/local/www/load_balancer_virtual_server.php @@ -5,7 +5,7 @@ part of pfSense (https://www.pfsense.org/) Copyright (C) 2005-2008 Bill Marquette <bill.marquette@gmail.com>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. diff --git a/usr/local/www/load_balancer_virtual_server_edit.php b/usr/local/www/load_balancer_virtual_server_edit.php index e03e125..b5ed1b0 100644 --- a/usr/local/www/load_balancer_virtual_server_edit.php +++ b/usr/local/www/load_balancer_virtual_server_edit.php @@ -1,34 +1,34 @@ <?php /* $Id$ */ /* - load_balancer_virtual_server_edit.php - part of pfSense (https://www.pfsense.org/) - - Copyright (C) 2005-2008 Bill Marquette <bill.marquette@gmail.com>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP - - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + load_balancer_virtual_server_edit.php + part of pfSense (https://www.pfsense.org/) + + Copyright (C) 2005-2008 Bill Marquette <bill.marquette@gmail.com>. + Copyright (C) 2013-2015 Electric Sheep Fencing, LP + + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ /* pfSense_MODULE: routing diff --git a/usr/local/www/pkg.php b/usr/local/www/pkg.php index c663b16..aabd607 100755 --- a/usr/local/www/pkg.php +++ b/usr/local/www/pkg.php @@ -2,9 +2,8 @@ /* $Id$ */ /* pkg.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2004-2012 Scott Ullrich <sullrich@gmail.com> - Copyright (C) 2013-2014 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php index aba7b3a..fbcd6b8 100644 --- a/usr/local/www/pkg_edit.php +++ b/usr/local/www/pkg_edit.php @@ -2,9 +2,8 @@ /* $Id$ */ /* pkg_edit.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2004-2012 Scott Ullrich <sullrich@gmail.com> - Copyright (C) 2013-2014 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php index 423ac26..184dded 100644 --- a/usr/local/www/pkg_mgr.php +++ b/usr/local/www/pkg_mgr.php @@ -2,10 +2,9 @@ /* $Id$ */ /* pkg_mgr.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2004-2012 Scott Ullrich <sullrich@gmail.com> Copyright (C) 2013 Marcello Coutinho - Copyright (C) 2013-2014 Electric Sheep Fencing, LP All rights reserved. diff --git a/usr/local/www/pkg_mgr_install.php b/usr/local/www/pkg_mgr_install.php index 5773933..dece43b 100644 --- a/usr/local/www/pkg_mgr_install.php +++ b/usr/local/www/pkg_mgr_install.php @@ -3,7 +3,7 @@ /* pkg_mgr_install.php part of pfSense (https://www.pfsense.org) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2004-2010 Scott Ullrich <sullrich@gmail.com> Copyright (C) 2005 Colin Smith All rights reserved. diff --git a/usr/local/www/pkg_mgr_installed.php b/usr/local/www/pkg_mgr_installed.php index e4695ca..8af8443 100644 --- a/usr/local/www/pkg_mgr_installed.php +++ b/usr/local/www/pkg_mgr_installed.php @@ -2,7 +2,7 @@ /* $Id$ */ /* pkg_mgr_installed.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2004-2012 Scott Ullrich <sullrich@gmail.com> All rights reserved. diff --git a/usr/local/www/pkg_mgr_settings.php b/usr/local/www/pkg_mgr_settings.php index 3006585..0a7d004 100644 --- a/usr/local/www/pkg_mgr_settings.php +++ b/usr/local/www/pkg_mgr_settings.php @@ -3,10 +3,10 @@ /* pkg_mgr_settings.php part of pfSense - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2009 Jim Pingle <jimp@pfsense.org> - Copyright (C) 2004-2010 Scott Ullrich <sullrich@gmail.com> - Copyright (C) 2005 Colin Smith + Copyright (C) 2004-2010 Scott Ullrich <sullrich@gmail.com> + Copyright (C) 2005 Colin Smith Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/usr/local/www/reboot.php b/usr/local/www/reboot.php index 118da16..088587f 100755 --- a/usr/local/www/reboot.php +++ b/usr/local/www/reboot.php @@ -4,7 +4,7 @@ reboot.php part of m0n0wall (http://m0n0.ch/wall) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. All rights reserved. diff --git a/usr/local/www/restart_httpd.php b/usr/local/www/restart_httpd.php index 583d070..2f59bbf 100644 --- a/usr/local/www/restart_httpd.php +++ b/usr/local/www/restart_httpd.php @@ -1,30 +1,32 @@ <?php /* $Id$ */ /* - Copyright (C) 2013-2014 Electric Sheep Fencing, LP - Copyright (C) 2005 Bill Marquette <bill.marquette@gmail.com>. - All rights reserved. + restart_httpd.php - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: + Copyright (C) 2013-2015 Electric Sheep Fencing, LP + Copyright (C) 2005 Bill Marquette <bill.marquette@gmail.com>. + All rights reserved. - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ /* pfSense_BUILDER_BINARIES: /bin/chmod diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php index 42b0a0d..c88f6af 100644 --- a/usr/local/www/services_captiveportal.php +++ b/usr/local/www/services_captiveportal.php @@ -3,7 +3,7 @@ services_captiveportal.php part of m0n0wall (http://m0n0.ch/wall) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>. All rights reserved. diff --git a/usr/local/www/services_captiveportal_filemanager.php b/usr/local/www/services_captiveportal_filemanager.php index cf28d85..1368753 100644 --- a/usr/local/www/services_captiveportal_filemanager.php +++ b/usr/local/www/services_captiveportal_filemanager.php @@ -3,7 +3,7 @@ services_captiveportal_filemanager.php part of m0n0wall (http://m0n0.ch/wall) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2005-2006 Jonathan De Graeve (jonathan.de.graeve@imelda.be) and Paul Taylor (paultaylor@winn-dixie.com). All rights reserved. diff --git a/usr/local/www/services_captiveportal_hostname.php b/usr/local/www/services_captiveportal_hostname.php index 8918a25..03afc59 100644 --- a/usr/local/www/services_captiveportal_hostname.php +++ b/usr/local/www/services_captiveportal_hostname.php @@ -1,7 +1,7 @@ <?php /* services_captiveportal_hostname.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2011 Scott Ullrich <sullrich@gmail.com> All rights reserved. diff --git a/usr/local/www/services_captiveportal_hostname_edit.php b/usr/local/www/services_captiveportal_hostname_edit.php index c28ff5e..9d7c7d6 100644 --- a/usr/local/www/services_captiveportal_hostname_edit.php +++ b/usr/local/www/services_captiveportal_hostname_edit.php @@ -1,7 +1,7 @@ <?php /* services_captiveportal_hostname_edit.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2011 Scott Ullrich <sullrich@gmail.com> All rights reserved. diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php index 28ec44b..72b1126 100644 --- a/usr/local/www/services_captiveportal_ip.php +++ b/usr/local/www/services_captiveportal_ip.php @@ -3,7 +3,7 @@ services_captiveportal_ip.php part of m0n0wall (http://m0n0.ch/wall) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2004 Dinesh Nair <dinesh@alphaque.com> All rights reserved. diff --git a/usr/local/www/services_captiveportal_ip_edit.php b/usr/local/www/services_captiveportal_ip_edit.php index 4038e2a..4ad066a 100644 --- a/usr/local/www/services_captiveportal_ip_edit.php +++ b/usr/local/www/services_captiveportal_ip_edit.php @@ -1,7 +1,7 @@ <?php /* services_captiveportal_ip_edit.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2011 Scott Ullrich <sullrich@gmail.com> All rights reserved. diff --git a/usr/local/www/services_captiveportal_mac.php b/usr/local/www/services_captiveportal_mac.php index b5b6fc0..c0e73e5 100644 --- a/usr/local/www/services_captiveportal_mac.php +++ b/usr/local/www/services_captiveportal_mac.php @@ -3,7 +3,7 @@ services_captiveportal_mac.php part of m0n0wall (http://m0n0.ch/wall) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2004 Dinesh Nair <dinesh@alphaque.com> All rights reserved. diff --git a/usr/local/www/services_captiveportal_mac_edit.php b/usr/local/www/services_captiveportal_mac_edit.php index f2947d6..50a28db 100644 --- a/usr/local/www/services_captiveportal_mac_edit.php +++ b/usr/local/www/services_captiveportal_mac_edit.php @@ -3,7 +3,7 @@ services_captiveportal_mac_edit.php part of m0n0wall (http://m0n0.ch/wall) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2004 Dinesh Nair <dinesh@alphaque.com> All rights reserved. diff --git a/usr/local/www/services_captiveportal_vouchers.php b/usr/local/www/services_captiveportal_vouchers.php index 3ac9aae..2f02802 100644 --- a/usr/local/www/services_captiveportal_vouchers.php +++ b/usr/local/www/services_captiveportal_vouchers.php @@ -1,6 +1,8 @@ <?php /* - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + services_captiveportal_vouchers.php + + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2007 Marcel Wiget <mwiget@mac.com> All rights reserved. diff --git a/usr/local/www/services_captiveportal_vouchers_edit.php b/usr/local/www/services_captiveportal_vouchers_edit.php index 157dedb..b43a0f7 100644 --- a/usr/local/www/services_captiveportal_vouchers_edit.php +++ b/usr/local/www/services_captiveportal_vouchers_edit.php @@ -1,6 +1,8 @@ <?php /* - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + services_captiveportal_vouchers_edit.php + + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2007 Marcel Wiget <mwiget@mac.com>. All rights reserved. diff --git a/usr/local/www/services_captiveportal_zones.php b/usr/local/www/services_captiveportal_zones.php index 872e522..8974167 100644 --- a/usr/local/www/services_captiveportal_zones.php +++ b/usr/local/www/services_captiveportal_zones.php @@ -1,6 +1,8 @@ <?php /* - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + services_captiveportal_zones.php + + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. diff --git a/usr/local/www/services_captiveportal_zones_edit.php b/usr/local/www/services_captiveportal_zones_edit.php index da70bc5..9490d4c 100644 --- a/usr/local/www/services_captiveportal_zones_edit.php +++ b/usr/local/www/services_captiveportal_zones_edit.php @@ -1,8 +1,8 @@ <?php /* - services_captiveportal_mac_edit.php + services_captiveportal_zones_edit.php Copyright (C) 2011 Ermal Luci - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php index f4021e6..778d360 100644 --- a/usr/local/www/services_dhcp.php +++ b/usr/local/www/services_dhcp.php @@ -5,7 +5,7 @@ part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/services_dhcp_edit.php b/usr/local/www/services_dhcp_edit.php index 2fb7f17..c044185 100644 --- a/usr/local/www/services_dhcp_edit.php +++ b/usr/local/www/services_dhcp_edit.php @@ -5,7 +5,7 @@ part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/services_dhcp_relay.php b/usr/local/www/services_dhcp_relay.php index 15fdd0f..607002c 100644 --- a/usr/local/www/services_dhcp_relay.php +++ b/usr/local/www/services_dhcp_relay.php @@ -4,7 +4,7 @@ Copyright (C) 2003-2004 Justin Ellison <justin@techadvise.com>. Copyright (C) 2010 Ermal Luçi - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/services_dhcpv6.php b/usr/local/www/services_dhcpv6.php index 28c2e39..aeb21e0 100644 --- a/usr/local/www/services_dhcpv6.php +++ b/usr/local/www/services_dhcpv6.php @@ -9,7 +9,7 @@ part of pfSense (https://www.pfsense.org) Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/services_dhcpv6_edit.php b/usr/local/www/services_dhcpv6_edit.php index 561d6f9..76993e6 100644 --- a/usr/local/www/services_dhcpv6_edit.php +++ b/usr/local/www/services_dhcpv6_edit.php @@ -6,7 +6,7 @@ Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. Copyright (C) 2011 Seth Mos <seth.mos@dds.nl>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/services_dhcpv6_relay.php b/usr/local/www/services_dhcpv6_relay.php index 8e80bca..6b6ebe1 100644 --- a/usr/local/www/services_dhcpv6_relay.php +++ b/usr/local/www/services_dhcpv6_relay.php @@ -5,7 +5,7 @@ Copyright (C) 2003-2004 Justin Ellison <justin@techadvise.com>. Copyright (C) 2010 Ermal Luçi Copyright (C) 2010 Seth Mos - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/services_dnsmasq.php b/usr/local/www/services_dnsmasq.php index ee5cc2c..0361932 100644 --- a/usr/local/www/services_dnsmasq.php +++ b/usr/local/www/services_dnsmasq.php @@ -5,7 +5,7 @@ part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2004 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/services_dnsmasq_domainoverride_edit.php b/usr/local/www/services_dnsmasq_domainoverride_edit.php index 15cdfc3..d2c3181 100644 --- a/usr/local/www/services_dnsmasq_domainoverride_edit.php +++ b/usr/local/www/services_dnsmasq_domainoverride_edit.php @@ -1,32 +1,32 @@ <?php /* - services_dnsmasq_domainoverride_edit.php - part of m0n0wall (http://m0n0.ch/wall) - - Copyright (C) 2003-2005 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + services_dnsmasq_domainoverride_edit.php + part of m0n0wall (http://m0n0.ch/wall) + + Copyright (C) 2003-2005 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net>. + Copyright (C) 2013-2015 Electric Sheep Fencing, LP + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ /* pfSense_MODULE: dnsforwarder diff --git a/usr/local/www/services_dnsmasq_edit.php b/usr/local/www/services_dnsmasq_edit.php index 0ad863d..3eaf27d 100644 --- a/usr/local/www/services_dnsmasq_edit.php +++ b/usr/local/www/services_dnsmasq_edit.php @@ -5,7 +5,7 @@ part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2004 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/services_dyndns.php b/usr/local/www/services_dyndns.php index ab9b41e..6d2f678 100644 --- a/usr/local/www/services_dyndns.php +++ b/usr/local/www/services_dyndns.php @@ -1,8 +1,10 @@ <?php /* $Id$ */ /* + services_dyndns.php + Copyright (C) 2008 Ermal Luçi - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/services_dyndns_edit.php b/usr/local/www/services_dyndns_edit.php index 97de1fd..c88e22d 100644 --- a/usr/local/www/services_dyndns_edit.php +++ b/usr/local/www/services_dyndns_edit.php @@ -1,8 +1,10 @@ <?php /* $Id$ */ /* + services_dyndns_edit.php + Copyright (C) 2008 Ermal Luçi - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/services_igmpproxy.php b/usr/local/www/services_igmpproxy.php index 3fba2da..99c5181 100644 --- a/usr/local/www/services_igmpproxy.php +++ b/usr/local/www/services_igmpproxy.php @@ -3,7 +3,7 @@ /* services_igmpproxy.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2009 Ermal Luçi Copyright (C) 2004 Scott Ullrich All rights reserved. diff --git a/usr/local/www/services_igmpproxy_edit.php b/usr/local/www/services_igmpproxy_edit.php index 14e2892..8704978 100644 --- a/usr/local/www/services_igmpproxy_edit.php +++ b/usr/local/www/services_igmpproxy_edit.php @@ -2,7 +2,7 @@ /* $Id$ */ /* services_igmpproxy_edit.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2009 Ermal Luçi Copyright (C) 2004 Scott Ullrich All rights reserved. diff --git a/usr/local/www/services_ntpd.php b/usr/local/www/services_ntpd.php index 2764b28..948ef6e 100644 --- a/usr/local/www/services_ntpd.php +++ b/usr/local/www/services_ntpd.php @@ -4,7 +4,7 @@ Copyright (C) 2013 Dagorlad Copyright (C) 2012 Jim Pingle - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/services_ntpd_gps.php b/usr/local/www/services_ntpd_gps.php index 55befc1..7afe24c 100644 --- a/usr/local/www/services_ntpd_gps.php +++ b/usr/local/www/services_ntpd_gps.php @@ -1,7 +1,9 @@ <?php /* $Id$ */ /* - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + services_ntpd_gps.php + + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2013 Dagorlad Copyright (C) 2012 Jim Pingle All rights reserved. diff --git a/usr/local/www/services_ntpd_pps.php b/usr/local/www/services_ntpd_pps.php index 3f47c7d..c92983f 100644 --- a/usr/local/www/services_ntpd_pps.php +++ b/usr/local/www/services_ntpd_pps.php @@ -1,7 +1,9 @@ <?php /* $Id$ */ /* - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + services_ntpd_pps.php + + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2013 Dagorlad All rights reserved. diff --git a/usr/local/www/services_rfc2136.php b/usr/local/www/services_rfc2136.php index 02d8e84..57815a3 100644 --- a/usr/local/www/services_rfc2136.php +++ b/usr/local/www/services_rfc2136.php @@ -1,8 +1,10 @@ <?php /* $Id$ */ /* + services_rfc2136.php + Copyright (C) 2008 Ermal Luçi - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/services_rfc2136_edit.php b/usr/local/www/services_rfc2136_edit.php index 83ae999..218d10f 100644 --- a/usr/local/www/services_rfc2136_edit.php +++ b/usr/local/www/services_rfc2136_edit.php @@ -1,8 +1,10 @@ <?php /* $Id$ */ /* + services_rfc2136_edit.php + Copyright (C) 2008 Ermal Luçi - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/services_router_advertisements.php b/usr/local/www/services_router_advertisements.php index 7192ab7..3639eb6 100644 --- a/usr/local/www/services_router_advertisements.php +++ b/usr/local/www/services_router_advertisements.php @@ -9,7 +9,7 @@ part of pfSense (https://www.pfsense.org) Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/services_snmp.php b/usr/local/www/services_snmp.php index 20efc8b..3aef6a0 100644 --- a/usr/local/www/services_snmp.php +++ b/usr/local/www/services_snmp.php @@ -8,7 +8,7 @@ All rights reserved. part of pfSense - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/services_unbound.php b/usr/local/www/services_unbound.php index 7231ee7..2b943dd 100644 --- a/usr/local/www/services_unbound.php +++ b/usr/local/www/services_unbound.php @@ -4,7 +4,7 @@ services_unbound.php part of the pfSense project (https://www.pfsense.org) Copyright (C) 2014 Warren Baker (warren@pfsense.org) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without @@ -81,7 +81,7 @@ if (isset($config['unbound']['txtsupport'])) { } $pconfig['port'] = $config['unbound']['port']; -$pconfig['custom_options'] = $config['unbound']['custom_options']; +$pconfig['custom_options'] = base64_decode($config['unbound']['custom_options']); if (empty($config['unbound']['active_interface'])) { $pconfig['active_interface'] = array(); @@ -171,7 +171,7 @@ if ($_POST) { $a_unboundcfg['outgoing_interface'] = implode(",", $_POST['outgoing_interface']); } - $a_unboundcfg['custom_options'] = str_replace("\r\n", "\n", $_POST['custom_options']); + $a_unboundcfg['custom_options'] = base64_encode(str_replace("\r\n", "\n", $_POST['custom_options'])); if (!$input_errors) { write_config("DNS Resolver configured."); diff --git a/usr/local/www/services_unbound_acls.php b/usr/local/www/services_unbound_acls.php index d2fa3f8..936f3ee 100644 --- a/usr/local/www/services_unbound_acls.php +++ b/usr/local/www/services_unbound_acls.php @@ -5,7 +5,7 @@ part of pfSense (https://www.pfsense.org/) Copyright (C) 2011 Warren Baker <warren@decoy.co.za> - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/services_unbound_advanced.php b/usr/local/www/services_unbound_advanced.php index 43b03c9..0efba70 100644 --- a/usr/local/www/services_unbound_advanced.php +++ b/usr/local/www/services_unbound_advanced.php @@ -4,7 +4,7 @@ services_unbound_advanced.php part of the pfSense project (https://www.pfsense.org) Copyright (C) 2011 Warren Baker (warren@pfsense.org) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/services_unbound_domainoverride_edit.php b/usr/local/www/services_unbound_domainoverride_edit.php index 32ad753..b8c37a5 100644 --- a/usr/local/www/services_unbound_domainoverride_edit.php +++ b/usr/local/www/services_unbound_domainoverride_edit.php @@ -3,7 +3,7 @@ services_unbound_domainoverride_edit.php part of the pfSense project (https://www.pfsense.org) Copyright (C) 2014 Warren Baker (warren@decoy.co.za) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Copyright (C) 2003-2005 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net>. diff --git a/usr/local/www/services_unbound_host_edit.php b/usr/local/www/services_unbound_host_edit.php index df4c75f..b31c7df 100644 --- a/usr/local/www/services_unbound_host_edit.php +++ b/usr/local/www/services_unbound_host_edit.php @@ -4,7 +4,7 @@ services_unbound_host_edit.php part of the pfSense project (https://www.pfsense.org) Copyright (C) 2014 Warren Baker (warren@decoy.co.za) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Copyright (C) 2003-2004 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net>. diff --git a/usr/local/www/services_wol.php b/usr/local/www/services_wol.php index 899121b..0993d8e 100644 --- a/usr/local/www/services_wol.php +++ b/usr/local/www/services_wol.php @@ -5,7 +5,7 @@ part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/services_wol_edit.php b/usr/local/www/services_wol_edit.php index 89b5196..9c23283 100644 --- a/usr/local/www/services_wol_edit.php +++ b/usr/local/www/services_wol_edit.php @@ -5,7 +5,7 @@ part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/stats.php b/usr/local/www/stats.php index f9e0f9e..e263983 100644 --- a/usr/local/www/stats.php +++ b/usr/local/www/stats.php @@ -2,7 +2,7 @@ /* $Id$ part of pfSense (https://www.pfsense.org) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2007 Scott Ullrich <sullrich@gmail.com> All rights reserved. diff --git a/usr/local/www/status.php b/usr/local/www/status.php index 2bc3d9d..e26f8a6 100755 --- a/usr/local/www/status.php +++ b/usr/local/www/status.php @@ -8,7 +8,7 @@ * */ /* - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/status_captiveportal.php b/usr/local/www/status_captiveportal.php index 06a3885..5c608c4 100644 --- a/usr/local/www/status_captiveportal.php +++ b/usr/local/www/status_captiveportal.php @@ -5,7 +5,7 @@ part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/status_captiveportal_expire.php b/usr/local/www/status_captiveportal_expire.php index f572caf..5207b20 100644 --- a/usr/local/www/status_captiveportal_expire.php +++ b/usr/local/www/status_captiveportal_expire.php @@ -1,30 +1,30 @@ <?php /* - Copyright (C) 2007 Marcel Wiget <mwiget@mac.com>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2007 Marcel Wiget <mwiget@mac.com>. + Copyright (C) 2013-2015 Electric Sheep Fencing, LP - All rights reserved. + All rights reserved. - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ /* pfSense_MODULE: captiveportal diff --git a/usr/local/www/status_captiveportal_test.php b/usr/local/www/status_captiveportal_test.php index 7297c17..4caafb4 100644 --- a/usr/local/www/status_captiveportal_test.php +++ b/usr/local/www/status_captiveportal_test.php @@ -1,29 +1,30 @@ <?php /* - Copyright (C) 2007 Marcel Wiget <mwiget@mac.com>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + status_captiveportal_test.php + Copyright (C) 2007 Marcel Wiget <mwiget@mac.com>. + Copyright (C) 2013-2015 Electric Sheep Fencing, LP + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ /* pfSense_MODULE: captiveportal diff --git a/usr/local/www/status_captiveportal_voucher_rolls.php b/usr/local/www/status_captiveportal_voucher_rolls.php index a0e0366..7d54645 100644 --- a/usr/local/www/status_captiveportal_voucher_rolls.php +++ b/usr/local/www/status_captiveportal_voucher_rolls.php @@ -1,7 +1,9 @@ <?php /* + status_captiveportal_voucher_rolls.php + Copyright (C) 2007 Marcel Wiget <mwiget@mac.com>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/status_captiveportal_vouchers.php b/usr/local/www/status_captiveportal_vouchers.php index 3e892a4..094a046 100644 --- a/usr/local/www/status_captiveportal_vouchers.php +++ b/usr/local/www/status_captiveportal_vouchers.php @@ -1,29 +1,30 @@ <?php /* - Copyright (C) 2007 Marcel Wiget <mwiget@mac.com>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + status_captiveportal_vouchers.php + Copyright (C) 2007 Marcel Wiget <mwiget@mac.com>. + Copyright (C) 2013-2015 Electric Sheep Fencing, LP + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ /* pfSense_MODULE: captiveportal diff --git a/usr/local/www/status_dhcp_leases.php b/usr/local/www/status_dhcp_leases.php index c4effdc..88803c4 100644 --- a/usr/local/www/status_dhcp_leases.php +++ b/usr/local/www/status_dhcp_leases.php @@ -2,7 +2,7 @@ /* $Id$ */ /* status_dhcp_leases.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2004-2009 Scott Ullrich All rights reserved. diff --git a/usr/local/www/status_dhcpv6_leases.php b/usr/local/www/status_dhcpv6_leases.php index 8c14b9c..d91b803 100644 --- a/usr/local/www/status_dhcpv6_leases.php +++ b/usr/local/www/status_dhcpv6_leases.php @@ -2,7 +2,7 @@ /* $Id$ */ /* status_dhcpv6_leases.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2011 Seth Mos Copyright (C) 2004-2009 Scott Ullrich All rights reserved. diff --git a/usr/local/www/status_filter_reload.php b/usr/local/www/status_filter_reload.php index 0c3ddd4..21e12e6 100644 --- a/usr/local/www/status_filter_reload.php +++ b/usr/local/www/status_filter_reload.php @@ -2,7 +2,7 @@ /* $Id$ */ /* status_filter_reload.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2006 Scott Ullrich All rights reserved. diff --git a/usr/local/www/status_gateway_groups.php b/usr/local/www/status_gateway_groups.php index afbe890..20ea08f 100755 --- a/usr/local/www/status_gateway_groups.php +++ b/usr/local/www/status_gateway_groups.php @@ -5,7 +5,7 @@ part of pfSense (https://www.pfsense.org) Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/status_gateways.php b/usr/local/www/status_gateways.php index ba8aec9..a151788 100644 --- a/usr/local/www/status_gateways.php +++ b/usr/local/www/status_gateways.php @@ -5,7 +5,7 @@ part of pfSense (https://www.pfsense.org/) Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/status_graph.php b/usr/local/www/status_graph.php index c9c5a2c..3c8ba8f 100644 --- a/usr/local/www/status_graph.php +++ b/usr/local/www/status_graph.php @@ -3,7 +3,7 @@ /* status_graph.php Part of pfSense - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2004 Scott Ullrich All rights reserved. diff --git a/usr/local/www/status_graph_cpu.php b/usr/local/www/status_graph_cpu.php index 5d19310..a95c1e6 100644 --- a/usr/local/www/status_graph_cpu.php +++ b/usr/local/www/status_graph_cpu.php @@ -4,7 +4,7 @@ part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/status_interfaces.php b/usr/local/www/status_interfaces.php index ec07fd1..f98adea 100644 --- a/usr/local/www/status_interfaces.php +++ b/usr/local/www/status_interfaces.php @@ -4,7 +4,7 @@ status_interfaces.php part of pfSense Copyright (C) 2009 Scott Ullrich <sullrich@gmail.com>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/status_lb_pool.php b/usr/local/www/status_lb_pool.php index 1827d8d..6e689a3 100644 --- a/usr/local/www/status_lb_pool.php +++ b/usr/local/www/status_lb_pool.php @@ -5,7 +5,7 @@ part of pfSense (https://www.pfsense.org/) Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/status_lb_vs.php b/usr/local/www/status_lb_vs.php index 0cf8048..62ae530 100644 --- a/usr/local/www/status_lb_vs.php +++ b/usr/local/www/status_lb_vs.php @@ -5,7 +5,7 @@ part of pfSense (https://www.pfsense.org/) Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/status_ntpd.php b/usr/local/www/status_ntpd.php index d861c24..a5a68ad 100644 --- a/usr/local/www/status_ntpd.php +++ b/usr/local/www/status_ntpd.php @@ -6,7 +6,7 @@ Copyright (C) 2013 Dagorlad Copyright (C) 2012 Jim Pingle - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/status_openvpn.php b/usr/local/www/status_openvpn.php index 0a23330..492eded 100644 --- a/usr/local/www/status_openvpn.php +++ b/usr/local/www/status_openvpn.php @@ -1,15 +1,15 @@ <?php /* - status_ovpenvpn.php + status_openvpn.php - Copyright (C) 2005 Scott Ullrich, Colin Smith - Copyright (C) 2008 Shrew Soft Inc. - Copyright (C) 2010 Jim Pingle - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2005 Scott Ullrich, Colin Smith + Copyright (C) 2008 Shrew Soft Inc. + Copyright (C) 2010 Jim Pingle + Copyright (C) 2013-2015 Electric Sheep Fencing, LP - AJAX bits borrowed from diag_dump_states.php + AJAX bits borrowed from diag_dump_states.php - All rights reserved. + All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/usr/local/www/status_queues.php b/usr/local/www/status_queues.php index db19601..64e44c2 100644 --- a/usr/local/www/status_queues.php +++ b/usr/local/www/status_queues.php @@ -3,10 +3,10 @@ /* $Id$ */ /* status_queues.php - Part of the pfSense project + Part of the pfSense project Copyright (C) 2004, 2005 Scott Ullrich Copyright (C) 2009 Ermal Luçi - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/status_rrd_graph.php b/usr/local/www/status_rrd_graph.php index 190d461..cd9209d 100644 --- a/usr/local/www/status_rrd_graph.php +++ b/usr/local/www/status_rrd_graph.php @@ -4,7 +4,7 @@ status_rrd_graph.php Part of pfSense Copyright (C) 2007 Seth Mos <seth.mos@dds.nl> - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php index 8409392..a5fac63 100644 --- a/usr/local/www/status_rrd_graph_img.php +++ b/usr/local/www/status_rrd_graph_img.php @@ -4,7 +4,7 @@ status_rrd_graph_img.php Part of pfSense Copyright (C) 2009 Seth Mos <seth.mos@dds.nl> - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/status_rrd_graph_settings.php b/usr/local/www/status_rrd_graph_settings.php index bd9d544..2477a75 100644 --- a/usr/local/www/status_rrd_graph_settings.php +++ b/usr/local/www/status_rrd_graph_settings.php @@ -1,10 +1,10 @@ <?php /* $Id$ */ /* - status_rrd_graph.php + status_rrd_graph_settings.php Part of pfSense Copyright (C) 2007 Seth Mos <seth.mos@dds.nl> - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/status_services.php b/usr/local/www/status_services.php index 0b7542e..d78f8bb 100755 --- a/usr/local/www/status_services.php +++ b/usr/local/www/status_services.php @@ -1,30 +1,30 @@ <?php /* - services_status.php - Copyright (C) 2004, 2005 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INClUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + status_services.php + Copyright (C) 2004, 2005 Scott Ullrich + Copyright (C) 2013-2015 Electric Sheep Fencing, LP + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INClUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ /* pfSense_BUILDER_BINARIES: /usr/local/sbin/openvpn /usr/bin/killall /bin/ps diff --git a/usr/local/www/status_upnp.php b/usr/local/www/status_upnp.php index a0b34d4..82e3998 100644 --- a/usr/local/www/status_upnp.php +++ b/usr/local/www/status_upnp.php @@ -5,7 +5,7 @@ part of pfSense (https://www.pfsense.org/) Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/status_wireless.php b/usr/local/www/status_wireless.php index 8ee6f4e..e2f16e7 100644 --- a/usr/local/www/status_wireless.php +++ b/usr/local/www/status_wireless.php @@ -2,7 +2,7 @@ /* status_wireless.php Copyright (C) 2004 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/system.php b/usr/local/www/system.php index 1a571e8..820308a 100644 --- a/usr/local/www/system.php +++ b/usr/local/www/system.php @@ -5,7 +5,7 @@ part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php index 4314dee..11dc981 100644 --- a/usr/local/www/system_advanced_admin.php +++ b/usr/local/www/system_advanced_admin.php @@ -5,7 +5,7 @@ part of pfSense Copyright (C) 2005-2010 Scott Ullrich Copyright (C) 2008 Shrew Soft Inc - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP originally part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. diff --git a/usr/local/www/system_advanced_firewall.php b/usr/local/www/system_advanced_firewall.php index 6e39e44..28bd52c 100644 --- a/usr/local/www/system_advanced_firewall.php +++ b/usr/local/www/system_advanced_firewall.php @@ -5,7 +5,7 @@ part of pfSense Copyright (C) 2005-2007 Scott Ullrich Copyright (C) 2008 Shrew Soft Inc - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP originally part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php index 6f40870..0255d77 100644 --- a/usr/local/www/system_advanced_misc.php +++ b/usr/local/www/system_advanced_misc.php @@ -5,7 +5,7 @@ part of pfSense Copyright (C) 2005-2007 Scott Ullrich Copyright (C) 2008 Shrew Soft Inc - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP originally part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. diff --git a/usr/local/www/system_advanced_network.php b/usr/local/www/system_advanced_network.php index 1996cd8..8a1debd 100644 --- a/usr/local/www/system_advanced_network.php +++ b/usr/local/www/system_advanced_network.php @@ -4,7 +4,7 @@ part of pfSense Copyright (C) 2005-2007 Scott Ullrich Copyright (C) 2008 Shrew Soft Inc - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP originally part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. diff --git a/usr/local/www/system_advanced_notifications.php b/usr/local/www/system_advanced_notifications.php index cd23736..df4d52a 100644 --- a/usr/local/www/system_advanced_notifications.php +++ b/usr/local/www/system_advanced_notifications.php @@ -4,7 +4,7 @@ system_advanced_notifications.php part of pfSense Copyright (C) 2009 Scott Ullrich <sullrich@gmail.com> - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/usr/local/www/system_advanced_sysctl.php b/usr/local/www/system_advanced_sysctl.php index 4604e4c..29259e9 100644 --- a/usr/local/www/system_advanced_sysctl.php +++ b/usr/local/www/system_advanced_sysctl.php @@ -1,11 +1,11 @@ <?php /* $Id$ */ /* - system_advanced_misc.php + system_advanced_sysctl.php part of pfSense Copyright (C) 2005-2007 Scott Ullrich Copyright (C) 2008 Shrew Soft Inc - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP originally part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. diff --git a/usr/local/www/system_authservers.php b/usr/local/www/system_authservers.php index e6eff98..f626ffc 100644 --- a/usr/local/www/system_authservers.php +++ b/usr/local/www/system_authservers.php @@ -1,32 +1,32 @@ <?php /* - system_authservers.php - - Copyright (C) 2008 Shrew Soft Inc. - Copyright (C) 2010 Ermal Luçi - Copyright (C) 2013-2014 Electric Sheep Fencing, LP - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + system_authservers.php + + Copyright (C) 2008 Shrew Soft Inc. + Copyright (C) 2010 Ermal Luçi + Copyright (C) 2013-2015 Electric Sheep Fencing, LP + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ /* pfSense_MODULE: auth diff --git a/usr/local/www/system_camanager.php b/usr/local/www/system_camanager.php index c75931b..c10f0a3 100644 --- a/usr/local/www/system_camanager.php +++ b/usr/local/www/system_camanager.php @@ -1,34 +1,34 @@ <?php /* - system_camanager.php - - Copyright (C) 2008 Shrew Soft Inc. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + system_camanager.php + + Copyright (C) 2008 Shrew Soft Inc. + Copyright (C) 2013-2015 Electric Sheep Fencing, LP + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ /* - pfSense_MODULE: certificate_managaer + pfSense_MODULE: certificate_manager */ ##|+PRIV diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php index e2a0cc7..bdf4dff 100644 --- a/usr/local/www/system_certmanager.php +++ b/usr/local/www/system_certmanager.php @@ -1,34 +1,34 @@ <?php /* - system_certmanager.php - - Copyright (C) 2008 Shrew Soft Inc. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + system_certmanager.php + + Copyright (C) 2008 Shrew Soft Inc. + Copyright (C) 2013-2015 Electric Sheep Fencing, LP + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ /* - pfSense_MODULE: certificate_managaer + pfSense_MODULE: certificate_manager */ ##|+PRIV diff --git a/usr/local/www/system_crlmanager.php b/usr/local/www/system_crlmanager.php index 3dee187..a0a27b0 100644 --- a/usr/local/www/system_crlmanager.php +++ b/usr/local/www/system_crlmanager.php @@ -3,7 +3,7 @@ system_crlmanager.php Copyright (C) 2010 Jim Pingle - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. */ /* - pfSense_MODULE: certificate_managaer + pfSense_MODULE: certificate_manager */ ##|+PRIV diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php index 2c9b548..2eb0589 100644 --- a/usr/local/www/system_firmware.php +++ b/usr/local/www/system_firmware.php @@ -3,7 +3,7 @@ /* system_firmware.php Copyright (C) 2008 Scott Ullrich <sullrich@gmail.com> - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/system_firmware_auto.php b/usr/local/www/system_firmware_auto.php index fae129b..6e0ead5 100755 --- a/usr/local/www/system_firmware_auto.php +++ b/usr/local/www/system_firmware_auto.php @@ -4,7 +4,7 @@ system_firmware_auto.php Copyright (C) 2005 Scott Ullrich Copyright (C) 2008 Scott Ullrich <sullrich@gmail.com> - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Based originally on system_firmware.php (C)2003-2004 Manuel Kasper diff --git a/usr/local/www/system_firmware_check.php b/usr/local/www/system_firmware_check.php index 5e7962f..f38a5c2 100644 --- a/usr/local/www/system_firmware_check.php +++ b/usr/local/www/system_firmware_check.php @@ -1,9 +1,9 @@ <?php /* $Id$ */ /* - system_firmware.php + system_firmware_check.php Copyright (C) 2008 Scott Ullrich <sullrich@gmail.com> - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/system_firmware_restorefullbackup.php b/usr/local/www/system_firmware_restorefullbackup.php index 0849806..c482a29 100644 --- a/usr/local/www/system_firmware_restorefullbackup.php +++ b/usr/local/www/system_firmware_restorefullbackup.php @@ -3,7 +3,7 @@ /* system_firmware_restorefullbackup.php Copyright (C) 2011 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/system_firmware_settings.php b/usr/local/www/system_firmware_settings.php index f5cfd38..ec48469 100644 --- a/usr/local/www/system_firmware_settings.php +++ b/usr/local/www/system_firmware_settings.php @@ -2,10 +2,10 @@ /* $Id$ */ /* system_firmware_settings.php - part of pfSense - Copyright (C) 2005 Colin Smith + part of pfSense + Copyright (C) 2005 Colin Smith Copyright (C) 2008 Scott Ullrich <sullrich@gmail.com> - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/usr/local/www/system_gateway_groups.php b/usr/local/www/system_gateway_groups.php index 5b352d9..5de3930 100644 --- a/usr/local/www/system_gateway_groups.php +++ b/usr/local/www/system_gateway_groups.php @@ -5,7 +5,7 @@ part of pfSense (https://www.pfsense.org) Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/system_gateway_groups_edit.php b/usr/local/www/system_gateway_groups_edit.php index 79dd614..11b4dd5 100644 --- a/usr/local/www/system_gateway_groups_edit.php +++ b/usr/local/www/system_gateway_groups_edit.php @@ -5,7 +5,7 @@ part of pfSense (https://www.pfsense.org) Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/system_gateways.php b/usr/local/www/system_gateways.php index bf92b3e..1f1efc2 100644 --- a/usr/local/www/system_gateways.php +++ b/usr/local/www/system_gateways.php @@ -5,7 +5,7 @@ part of pfSense (https://www.pfsense.org) Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/system_gateways_edit.php b/usr/local/www/system_gateways_edit.php index 8583a57..8432e60 100644 --- a/usr/local/www/system_gateways_edit.php +++ b/usr/local/www/system_gateways_edit.php @@ -5,7 +5,7 @@ part of pfSense (https://www.pfsense.org) Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/system_groupmanager.php b/usr/local/www/system_groupmanager.php index 5b91179..7dad59e 100644 --- a/usr/local/www/system_groupmanager.php +++ b/usr/local/www/system_groupmanager.php @@ -4,7 +4,7 @@ part of m0n0wall (http://m0n0.ch/wall) part of pfSense - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Copyright (C) 2008 Shrew Soft Inc. diff --git a/usr/local/www/system_groupmanager_addprivs.php b/usr/local/www/system_groupmanager_addprivs.php index d33de21..8f7afec 100644 --- a/usr/local/www/system_groupmanager_addprivs.php +++ b/usr/local/www/system_groupmanager_addprivs.php @@ -3,7 +3,7 @@ /* system_groupmanager_addprivs.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2006 Daniel S. Haischt. All rights reserved. diff --git a/usr/local/www/system_hasync.php b/usr/local/www/system_hasync.php index f77f666..7816665 100755 --- a/usr/local/www/system_hasync.php +++ b/usr/local/www/system_hasync.php @@ -5,7 +5,7 @@ part of pfSense (https://www.pfsense.org/) Copyright (C) 2012 Darren Embry <dse@webonastick.com>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/system_routes.php b/usr/local/www/system_routes.php index 74e428b..2e037cd 100644 --- a/usr/local/www/system_routes.php +++ b/usr/local/www/system_routes.php @@ -6,7 +6,7 @@ part of pfSense Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/system_routes_edit.php b/usr/local/www/system_routes_edit.php index 84e0f92..c1f32e4 100644 --- a/usr/local/www/system_routes_edit.php +++ b/usr/local/www/system_routes_edit.php @@ -5,7 +5,7 @@ part of pfSense Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. Copyright (C) 2010 Scott Ullrich - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php index 74ecff7..52ccd27 100644 --- a/usr/local/www/system_usermanager.php +++ b/usr/local/www/system_usermanager.php @@ -5,7 +5,7 @@ part of m0n0wall (http://m0n0.ch/wall) part of pfSense - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Copyright (C) 2008 Shrew Soft Inc. diff --git a/usr/local/www/system_usermanager_addprivs.php b/usr/local/www/system_usermanager_addprivs.php index 773f54a..1a7b4cf 100644 --- a/usr/local/www/system_usermanager_addprivs.php +++ b/usr/local/www/system_usermanager_addprivs.php @@ -3,7 +3,7 @@ /* system_usermanager_addprivs.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Copyright (C) 2006 Daniel S. Haischt. diff --git a/usr/local/www/system_usermanager_passwordmg.php b/usr/local/www/system_usermanager_passwordmg.php index c3dba2a..0a5b3fc 100644 --- a/usr/local/www/system_usermanager_passwordmg.php +++ b/usr/local/www/system_usermanager_passwordmg.php @@ -1,30 +1,30 @@ <?php /* $Id$ */ /* - Copyright (C) 2013-2014 Electric Sheep Fencing, LP - Copyright (C) 2011 Ermal Luçi - system_usermanager.php - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + Copyright (C) 2013-2015 Electric Sheep Fencing, LP + Copyright (C) 2011 Ermal Luçi + system_usermanager_passwordmg.php + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ /* pfSense_BUILDER_BINARIES: diff --git a/usr/local/www/system_usermanager_settings.php b/usr/local/www/system_usermanager_settings.php index fae7a8a..6bf84ab 100644 --- a/usr/local/www/system_usermanager_settings.php +++ b/usr/local/www/system_usermanager_settings.php @@ -1,11 +1,13 @@ <?php /* $Id$ */ /* + system_usermanager_settings.php + part of pfSense (https://www.pfsense.org/) Copyright (C) 2007 Scott Ullrich <sullrich@gmail.com> Copyright (C) 2007 Bill Marquette <bill.marquette@gmail.com> - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/system_usermanager_settings_ldapacpicker.php b/usr/local/www/system_usermanager_settings_ldapacpicker.php index 92a4d6c..e7d5f7b 100644 --- a/usr/local/www/system_usermanager_settings_ldapacpicker.php +++ b/usr/local/www/system_usermanager_settings_ldapacpicker.php @@ -1,31 +1,32 @@ <?php /* $Id$ */ /* - part of pfSense (https://www.pfsense.org/) - Copyright (C) 2007 Scott Ullrich <sullrich@gmail.com> - Copyright (C) 2013-2014 Electric Sheep Fencing, LP - All rights reserved. + system_usermanager_settings_ldapacpicker.php + part of pfSense (https://www.pfsense.org/) + Copyright (C) 2007 Scott Ullrich <sullrich@gmail.com> + Copyright (C) 2013-2015 Electric Sheep Fencing, LP + All rights reserved. - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ /* pfSense_MODULE: auth diff --git a/usr/local/www/system_usermanager_settings_test.php b/usr/local/www/system_usermanager_settings_test.php index 6b5b59e..2dcba45 100755 --- a/usr/local/www/system_usermanager_settings_test.php +++ b/usr/local/www/system_usermanager_settings_test.php @@ -1,32 +1,33 @@ <?php /* $Id$ */ /* - part of pfSense (https://www.pfsense.org/) - Copyright (C) 2007 Scott Ullrich <sullrich@gmail.com> - Copyright (C) 2013-2014 Electric Sheep Fencing, LP - Copyright (C) 2014 Silvio Giunge <desenvolvimento@bluepex.com> - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + system_usermanager_settings_test.php + part of pfSense (https://www.pfsense.org/) + Copyright (C) 2007 Scott Ullrich <sullrich@gmail.com> + Copyright (C) 2013-2015 Electric Sheep Fencing, LP + Copyright (C) 2014 Silvio Giunge <desenvolvimento@bluepex.com> + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ /* pfSense_MODULE: auth diff --git a/usr/local/www/uploadconfig.php b/usr/local/www/uploadconfig.php index 0689248..35e7c55 100644 --- a/usr/local/www/uploadconfig.php +++ b/usr/local/www/uploadconfig.php @@ -5,7 +5,7 @@ part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/vpn_ipsec.php b/usr/local/www/vpn_ipsec.php index f5eb5d5..f37fe21 100644 --- a/usr/local/www/vpn_ipsec.php +++ b/usr/local/www/vpn_ipsec.php @@ -6,7 +6,7 @@ Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>. Copyright (C) 2008 Shrew Soft Inc - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/vpn_ipsec_keys.php b/usr/local/www/vpn_ipsec_keys.php index 166d421..a9bd0f0 100644 --- a/usr/local/www/vpn_ipsec_keys.php +++ b/usr/local/www/vpn_ipsec_keys.php @@ -5,7 +5,7 @@ part of pfSense Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/vpn_ipsec_keys_edit.php b/usr/local/www/vpn_ipsec_keys_edit.php index bf570b3..741f4ed 100644 --- a/usr/local/www/vpn_ipsec_keys_edit.php +++ b/usr/local/www/vpn_ipsec_keys_edit.php @@ -5,7 +5,7 @@ part of pfSense Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/vpn_ipsec_mobile.php b/usr/local/www/vpn_ipsec_mobile.php index 9346e01..5bba4d1 100644 --- a/usr/local/www/vpn_ipsec_mobile.php +++ b/usr/local/www/vpn_ipsec_mobile.php @@ -3,7 +3,7 @@ vpn_ipsec_mobile.php Copyright (C) 2008 Shrew Soft Inc - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/vpn_ipsec_phase1.php b/usr/local/www/vpn_ipsec_phase1.php index a615fb5..a0735b5 100644 --- a/usr/local/www/vpn_ipsec_phase1.php +++ b/usr/local/www/vpn_ipsec_phase1.php @@ -6,7 +6,7 @@ Copyright (C) 2008 Shrew Soft Inc Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>. Copyright (C) 2014 Ermal LUÇI - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without @@ -123,12 +123,12 @@ if (isset($p1index) && $a_phase1[$p1index]) { $pconfig['interface'] = "wan"; if($config['interfaces']['lan']) $pconfig['localnet'] = "lan"; - $pconfig['mode'] = "aggressive"; + $pconfig['mode'] = "main"; $pconfig['protocol'] = "inet"; $pconfig['myid_type'] = "myaddress"; $pconfig['peerid_type'] = "peeraddress"; $pconfig['authentication_method'] = "pre_shared_key"; - $pconfig['ealgo'] = array( name => "3des" ); + $pconfig['ealgo'] = array( name => "aes" ); $pconfig['halgo'] = "sha1"; $pconfig['dhgroup'] = "2"; $pconfig['lifetime'] = "28800"; @@ -137,8 +137,10 @@ if (isset($p1index) && $a_phase1[$p1index]) { $pconfig['iketype'] = "ikev1"; /* mobile client */ - if($_GET['mobile']) + if($_GET['mobile']) { $pconfig['mobile']=true; + $pconfig['mode'] = "aggressive"; + } } if (isset($_GET['dup']) && is_numericint($_GET['dup'])) diff --git a/usr/local/www/vpn_ipsec_phase2.php b/usr/local/www/vpn_ipsec_phase2.php index 83e6a32..6f07408 100644 --- a/usr/local/www/vpn_ipsec_phase2.php +++ b/usr/local/www/vpn_ipsec_phase2.php @@ -5,7 +5,7 @@ Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>. Copyright (C) 2008 Shrew Soft Inc - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without @@ -105,8 +105,8 @@ else $pconfig['localid_type'] = "lan"; $pconfig['remoteid_type'] = "network"; $pconfig['proto'] = "esp"; - $pconfig['ealgos'] = explode(",", "3des,blowfish,cast128,aes"); - $pconfig['halgos'] = explode(",", "hmac_sha1,hmac_md5"); + $pconfig['ealgos'] = explode(",", "aes"); + $pconfig['halgos'] = explode(",", "hmac_sha1"); $pconfig['pfsgroup'] = "0"; $pconfig['lifetime'] = "3600"; $pconfig['uniqid'] = uniqid(); @@ -259,13 +259,13 @@ if ($_POST) { if (isset($pconfig['localid_address'])) $entered_local['address'] = $pconfig['localid_address']; if (isset($pconfig['localid_netbits'])) $entered_local['netbits'] = $pconfig['localid_netbits']; $entered_localid_data = ipsec_idinfo_to_cidr($entered_local, false, $pconfig['mode']); - list($entered_local_network, $entered_local_mask) = split("/", $entered_localid_data); + list($entered_local_network, $entered_local_mask) = explode('/', $entered_localid_data); $entered_remote = array(); $entered_remote['type'] = $pconfig['remoteid_type']; if (isset($pconfig['remoteid_address'])) $entered_remote['address'] = $pconfig['remoteid_address']; if (isset($pconfig['remoteid_netbits'])) $entered_remote['netbits'] = $pconfig['remoteid_netbits']; $entered_remoteid_data = ipsec_idinfo_to_cidr($entered_remote, false, $pconfig['mode']); - list($entered_remote_network, $entered_remote_mask) = split("/", $entered_remoteid_data); + list($entered_remote_network, $entered_remote_mask) = explode('/', $entered_remoteid_data); if ($phase1['protocol'] == "inet6") { $if = get_failover_interface($phase1['interface'], "inet6"); $interfaceip = get_interface_ipv6($if); diff --git a/usr/local/www/vpn_ipsec_settings.php b/usr/local/www/vpn_ipsec_settings.php index c753048..9de5a26 100644 --- a/usr/local/www/vpn_ipsec_settings.php +++ b/usr/local/www/vpn_ipsec_settings.php @@ -2,7 +2,7 @@ /* vpn_ipsec_settings.php - Copyright (C) 2014 Electric Sheep Fencing, LLC + Copyright (C) 2015 Electric Sheep Fencing, LLC All rights reserved. Redistribution and use in source and binary forms, with or without @@ -46,7 +46,8 @@ foreach ($ipsec_loglevels as $lkey => $ldescr) { if (!empty($config['ipsec']["ipsec_{$lkey}"])) $pconfig["ipsec_{$lkey}"] = $config['ipsec']["ipsec_{$lkey}"]; } -$pconfig['failoverforcereload'] = isset($config['ipsec']['failoverforcereload']); +$pconfig['unityplugin'] = isset($config['ipsec']['unityplugin']); +$pconfig['compression'] = isset($config['ipsec']['compression']); $pconfig['acceptunencryptedmainmode'] = isset($config['ipsec']['acceptunencryptedmainmode']); $pconfig['maxmss_enable'] = isset($config['system']['maxmss_enable']); $pconfig['maxmss'] = $config['system']['maxmss']; @@ -129,10 +130,15 @@ if ($_POST) { } } - if($_POST['failoverforcereload'] == "yes") - $config['ipsec']['failoverforcereload'] = true; - elseif (isset($config['ipsec']['failoverforcereload'])) - unset($config['ipsec']['failoverforcereload']); + if($_POST['compression'] == "yes") + $config['ipsec']['compression'] = true; + elseif (isset($config['ipsec']['compression'])) + unset($config['ipsec']['compression']); + + if($_POST['unityplugin'] == "yes") + $config['ipsec']['unityplugin'] = true; + elseif (isset($config['ipsec']['unityplugin'])) + unset($config['ipsec']['unityplugin']); if($_POST['acceptunencryptedmainmode'] == "yes") $config['ipsec']['acceptunencryptedmainmode'] = true; @@ -256,15 +262,12 @@ function maxmss_checked(obj) { </td> </tr> <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("IPsec Reload on Failover"); ?></td> + <td width="22%" valign="top" class="vncell"><?=gettext("IP Compression"); ?></td> <td width="78%" class="vtable"> - <input name="failoverforcereload" type="checkbox" id="failoverforcereload" value="yes" <?php if ($pconfig['failoverforcereload']) echo "checked=\"checked\""; ?> /> - <strong><?=gettext("Force IPsec Reload on Failover"); ?></strong> + <input name="compression" type="checkbox" id="compression" value="yes" <?php if ($pconfig['compression']) echo "checked=\"checked\""; ?> /> + <strong><?=gettext("Enable IPCompression"); ?></strong> <br /> - <?=gettext("In some circumstances using a gateway group as the interface for " . - "an IPsec tunnel does not function properly, and IPsec must be forcefully reloaded " . - "when a failover occurs. Because this will disrupt all IPsec tunnels, this behavior" . - " is disabled by default. Check this box to force IPsec to fully reload on failover."); ?> + <?=gettext("IPComp compression of content is proposed on the connection."); ?> </td> </tr> <tr> @@ -292,6 +295,15 @@ function maxmss_checked(obj) { </td> </tr> <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Disable Cisco Extensions"); ?></td> + <td width="78%" class="vtable"> + <input name="unityplugin" type="checkbox" id="unityplugin" value="yes" <?php if ($pconfig['unityplugin'] == true) echo "checked=\"checked\""; ?> /> + <strong><?=gettext("Disable Unity Plugin"); ?></strong> + <br /> + <?=gettext("Disable Unity Plugin which provides Cisco Extension support as Split-Include, Split-Exclude, Split-Dns, ..."); ?> + </td> + </tr> + <tr> <td width="22%" valign="top"> </td> <td width="78%"> <input name="submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" /> diff --git a/usr/local/www/vpn_l2tp.php b/usr/local/www/vpn_l2tp.php index 2404dc2..2cf2196 100644 --- a/usr/local/www/vpn_l2tp.php +++ b/usr/local/www/vpn_l2tp.php @@ -4,7 +4,7 @@ part of pfSense Copyright (C) 2005 Scott Ullrich (sullrich@gmail.com) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/vpn_l2tp_users.php b/usr/local/www/vpn_l2tp_users.php index 14aa6bb..42cd8cf 100644 --- a/usr/local/www/vpn_l2tp_users.php +++ b/usr/local/www/vpn_l2tp_users.php @@ -4,7 +4,7 @@ part of pfSense Copyright (C) 2005 Scott Ullrich (sullrich@gmail.com) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/vpn_l2tp_users_edit.php b/usr/local/www/vpn_l2tp_users_edit.php index 2c5d754..2d905a0 100644 --- a/usr/local/www/vpn_l2tp_users_edit.php +++ b/usr/local/www/vpn_l2tp_users_edit.php @@ -4,7 +4,7 @@ part of pfSense Copyright (C) 2006 Scott Ullrich (sullrich@gmail.com) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/vpn_openvpn_client.php b/usr/local/www/vpn_openvpn_client.php index b3e9c9f..2648f0d 100644 --- a/usr/local/www/vpn_openvpn_client.php +++ b/usr/local/www/vpn_openvpn_client.php @@ -3,7 +3,7 @@ vpn_openvpn_client.php Copyright (C) 2008 Shrew Soft Inc. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/vpn_openvpn_csc.php b/usr/local/www/vpn_openvpn_csc.php index be0e3cf..6c0db13 100644 --- a/usr/local/www/vpn_openvpn_csc.php +++ b/usr/local/www/vpn_openvpn_csc.php @@ -3,7 +3,7 @@ vpn_openvpn_csc.php Copyright (C) 2008 Shrew Soft Inc. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php index 75f889e..71686d2 100644 --- a/usr/local/www/vpn_openvpn_server.php +++ b/usr/local/www/vpn_openvpn_server.php @@ -3,7 +3,7 @@ vpn_openvpn_server.php Copyright (C) 2008 Shrew Soft Inc. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without @@ -801,12 +801,12 @@ if ($savemsg) <?php $authmodes = explode(",", $pconfig['authmode']); ?> <?php $auth_servers = auth_get_authserver_list(); - foreach ($auth_servers as $auth_server): + foreach ($auth_servers as $auth_server_key => $auth_server): $selected = ""; - if (in_array($auth_server['name'], $authmodes)) + if (in_array($auth_server_key, $authmodes)) $selected = "selected=\"selected\""; ?> - <option value="<?=$auth_server['name'];?>" <?=$selected;?>><?=$auth_server['name'];?></option> + <option value="<?=$auth_server_key;?>" <?=$selected;?>><?=$auth_server['name'];?></option> <?php endforeach; ?> </select> </td> diff --git a/usr/local/www/vpn_pppoe.php b/usr/local/www/vpn_pppoe.php index 4de39b4..ba7154c 100644 --- a/usr/local/www/vpn_pppoe.php +++ b/usr/local/www/vpn_pppoe.php @@ -1,7 +1,8 @@ <?php /* + vpn_pppoe.php Copyright (C) 2010 Ermal Luci - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/vpn_pppoe_edit.php b/usr/local/www/vpn_pppoe_edit.php index 9a062b3..f81f16b 100644 --- a/usr/local/www/vpn_pppoe_edit.php +++ b/usr/local/www/vpn_pppoe_edit.php @@ -5,7 +5,7 @@ Copyright (C) 2005 Scott Ullrich (sullrich@gmail.com) Copyright (C) 2010 Ermal Luçi - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/vpn_pptp.php b/usr/local/www/vpn_pptp.php index 21e9ce3..b6ded68 100644 --- a/usr/local/www/vpn_pptp.php +++ b/usr/local/www/vpn_pptp.php @@ -4,7 +4,7 @@ part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/vpn_pptp_users.php b/usr/local/www/vpn_pptp_users.php index 2c63d4f..553888f 100644 --- a/usr/local/www/vpn_pptp_users.php +++ b/usr/local/www/vpn_pptp_users.php @@ -4,7 +4,7 @@ part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/vpn_pptp_users_edit.php b/usr/local/www/vpn_pptp_users_edit.php index ea85923..936ac20 100644 --- a/usr/local/www/vpn_pptp_users_edit.php +++ b/usr/local/www/vpn_pptp_users_edit.php @@ -5,7 +5,7 @@ part of pfSense Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/widgets/widgets/captive_portal_status.widget.php b/usr/local/www/widgets/widgets/captive_portal_status.widget.php index 655648b..faba5c5 100644 --- a/usr/local/www/widgets/widgets/captive_portal_status.widget.php +++ b/usr/local/www/widgets/widgets/captive_portal_status.widget.php @@ -1,7 +1,7 @@ <?php /* captive_portal_status.widget.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Copyright (C) 2007 Sam Wenham diff --git a/usr/local/www/widgets/widgets/carp_status.widget.php b/usr/local/www/widgets/widgets/carp_status.widget.php index 2444669..0bc9258 100644 --- a/usr/local/www/widgets/widgets/carp_status.widget.php +++ b/usr/local/www/widgets/widgets/carp_status.widget.php @@ -5,7 +5,7 @@ Copyright (C) 2007 Sam Wenham All rights reserved. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/widgets/widgets/deactivated/cpu_graphs.widget.php b/usr/local/www/widgets/widgets/deactivated/cpu_graphs.widget.php index 72ebb88..67d2b97 100644 --- a/usr/local/www/widgets/widgets/deactivated/cpu_graphs.widget.php +++ b/usr/local/www/widgets/widgets/deactivated/cpu_graphs.widget.php @@ -2,7 +2,7 @@ /* $Id$ - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Copyright 2007 Scott Dale diff --git a/usr/local/www/widgets/widgets/dyn_dns_status.widget.php b/usr/local/www/widgets/widgets/dyn_dns_status.widget.php index 95f9471..98160c5 100644 --- a/usr/local/www/widgets/widgets/dyn_dns_status.widget.php +++ b/usr/local/www/widgets/widgets/dyn_dns_status.widget.php @@ -6,7 +6,7 @@ Copyright (C) 2013 Stanley P. Miller \ stan-qaz All rights reserved. - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without @@ -59,7 +59,7 @@ if($_REQUEST['getdyndnsstatus']) { $filename = "{$g['conf_path']}/dyndns_{$dyndns['interface']}{$dyndns['type']}" . escapeshellarg($dyndns['host']) . "{$dyndns['id']}.cache"; if (file_exists($filename)) { $ipaddr = dyndnsCheckIP($dyndns['interface']); - $cached_ip_s = split(":", file_get_contents($filename)); + $cached_ip_s = explode(':', file_get_contents($filename)); $cached_ip = $cached_ip_s[0]; if ($ipaddr <> $cached_ip) echo "<font color='red'>"; diff --git a/usr/local/www/widgets/widgets/gateways.widget.php b/usr/local/www/widgets/widgets/gateways.widget.php index 8ba70c8..a5a7bbb 100644 --- a/usr/local/www/widgets/widgets/gateways.widget.php +++ b/usr/local/www/widgets/widgets/gateways.widget.php @@ -1,11 +1,11 @@ <?php /* - $Id$ + gateways.widget.php Copyright 2008 Seth Mos Part of pfSense widgets (https://www.pfsense.org) originally based on m0n0wall (http://m0n0.ch/wall) - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/widgets/widgets/gmirror_status.widget.php b/usr/local/www/widgets/widgets/gmirror_status.widget.php index c692ad7..f406236 100644 --- a/usr/local/www/widgets/widgets/gmirror_status.widget.php +++ b/usr/local/www/widgets/widgets/gmirror_status.widget.php @@ -2,7 +2,7 @@ /* gmirror_status.widget.php Copyright (C) 2009-2010 Jim Pingle - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/usr/local/www/widgets/widgets/installed_packages.widget.php b/usr/local/www/widgets/widgets/installed_packages.widget.php index f638793..193fcfb 100644 --- a/usr/local/www/widgets/widgets/installed_packages.widget.php +++ b/usr/local/www/widgets/widgets/installed_packages.widget.php @@ -1,6 +1,6 @@ <?php /* - $Id$ + installed_packages.widget.php Copyright (C) 2013-2014 Electric Sheep Fencing, LP Copyright 2007 Scott Dale diff --git a/usr/local/www/widgets/widgets/interface_statistics.widget.php b/usr/local/www/widgets/widgets/interface_statistics.widget.php index 63d5056..5c6f3d4 100644 --- a/usr/local/www/widgets/widgets/interface_statistics.widget.php +++ b/usr/local/www/widgets/widgets/interface_statistics.widget.php @@ -1,7 +1,7 @@ <?php /* $Id: interface_statistics.widget.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright 2007 Scott Dale Part of pfSense widgets (https://www.pfsense.org) diff --git a/usr/local/www/widgets/widgets/interfaces.widget.php b/usr/local/www/widgets/widgets/interfaces.widget.php index a6b1eb9..40c9aed 100644 --- a/usr/local/www/widgets/widgets/interfaces.widget.php +++ b/usr/local/www/widgets/widgets/interfaces.widget.php @@ -1,7 +1,7 @@ <?php /* - $Id$ - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + interfaces.widget.php + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright 2007 Scott Dale Part of pfSense widgets (https://www.pfsense.org) diff --git a/usr/local/www/widgets/widgets/ipsec.widget.php b/usr/local/www/widgets/widgets/ipsec.widget.php index a4008e2..d993323 100644 --- a/usr/local/www/widgets/widgets/ipsec.widget.php +++ b/usr/local/www/widgets/widgets/ipsec.widget.php @@ -1,7 +1,7 @@ <?php /* - $Id$ - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + ipsec.widget.php + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright 2007 Scott Dale Part of pfSense widgets (https://www.pfsense.org) @@ -66,7 +66,7 @@ if (isset($config['ipsec']['phase1'])) { $ipsec_status['query']['ikesalist']['ikesa'] = array(); $ipsec_detail_array = array(); - $ikev1num = array(); + $ikenum = array(); if (isset($config['ipsec']['phase2'])) { foreach ($config['ipsec']['phase2'] as $ph2ent) { if ($ph2ent['remoteid']['type'] == "mobile") @@ -75,24 +75,29 @@ if (isset($config['ipsec']['phase1'])) { if (!ipsec_lookup_phase1($ph2ent,$ph1ent)) continue; + if ($ph2ent['remoteid']['type'] == "mobile" || isset($ph1ent['mobile'])) + continue; if (isset($ph1ent['disabled']) || isset($ph2ent['disabled'])) continue; - if ($ph1ent['iketype'] == 'ikev1') { - if (!isset($ikev1num[$ph1ent['ikeid']])) - $ikev1num[$ph1ent['ikeid']] = 0; + if (empty($ph1ent['iketype']) || $ph1ent['iketype'] == 'ikev1') { + if (!isset($ikenum[$ph1ent['ikeid']])) + $ikenum[$ph1ent['ikeid']] = 0; else - $ikev1num[$ph1ent['ikeid']]++; - $ikeid = "con{$ph1ent['ikeid']}00" . $ikev1num[$ph1ent['ikeid']]; - } else + $ikenum[$ph1ent['ikeid']]++; + $ikeid = "con{$ph1ent['ikeid']}00" . $ikenum[$ph1ent['ikeid']]; + } else { + if (isset($ikenum[$ph1ent['ikeid']])) + continue; $ikeid = "con{$ph1ent['ikeid']}"; + $ikenum[$ph1ent['ikeid']] = true; + } $found = false; foreach ($ipsec_status['query']['ikesalist']['ikesa'] as $ikesa) { if ($ikeid == $ikesa['peerconfig']) { $found = true; - $ph2ikeid = $ikesa['id']; - if (ipsec_phase1_status($ipsec_status['query']['ikesalist']['ikesa'], $ph2ikeid)) { + if ($ikesa['status'] == 'established') { /* tunnel is up */ $iconfn = "true"; $activecounter++; @@ -117,7 +122,7 @@ if (isset($config['ipsec']['phase1'])) { 'status' => $iconfn); } } - unset($ikev1num); + unset($ikenum); } if (isset($config['ipsec']['phase2'])): ?> diff --git a/usr/local/www/widgets/widgets/load_balancer_status.widget.php b/usr/local/www/widgets/widgets/load_balancer_status.widget.php index 4616efb..a33cb21 100644 --- a/usr/local/www/widgets/widgets/load_balancer_status.widget.php +++ b/usr/local/www/widgets/widgets/load_balancer_status.widget.php @@ -1,6 +1,7 @@ <?php /* - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + load_balancer_status.widget.php + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright 2010 Jim Pingle Portions copied from status_lb_pool.php, status_lb_vs.php, and vslb.inc: diff --git a/usr/local/www/widgets/widgets/log.widget.php b/usr/local/www/widgets/widgets/log.widget.php index e799dc2..86ac261 100644 --- a/usr/local/www/widgets/widgets/log.widget.php +++ b/usr/local/www/widgets/widgets/log.widget.php @@ -1,7 +1,7 @@ <?php /* - $Id$ - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + log.widget.php + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright 2007 Scott Dale Part of pfSense widgets (https://www.pfsense.org) diff --git a/usr/local/www/widgets/widgets/ntp_status.widget.php b/usr/local/www/widgets/widgets/ntp_status.widget.php index adaea63..9cf814b 100644 --- a/usr/local/www/widgets/widgets/ntp_status.widget.php +++ b/usr/local/www/widgets/widgets/ntp_status.widget.php @@ -1,7 +1,7 @@ <?php /* - $Id$ - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + ntp_status.widget.php + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright 2007 Scott Dale Part of pfSense widgets (https://www.pfsense.org) diff --git a/usr/local/www/widgets/widgets/openvpn.widget.php b/usr/local/www/widgets/widgets/openvpn.widget.php index aeff3f3..29d7d05 100644 --- a/usr/local/www/widgets/widgets/openvpn.widget.php +++ b/usr/local/www/widgets/widgets/openvpn.widget.php @@ -1,6 +1,31 @@ <?php -/* Copyright (C) 2013-2014 Electric Sheep Fencing, LP */ +/* + openvpn.widget.php + Copyright (C) 2013-2015 Electric Sheep Fencing, LP + Part of pfSense widgets (https://www.pfsense.org) + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. +*/ $nocsrf = true; diff --git a/usr/local/www/widgets/widgets/picture.widget.php b/usr/local/www/widgets/widgets/picture.widget.php index 84f391d..eb9fdbf 100644 --- a/usr/local/www/widgets/widgets/picture.widget.php +++ b/usr/local/www/widgets/widgets/picture.widget.php @@ -1,7 +1,7 @@ <?php /* - $Id$ - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + picture.widget.php + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright 2009 Scott Ullrich Part of pfSense widgets (https://www.pfsense.org) diff --git a/usr/local/www/widgets/widgets/rss.widget.php b/usr/local/www/widgets/widgets/rss.widget.php index 02790ca..93b33a9 100644 --- a/usr/local/www/widgets/widgets/rss.widget.php +++ b/usr/local/www/widgets/widgets/rss.widget.php @@ -1,7 +1,7 @@ <?php /* - $Id$ - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + rss.widget.php + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright 2009 Scott Ullrich Part of pfSense widgets (https://www.pfsense.org) diff --git a/usr/local/www/widgets/widgets/services_status.widget.php b/usr/local/www/widgets/widgets/services_status.widget.php index 7ece14e..92c7669 100644 --- a/usr/local/www/widgets/widgets/services_status.widget.php +++ b/usr/local/www/widgets/widgets/services_status.widget.php @@ -1,7 +1,7 @@ <?php /* services_status.widget.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2004, 2005 Scott Ullrich All rights reserved. diff --git a/usr/local/www/widgets/widgets/smart_status.widget.php b/usr/local/www/widgets/widgets/smart_status.widget.php index f350308..e18d5f2 100644 --- a/usr/local/www/widgets/widgets/smart_status.widget.php +++ b/usr/local/www/widgets/widgets/smart_status.widget.php @@ -1,6 +1,7 @@ <?php /* - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + smart_status.widget.php + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright 2012 mkirbst @ pfSense Forum Part of pfSense widgets (https://www.pfsense.org) All rights reserved. diff --git a/usr/local/www/widgets/widgets/system_information.widget.php b/usr/local/www/widgets/widgets/system_information.widget.php index 1b0fbd4..1096de3 100644 --- a/usr/local/www/widgets/widgets/system_information.widget.php +++ b/usr/local/www/widgets/widgets/system_information.widget.php @@ -1,7 +1,7 @@ <?php /* - $Id$ - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + system_information.widget.php + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright 2007 Scott Dale Part of pfSense widgets (https://www.pfsense.org) originally based on m0n0wall (http://m0n0.ch/wall) diff --git a/usr/local/www/widgets/widgets/thermal_sensors.widget.php b/usr/local/www/widgets/widgets/thermal_sensors.widget.php index 5d90ae2..b7ff024 100644 --- a/usr/local/www/widgets/widgets/thermal_sensors.widget.php +++ b/usr/local/www/widgets/widgets/thermal_sensors.widget.php @@ -1,10 +1,10 @@ <?php /* $Id: thermal_sensors.widget.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Description: Thermal Sensors Widget. - NOTE: depends on proper config in System >> Advanced >> Miscellaneous tab >> Thermal Sensors section. + NOTE: depends on proper config in System >> Advanced >> Miscellaneous tab >> Thermal Sensors section. File location: \usr\local\www\widgets\widgets\ diff --git a/usr/local/www/widgets/widgets/traffic_graphs.widget.php b/usr/local/www/widgets/widgets/traffic_graphs.widget.php index f6745b5..576bdcc 100644 --- a/usr/local/www/widgets/widgets/traffic_graphs.widget.php +++ b/usr/local/www/widgets/widgets/traffic_graphs.widget.php @@ -1,7 +1,7 @@ <?php /* - $Id$ - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + traffic_graphs.widget.php + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright 2007 Scott Dale Part of pfSense widgets (https://www.pfsense.org) diff --git a/usr/local/www/widgets/widgets/wake_on_lan.widget.php b/usr/local/www/widgets/widgets/wake_on_lan.widget.php index 93edf75..5939711 100644 --- a/usr/local/www/widgets/widgets/wake_on_lan.widget.php +++ b/usr/local/www/widgets/widgets/wake_on_lan.widget.php @@ -1,7 +1,7 @@ <?php /* wake_on_lan.widget.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2010 Yehuda Katz diff --git a/usr/local/www/wizard.php b/usr/local/www/wizard.php index 99d65b4..251c58f 100644 --- a/usr/local/www/wizard.php +++ b/usr/local/www/wizard.php @@ -2,7 +2,7 @@ /* $Id$ */ /* wizard.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2010 Ermal Luçi Copyright (C) 2004 Scott Ullrich All rights reserved. diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php index 29225fa..2f2d944 100755 --- a/usr/local/www/xmlrpc.php +++ b/usr/local/www/xmlrpc.php @@ -1,33 +1,31 @@ <?php /* - $Id$ - - xmlrpc.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP - Copyright (C) 2009, 2010 Scott Ullrich - Copyright (C) 2005 Colin Smith - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + xmlrpc.php + Copyright (C) 2013-2015 Electric Sheep Fencing, LP + Copyright (C) 2009, 2010 Scott Ullrich + Copyright (C) 2005 Colin Smith + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ ##|+PRIV |
