diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..1c8fa11ea --- /dev/null +++ b/LICENSE @@ -0,0 +1,75 @@ +Copyright (c) 2014-2017 Ad Schellevis +Copyright (c) 2004 Bachman Kharazmi +Copyright (c) 2005-2008 Bill Marquette +Copyright (c) 2003-2005 Bob Zoller +Copyright (c) 2012 Carlos Cesario +Copyright (c) 2005-2006 Colin Smith +Copyright (c) 2013 Dagorlad +Copyright (c) 2006 Daniel S. Haischt +Copyright (c) 2012 Darren Embry +Copyright (c) 2005-2012 David Zeller +Copyright (c) 2014-2017 Deciso B.V. +Copyright (c) 2015-2016 Deciso B.V. - Ad Schellevis +Copyright (c) 2014-2015 Deciso B.V. - J. Schellevis +Copyright (c) 2006-2015 Devin Teske +Copyright (c) 2014 Electric Sheep Fencing, LLC +Copyright (c) 2010 Erik Fonnesbeck +Copyright (c) 2009 Erik Kristensen +Copyright (c) 2008-2014 Ermal Luçi +Copyright (c) 2005 Espen Johansen +Copyright (c) 2017 Fabian Franz +Copyright (c) 2006 Fernando Lemos +Copyright (c) 2014-2017 Franco Fichtner +Copyright (c) 2004 Fred Mol +Copyright (c) 2010 Gabriel B. +Copyright (c) 2016 IT-assistans Sverige AB +Copyright (c) 2009 Janne Enberg +Copyright (c) 2017 Jeffrey Gentes +Copyright (c) 2009-2014 Jim Pingle +Copyright (c) 2012 Jonas von Andrian +Copyright (c) 2004-2005 Jonathan Watt +Copyright (c) 2003-2004 Justin Ellison +Copyright (c) 2015 Manuel Faux +Copyright (c) 2003-2004 Manuel Kasper +Copyright (c) 2012 Marcello Coutinho +Copyright (c) 2010-2015 Michael Bostock +Copyright (c) 2005-2006 Paul Taylor +Copyright (c) 2005-2006 Peter Allgeyer +Copyright (c) 2004 Peter Curran +Copyright (c) 2012 PiBa-NL +Copyright (c) 2013 Renato Botelho +Copyright (c) 2015 S. Linke +Copyright (c) 2007 Sam Wenham +Copyright (c) 2007 Scott Dale +Copyright (c) 2003-2010 Scott Ullrich +Copyright (c) 2007-2012 Seth Mos +Copyright (c) 2008-2009 Shrew Soft Inc. +Copyright (c) 2004-2005 T. Lechat +Copyright (c) 2008 Tellnet AG +Copyright (c) 2016 Tobias Boertitz +Copyright (c) 2010 Vinicius Coque +Copyright (c) 2011-2014 Warren Baker +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 BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. diff --git a/Makefile b/Makefile index f90808118..530e59199 100644 --- a/Makefile +++ b/Makefile @@ -304,9 +304,14 @@ style: want-pear-PHP_CodeSniffer style-fix: want-pear-PHP_CodeSniffer phpcbf --standard=ruleset.xml ${.CURDIR}/src/opnsense || true +license: + @${.CURDIR}/Scripts/license > ${.CURDIR}/LICENSE + test: want-phpunit6 @cd ${.CURDIR}/src/opnsense/mvc/tests && \ phpunit --configuration PHPunit.xml clean: want-git ${GIT} reset --hard HEAD && ${GIT} clean -xdqf . + +.PHONY: license diff --git a/Scripts/license b/Scripts/license new file mode 100755 index 000000000..086182bc3 --- /dev/null +++ b/Scripts/license @@ -0,0 +1,119 @@ +#!/usr/bin/env perl + +# Copyright (c) 2017 Franco Fichtner +# +# 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 BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. + +use strict; +use warnings; +use autodie; + +use Cwd; +use File::Find; +use File::Slurp; + +my $src = shift || 'src'; +my $cwd = getcwd; +my $lic = << 'END_LIC'; +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 BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. +END_LIC + +my %copyrights = (); + +sub process_file +{ + my $filename = $File::Find::name; + return if not -f "$cwd/$filename"; + my @lines = read_file( "$cwd/$filename" ); + my $possibly_bsd; + for my $line ( @lines ) { + $possibly_bsd = 1 if $line =~ /Redistribution and use in source and binary forms/i; + if ( $line =~ /Apache License/i ) { + $possibly_bsd = 0; + last; + } + } + return if not $possibly_bsd; + for my $line ( @lines ) { + my $copy = $line; + chomp $copy; + next if $line !~ s/copyright\s+\(c\)\s+//i; + my ( $start, $end ) = ( 0, 9999 ); + $line =~ s/(^[\*\\#\s]+|[\.\s]+$)//g; + $line =~ s/Inc$/Inc./; + $line =~ s/B\.V$/B.V./; + if ( $line =~ s/(\d\d\d\d\s*,?-?\s*)// ) { + $start = $1; + $start =~ s/[,\s\-]+//g; + } + if ( $line =~ s/(\d\d\d\d\s*,?\s+)// ) { + $end = $1; + $end =~ s/[,\s]+//g; + } + $end = $start if $end == 9999; + if ( exists $copyrights{$line} ) { + if ( $start > $copyrights{$line}[0] ) { + $start = $copyrights{$line}[0]; + } + if ( $copyrights{$line}[1] == 9999 or $end < $copyrights{$line}[1] ) { + $end = $copyrights{$line}[1]; + } + } + $copyrights{$line} = [ $start, $end ]; + } +} + +find( \&process_file, $src ); + +for ( sort keys %copyrights ) { + my $date = $copyrights{$_}[0]; + next if $date == 0; + $date = join '-', @{ $copyrights{$_} } if $copyrights{$_}[1] != $date; + print "Copyright (c) $date $_\n"; +} + +print $lic; diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc index 47e18fde4..b18703aa8 100644 --- a/src/etc/inc/auth.inc +++ b/src/etc/inc/auth.inc @@ -3,7 +3,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. Copyright (C) 2010 Ermal Luçi - Copyright (C) 2007, 2008 Scott Ullrich + Copyright (C) 2007-2008 Scott Ullrich Copyright (C) 2005-2006 Bill Marquette Copyright (C) 2006 Paul Taylor . Copyright (C) 2003-2006 Manuel Kasper . diff --git a/src/etc/inc/authgui.inc b/src/etc/inc/authgui.inc index a16c539f8..fbb7fdc44 100644 --- a/src/etc/inc/authgui.inc +++ b/src/etc/inc/authgui.inc @@ -1,7 +1,7 @@ Copyright (C) 2007-2008 Scott Ullrich Copyright (C) 2005-2006 Bill Marquette Copyright (C) 2006 Paul Taylor diff --git a/src/etc/inc/certs.inc b/src/etc/inc/certs.inc index 9bf9b0dd2..f23da4a90 100644 --- a/src/etc/inc/certs.inc +++ b/src/etc/inc/certs.inc @@ -1,7 +1,7 @@ Copyright (C) 2010 Jim Pingle All rights reserved. diff --git a/src/etc/inc/crypt.inc b/src/etc/inc/crypt.inc index a8df7aeff..94a7d9729 100644 --- a/src/etc/inc/crypt.inc +++ b/src/etc/inc/crypt.inc @@ -1,7 +1,7 @@ All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc index 8fb71b1df..667a2624b 100644 --- a/src/etc/inc/filter.inc +++ b/src/etc/inc/filter.inc @@ -3,9 +3,9 @@ /* Copyright (C) 2017 Deciso B.V. Copyright (C) 2004-2007 Scott Ullrich - Copyright (C) 2005 Bill Marquette - Copyright (C) 2006 Peter Allgeyer - Copyright (C) 2008-2010 Ermal Luci + Copyright (C) 2005 Bill Marquette + Copyright (C) 2006 Peter Allgeyer + Copyright (C) 2008-2010 Ermal Luçi Copyright (C) 2003-2004 Manuel Kasper All rights reserved. diff --git a/src/etc/inc/filter_log.inc b/src/etc/inc/filter_log.inc index 006f4c285..360d13144 100644 --- a/src/etc/inc/filter_log.inc +++ b/src/etc/inc/filter_log.inc @@ -3,7 +3,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. Copyright (C) Scott Ullrich - Copyright (C) 2009 Jim Pingle + Copyright (C) 2009 Jim Pingle All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/etc/inc/gwlb.inc b/src/etc/inc/gwlb.inc index ed0fcb20b..efd69b562 100644 --- a/src/etc/inc/gwlb.inc +++ b/src/etc/inc/gwlb.inc @@ -1,7 +1,8 @@ + Copyright (C) 2008 Seth Mos Copyright (C) 2010 Ermal Luçi All rights reserved. diff --git a/src/etc/inc/plugins.inc.d/dnsmasq.inc b/src/etc/inc/plugins.inc.d/dnsmasq.inc index 0e5f2ec2a..3e05166cc 100644 --- a/src/etc/inc/plugins.inc.d/dnsmasq.inc +++ b/src/etc/inc/plugins.inc.d/dnsmasq.inc @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2017 Franco Fichtner - Copyright (C) 2010 Ermal Luci + Copyright (C) 2010 Ermal Luçi Copyright (C) 2005-2006 Colin Smith Copyright (C) 2003-2004 Manuel Kasper All rights reserved. diff --git a/src/etc/inc/plugins.inc.d/ipsec.inc b/src/etc/inc/plugins.inc.d/ipsec.inc index 1d98d5564..4f7caca41 100644 --- a/src/etc/inc/plugins.inc.d/ipsec.inc +++ b/src/etc/inc/plugins.inc.d/ipsec.inc @@ -2,7 +2,7 @@ /* Copyright (C) 2016 Deciso B.V. - Copyright (C) 2008 Shrew Soft Inc + Copyright (C) 2008 Shrew Soft Inc. Copyright (C) 2008 Ermal Luçi Copyright (C) 2004-2007 Scott Ullrich Copyright (C) 2003-2004 Manuel Kasper diff --git a/src/etc/inc/plugins.inc.d/ipsec/auth-user.php b/src/etc/inc/plugins.inc.d/ipsec/auth-user.php index 64cf0d54b..3805d1f25 100755 --- a/src/etc/inc/plugins.inc.d/ipsec/auth-user.php +++ b/src/etc/inc/plugins.inc.d/ipsec/auth-user.php @@ -2,7 +2,7 @@ Copyright (C) 2010 Ermal Luçi All rights reserved. diff --git a/src/etc/inc/plugins.inc.d/openssh.inc b/src/etc/inc/plugins.inc.d/openssh.inc index d15683fdc..9d0d59bfa 100644 --- a/src/etc/inc/plugins.inc.d/openssh.inc +++ b/src/etc/inc/plugins.inc.d/openssh.inc @@ -1,7 +1,7 @@ * Copyright (C) 2004 Fred Mol . * Copyright (C) 2015-2017 Franco Fichtner * All rights reserved. diff --git a/src/etc/inc/plugins.inc.d/openvpn/auth-user.php b/src/etc/inc/plugins.inc.d/openvpn/auth-user.php index 7c9a67168..4be77b26b 100644 --- a/src/etc/inc/plugins.inc.d/openvpn/auth-user.php +++ b/src/etc/inc/plugins.inc.d/openvpn/auth-user.php @@ -2,7 +2,7 @@ Copyright (C) 2010 Ermal Luçi All rights reserved. diff --git a/src/etc/inc/plugins.inc.d/openvpn/tls-verify.php b/src/etc/inc/plugins.inc.d/openvpn/tls-verify.php index c6e8653e8..ff1080d96 100644 --- a/src/etc/inc/plugins.inc.d/openvpn/tls-verify.php +++ b/src/etc/inc/plugins.inc.d/openvpn/tls-verify.php @@ -2,7 +2,7 @@ All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index 5e443a637..0872195df 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2017 Franco Fichtner - Copyright (C) 2010 Ermal Luci + Copyright (C) 2010 Ermal Luçi Copyright (C) 2005-2006 Colin Smith Copyright (C) 2003-2004 Manuel Kasper All rights reserved. diff --git a/src/etc/inc/xmlrpc/legacy.inc b/src/etc/inc/xmlrpc/legacy.inc index 6c5caab4c..b29d7a3d3 100644 --- a/src/etc/inc/xmlrpc/legacy.inc +++ b/src/etc/inc/xmlrpc/legacy.inc @@ -3,7 +3,7 @@ /* Copyright (C) 2015-2016 Deciso B.V. Copyright (C) 2004-2010 Scott Ullrich - Copyright (C) 2005 Colin Smith + Copyright (C) 2005 Colin Smith All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup index c3d7523a4..2d971b63e 100755 --- a/src/etc/rc.bootup +++ b/src/etc/rc.bootup @@ -3,9 +3,9 @@ /* Copyright (C) 2014-2017 Franco Fichtner - Copyright (C) 2004-2009 Scott Ullrich . + Copyright (C) 2004-2009 Scott Ullrich Copyright (C) 2003-2004 Manuel Kasper . - Copyright (C) 2009 Erik Kristensen + Copyright (C) 2009 Erik Kristensen All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/etc/rc.expireaccounts b/src/etc/rc.expireaccounts index 6e03a6812..4527977c8 100755 --- a/src/etc/rc.expireaccounts +++ b/src/etc/rc.expireaccounts @@ -2,7 +2,7 @@ All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/etc/rc.filter_synchronize b/src/etc/rc.filter_synchronize index 89d31ec08..f151116e6 100755 --- a/src/etc/rc.filter_synchronize +++ b/src/etc/rc.filter_synchronize @@ -4,9 +4,9 @@ /* Copyright (C) 2016 Deciso B.V. Copyright (C) 2004-2006 Scott Ullrich - Copyright (C) 2005 Bill Marquette - Copyright (C) 2006 Peter Allgeyer - Copyright (C) 2008 Ermal Luci + Copyright (C) 2005 Bill Marquette + Copyright (C) 2006 Peter Allgeyer + Copyright (C) 2008 Ermal Luçi Copyright (C) 2003-2004 Manuel Kasper . All rights reserved. diff --git a/src/etc/rc.freebsd b/src/etc/rc.freebsd index d9561dd34..3631ae18a 100755 --- a/src/etc/rc.freebsd +++ b/src/etc/rc.freebsd @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (c) 2015-2017 Ad Schellevis +# Copyright (c) 2015-2017 Ad Schellevis # Copyright (c) 2015-2017 Franco Fichtner # # Redistribution and use in source and binary forms, with or without diff --git a/src/etc/rc.initial.banner b/src/etc/rc.initial.banner index 301303437..530a6384f 100755 --- a/src/etc/rc.initial.banner +++ b/src/etc/rc.initial.banner @@ -2,8 +2,9 @@ + * Copyright (C) 2009 Ermal Luçi * All rights reserved * * Redistribution and use in source and binary forms, with or without diff --git a/src/etc/rc.initial.password b/src/etc/rc.initial.password index 75b8077f2..184e95aab 100755 --- a/src/etc/rc.initial.password +++ b/src/etc/rc.initial.password @@ -2,7 +2,7 @@ + * Copyright (C) 2017 Franco Fichtner * Copyright (C) 2003-2004 Manuel Kasper . * All rights reserved. * diff --git a/src/etc/rc.resolv_conf_generate b/src/etc/rc.resolv_conf_generate index e2f4c37d1..432f22c8c 100755 --- a/src/etc/rc.resolv_conf_generate +++ b/src/etc/rc.resolv_conf_generate @@ -2,30 +2,30 @@ * Copyright (C) 2004 Fred Mol . * Copyright (C) 2015-2017 Franco Fichtner * All rights reserved. diff --git a/src/etc/rc.syshook.d/90-carp.start b/src/etc/rc.syshook.d/90-carp.start index c22c7d682..fbc8a9b8e 100755 --- a/src/etc/rc.syshook.d/90-carp.start +++ b/src/etc/rc.syshook.d/90-carp.start @@ -2,7 +2,7 @@ + * Copyright (C) 2017 Ad Schellevis * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/SystemhealthController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/SystemhealthController.php index 18bf6a64a..21e19c0e5 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/SystemhealthController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/SystemhealthController.php @@ -1,8 +1,7 @@ diff --git a/src/opnsense/scripts/proxy/fetchACLs.py b/src/opnsense/scripts/proxy/fetchACLs.py index 18a29e4e3..58ae5c7e8 100755 --- a/src/opnsense/scripts/proxy/fetchACLs.py +++ b/src/opnsense/scripts/proxy/fetchACLs.py @@ -1,8 +1,8 @@ #!/usr/local/bin/python2.7 """ - Copyright (c) 2016 Ad Schellevis - Deciso B.V. - Copyright (c) 2015 Jos Schellevis - Deciso B.V. + Copyright (c) 2016 Deciso B.V. - Ad Schellevis + Copyright (c) 2015 Deciso B.V. - J. Schellevis All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/sbin/mpd.script b/src/sbin/mpd.script index aa016b265..748112a50 100644 --- a/src/sbin/mpd.script +++ b/src/sbin/mpd.script @@ -1,6 +1,7 @@ ################################################################# # -# Copyright (c) 1995-1999 Whistle Communications, Inc. All rights reserved. +# Copyright (c) 1995-1999 Whistle Communications, Inc. +# All rights reserved. # # Subject to the following obligations and disclaimer of warranty, # use and redistribution of this software, in source or object code diff --git a/src/wizard/openvpn.xml b/src/wizard/openvpn.xml index 4a5bff420..912bf64c9 100644 --- a/src/wizard/openvpn.xml +++ b/src/wizard/openvpn.xml @@ -3,7 +3,7 @@ /* Copyright (C) 2014 Deciso B.V. - Copyright (C) 2010 Ermal Luci + Copyright (C) 2010 Ermal Luçi All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/wizard/system.xml b/src/wizard/system.xml index 8020e7498..ca4ca5115 100644 --- a/src/wizard/system.xml +++ b/src/wizard/system.xml @@ -3,7 +3,7 @@ /* Copyright (C) 2014 Deciso B.V. - Copyright (C) 2004, 2005 Scott Ullrich + Copyright (C) 2004-2005 Scott Ullrich All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/diag_confbak.php b/src/www/diag_confbak.php index 063c7c827..20d5267f0 100644 --- a/src/www/diag_confbak.php +++ b/src/www/diag_confbak.php @@ -2,8 +2,8 @@ /* Copyright (C) 2014 Deciso B.V. - Copyright (C) 2005 Colin Smith - Copyright (C) 2010 Jim Pingle + Copyright (C) 2005 Colin Smith + Copyright (C) 2010 Jim Pingle All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/diag_dns.php b/src/www/diag_dns.php index 1168377a4..32b5a415a 100644 --- a/src/www/diag_dns.php +++ b/src/www/diag_dns.php @@ -2,7 +2,7 @@ /* Copyright (C) 2016 Deciso B.V. - Copyright (C) 2009 Jim Pingle (jpingle@gmail.com) + Copyright (C) 2009 Jim Pingle All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/diag_dump_states.php b/src/www/diag_dump_states.php index 17d4dcc11..b790a6e94 100644 --- a/src/www/diag_dump_states.php +++ b/src/www/diag_dump_states.php @@ -3,7 +3,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. Copyright (C) 2005-2009 Scott Ullrich - Copyright (C) 2005 Colin Smith + Copyright (C) 2005 Colin Smith All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/diag_ipsec.php b/src/www/diag_ipsec.php index b7fa693a2..2f5dd9109 100644 --- a/src/www/diag_ipsec.php +++ b/src/www/diag_ipsec.php @@ -3,7 +3,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. Copyright (C) 2004-2009 Scott Ullrich - Copyright (C) 2008 Shrew Soft Inc + Copyright (C) 2008 Shrew Soft Inc. Copyright (C) 2003-2004 Manuel Kasper All rights reserved. diff --git a/src/www/diag_ipsec_leases.php b/src/www/diag_ipsec_leases.php index 6d9410781..a321c8927 100644 --- a/src/www/diag_ipsec_leases.php +++ b/src/www/diag_ipsec_leases.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2014 Ermal LUÇi + Copyright (C) 2014 Ermal Luçi All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/diag_logs_filter.php b/src/www/diag_logs_filter.php index 298364799..cc392199b 100644 --- a/src/www/diag_logs_filter.php +++ b/src/www/diag_logs_filter.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014 Deciso B.V. - Copyright (C) 2009-2010 Jim Pingle + Copyright (C) 2009-2010 Jim Pingle Copyright (C) 2004-2009 Scott Ullrich Copyright (C) 2003-2009 Manuel Kasper Originally Sponsored By Anathematic @ pfSense Forums diff --git a/src/www/diag_logs_filter_summary.php b/src/www/diag_logs_filter_summary.php index 1a460022e..7cc60c828 100644 --- a/src/www/diag_logs_filter_summary.php +++ b/src/www/diag_logs_filter_summary.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2015 Deciso B.V. - J. Schellevis - Copyright (C) 2009 Jim Pingle + Copyright (C) 2009 Jim Pingle All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/diag_logs_template.inc b/src/www/diag_logs_template.inc index ce22a8d91..95ceb562b 100644 --- a/src/www/diag_logs_template.inc +++ b/src/www/diag_logs_template.inc @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2015 Deciso B.V. - Copyright (C) 2012 Seth Mos + Copyright (C) 2012 Seth Mos Copyright (C) 2004-2009 Scott Ullrich Copyright (C) 2003-2004 Manuel Kasper All rights reserved. diff --git a/src/www/diag_ping.php b/src/www/diag_ping.php index e8cdbc42e..73a3eec8b 100644 --- a/src/www/diag_ping.php +++ b/src/www/diag_ping.php @@ -2,7 +2,8 @@ /* Copyright (C) 2016 Deciso B.V. - Copyright (C) 2003-2005 Bob Zoller (bob@kludgebox.com) and Manuel Kasper . + Copyright (C) 2003-2005 Bob Zoller + Copyright (C) 2003-2005 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/diag_sockets.php b/src/www/diag_sockets.php index 045dbec12..290450f87 100644 --- a/src/www/diag_sockets.php +++ b/src/www/diag_sockets.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014 Deciso B.V. - Copyright (C) 2012 + Copyright (C) 2012 PiBa-NL All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/diag_states_summary.php b/src/www/diag_states_summary.php index 30ff333f6..ce27b5db9 100644 --- a/src/www/diag_states_summary.php +++ b/src/www/diag_states_summary.php @@ -2,9 +2,9 @@ /* Copyright (C) 2014 Deciso B.V. - Copyright (C) 2010-2014 Jim Pingle + Copyright (C) 2010-2014 Jim Pingle Copyright (C) 2005-2009 Scott Ullrich - Copyright (C) 2005 Colin Smith + Copyright (C) 2005 Colin Smith All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/diag_tables.php b/src/www/diag_tables.php index 545d8f1bd..8c7218e8a 100644 --- a/src/www/diag_tables.php +++ b/src/www/diag_tables.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014 Deciso B.V. - Copyright (C) 2010 Jim Pingle + Copyright (C) 2010 Jim Pingle Copyright (C) 2010 Scott Ullrich All rights reserved. diff --git a/src/www/diag_testport.php b/src/www/diag_testport.php index 2c49138d5..685c67e83 100644 --- a/src/www/diag_testport.php +++ b/src/www/diag_testport.php @@ -3,7 +3,8 @@ /* Copyright (C) 2016 Deciso B.V. Copyright (C) 2013 Jim Pingle - Copyright (C) 2003-2005 Bob Zoller (bob@kludgebox.com) and Manuel Kasper . + Copyright (C) 2003-2005 Bob Zoller + Copyright (C) 2003-2005 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/diag_traceroute.php b/src/www/diag_traceroute.php index 6e922580d..f8dc88fa9 100644 --- a/src/www/diag_traceroute.php +++ b/src/www/diag_traceroute.php @@ -2,7 +2,8 @@ /* Copyright (C) 2016 Deciso B.V. - Copyright (C) 2005 Paul Taylor (paultaylor@winndixie.com) and Manuel Kasper . + Copyright (C) 2005 Paul Taylor + Copyright (C) Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/fbegin.inc b/src/www/fbegin.inc index aa92c41b7..19a732dbc 100644 --- a/src/www/fbegin.inc +++ b/src/www/fbegin.inc @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2015 Deciso B.V. - Copyright (C) 2012 Jim Pingle + Copyright (C) 2012 Jim Pingle Copyright (C) 2007-2008 Scott Ullrich Copyright (C) 2005-2006 Colin Smith All rights reserved. diff --git a/src/www/firewall_aliases_edit.php b/src/www/firewall_aliases_edit.php index 8a38fc367..86bb11393 100644 --- a/src/www/firewall_aliases_edit.php +++ b/src/www/firewall_aliases_edit.php @@ -4,7 +4,7 @@ Copyright (C) 2014 Deciso B.V. Copyright (C) 2004 Scott Ullrich Copyright (C) 2009 Ermal Luçi - Copyright (C) 2010 Jim Pingle + Copyright (C) 2010 Jim Pingle Copyright (C) 2003-2004 Manuel Kasper . All rights reserved. diff --git a/src/www/firewall_virtual_ip.php b/src/www/firewall_virtual_ip.php index c7abf98fc..4aff552ea 100644 --- a/src/www/firewall_virtual_ip.php +++ b/src/www/firewall_virtual_ip.php @@ -4,7 +4,7 @@ Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2005 Bill Marquette . Copyright (C) 2003-2005 Manuel Kasper . - Copyright (C) 2004-2005 Scott Ullrich . + Copyright (C) 2004-2005 Scott Ullrich All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/firewall_virtual_ip_edit.php b/src/www/firewall_virtual_ip_edit.php index e454835da..c030c0319 100644 --- a/src/www/firewall_virtual_ip_edit.php +++ b/src/www/firewall_virtual_ip_edit.php @@ -4,7 +4,7 @@ Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2005 Bill Marquette . Copyright (C) 2003-2005 Manuel Kasper . - Copyright (C) 2004-2005 Scott Ullrich . + Copyright (C) 2004-2005 Scott Ullrich All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/services_dhcpv6_relay.php b/src/www/services_dhcpv6_relay.php index 96525b87f..53ce19222 100644 --- a/src/www/services_dhcpv6_relay.php +++ b/src/www/services_dhcpv6_relay.php @@ -4,7 +4,7 @@ Copyright (C) 2014-2016 Deciso B.V. Copyright (C) 2003-2004 Justin Ellison . Copyright (C) 2010 Ermal Luçi - Copyright (C) 2010 Seth Mos + Copyright (C) 2010 Seth Mos All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/services_dnsmasq.php b/src/www/services_dnsmasq.php index b879c9140..0ee416715 100644 --- a/src/www/services_dnsmasq.php +++ b/src/www/services_dnsmasq.php @@ -2,7 +2,8 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2003-2004 Bob Zoller and Manuel Kasper . + Copyright (C) 2003-2004 Bob Zoller + Copyright (C) 2003-2004 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/services_dnsmasq_domainoverride_edit.php b/src/www/services_dnsmasq_domainoverride_edit.php index 40d22634f..d6c96e92f 100644 --- a/src/www/services_dnsmasq_domainoverride_edit.php +++ b/src/www/services_dnsmasq_domainoverride_edit.php @@ -2,7 +2,8 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2003-2005 Bob Zoller and Manuel Kasper . + Copyright (C) 2003-2005 Bob Zoller + Copyright (C) 2003-2005 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/services_dnsmasq_edit.php b/src/www/services_dnsmasq_edit.php index 7fe62e0f8..9b6c37031 100644 --- a/src/www/services_dnsmasq_edit.php +++ b/src/www/services_dnsmasq_edit.php @@ -2,7 +2,8 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2003-2004 Bob Zoller and Manuel Kasper . + Copyright (C) 2003-2004 Bob Zoller + Copyright (C) 2003-2004 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/services_ntpd.php b/src/www/services_ntpd.php index 2bb4cc3e0..4859cfa6a 100644 --- a/src/www/services_ntpd.php +++ b/src/www/services_ntpd.php @@ -2,8 +2,8 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2013 Dagorlad - Copyright (C) 2012 Jim Pingle + Copyright (C) 2013 Dagorlad + Copyright (C) 2012 Jim Pingle All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/services_ntpd_gps.php b/src/www/services_ntpd_gps.php index 6f3df29eb..f8ab3c2a9 100644 --- a/src/www/services_ntpd_gps.php +++ b/src/www/services_ntpd_gps.php @@ -3,7 +3,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. Copyright (C) 2013 Dagorlad - Copyright (C) 2012 Jim Pingle + Copyright (C) 2012 Jim Pingle All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/services_unbound.php b/src/www/services_unbound.php index 614b9dfaf..4ecf11220 100644 --- a/src/www/services_unbound.php +++ b/src/www/services_unbound.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2014 Warren Baker + Copyright (C) 2014 Warren Baker All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/services_unbound_advanced.php b/src/www/services_unbound_advanced.php index c9eb9211e..ac252add1 100644 --- a/src/www/services_unbound_advanced.php +++ b/src/www/services_unbound_advanced.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2011 Warren Baker + Copyright (C) 2011 Warren Baker All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/services_unbound_domainoverride_edit.php b/src/www/services_unbound_domainoverride_edit.php index f503f5652..e39cfd378 100644 --- a/src/www/services_unbound_domainoverride_edit.php +++ b/src/www/services_unbound_domainoverride_edit.php @@ -2,8 +2,9 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2014 Warren Baker (warren@decoy.co.za) - Copyright (C) 2003-2005 Bob Zoller and Manuel Kasper . + Copyright (C) 2014 Warren Baker + Copyright (C) 2003-2005 Bob Zoller + Copyright (C) 2003-2005 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/services_unbound_host_edit.php b/src/www/services_unbound_host_edit.php index 02d04ff31..3f389bf35 100644 --- a/src/www/services_unbound_host_edit.php +++ b/src/www/services_unbound_host_edit.php @@ -4,7 +4,8 @@ Copyright (C) 2015 Manuel Faux Copyright (C) 2014-2016 Deciso B.V. Copyright (C) 2014 Warren Baker - Copyright (C) 2003-2004 Bob Zoller and Manuel Kasper . + Copyright (C) 2003-2004 Bob Zoller + Copyright (C) 2003-2004 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/services_unbound_overrides.php b/src/www/services_unbound_overrides.php index 78b5f8f96..2e6aa5c5f 100644 --- a/src/www/services_unbound_overrides.php +++ b/src/www/services_unbound_overrides.php @@ -3,7 +3,7 @@ /* Copyright (C) 2015 Manuel Faux Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2014 Warren Baker + Copyright (C) 2014 Warren Baker All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/status_dhcpv6_leases.php b/src/www/status_dhcpv6_leases.php index 1093c6a2a..8bd0a9d1d 100644 --- a/src/www/status_dhcpv6_leases.php +++ b/src/www/status_dhcpv6_leases.php @@ -3,7 +3,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. Copyright (C) 2004-2009 Scott Ullrich - Copyright (C) 2011 Seth Mos + Copyright (C) 2011 Seth Mos Copyright (C) 2003-2004 Manuel Kasper . All rights reserved. diff --git a/src/www/status_ntpd.php b/src/www/status_ntpd.php index 4da4dad4a..c998474e5 100644 --- a/src/www/status_ntpd.php +++ b/src/www/status_ntpd.php @@ -3,7 +3,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. Copyright (C) 2013 Dagorlad - Copyright (C) 2012 Jim Pingle + Copyright (C) 2012 Jim Pingle All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/status_openvpn.php b/src/www/status_openvpn.php index adf560b0b..b199b09d3 100644 --- a/src/www/status_openvpn.php +++ b/src/www/status_openvpn.php @@ -2,9 +2,10 @@ /* Copyright (C) 2014-2015 Deciso B.V. - Copyright (C) 2010 Jim Pingle - Copyright (C) 2008 Shrew Soft Inc. - Copyright (C) 2005 Scott Ullrich, Colin Smith + Copyright (C) 2010 Jim Pingle + Copyright (C) 2008 Shrew Soft Inc. + Copyright (C) 2005 Scott Ullrich + Copyright (C) 2005 Colin Smith All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/system_advanced_admin.php b/src/www/system_advanced_admin.php index d38e2c826..26bbc1a05 100644 --- a/src/www/system_advanced_admin.php +++ b/src/www/system_advanced_admin.php @@ -3,7 +3,7 @@ /* Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2005-2010 Scott Ullrich - Copyright (C) 2008 Shrew Soft Inc + Copyright (C) 2008 Shrew Soft Inc. Copyright (C) 2003-2004 Manuel Kasper All rights reserved. diff --git a/src/www/system_advanced_firewall.php b/src/www/system_advanced_firewall.php index 93af05f24..faad65adc 100644 --- a/src/www/system_advanced_firewall.php +++ b/src/www/system_advanced_firewall.php @@ -3,7 +3,7 @@ /* Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2005-2007 Scott Ullrich - Copyright (C) 2008 Shrew Soft Inc + Copyright (C) 2008 Shrew Soft Inc. Copyright (C) 2003-2004 Manuel Kasper All rights reserved. diff --git a/src/www/system_advanced_misc.php b/src/www/system_advanced_misc.php index d77dbfad4..7a23db64d 100644 --- a/src/www/system_advanced_misc.php +++ b/src/www/system_advanced_misc.php @@ -3,7 +3,7 @@ /* Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2005-2007 Scott Ullrich - Copyright (C) 2008 Shrew Soft Inc + Copyright (C) 2008 Shrew Soft Inc. Copyright (C) 2003-2004 Manuel Kasper All rights reserved. diff --git a/src/www/system_advanced_network.php b/src/www/system_advanced_network.php index ed6b811d8..c20e80c8d 100644 --- a/src/www/system_advanced_network.php +++ b/src/www/system_advanced_network.php @@ -3,7 +3,7 @@ /* Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2005-2007 Scott Ullrich - Copyright (C) 2008 Shrew Soft Inc + Copyright (C) 2008 Shrew Soft Inc. Copyright (C) 2003-2004 Manuel Kasper All rights reserved. diff --git a/src/www/system_advanced_sysctl.php b/src/www/system_advanced_sysctl.php index 145af5e61..b5dafd237 100644 --- a/src/www/system_advanced_sysctl.php +++ b/src/www/system_advanced_sysctl.php @@ -3,7 +3,7 @@ /* Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2005-2007 Scott Ullrich - Copyright (C) 2008 Shrew Soft Inc + Copyright (C) 2008 Shrew Soft Inc. Copyright (C) 2003-2004 Manuel Kasper All rights reserved. diff --git a/src/www/system_authservers.php b/src/www/system_authservers.php index b326c7ef9..5f0c3a87f 100644 --- a/src/www/system_authservers.php +++ b/src/www/system_authservers.php @@ -3,7 +3,7 @@ /* Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2010 Ermal Luçi - Copyright (C) 2008 Shrew Soft Inc. + Copyright (C) 2008 Shrew Soft Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/system_camanager.php b/src/www/system_camanager.php index b83705553..80e43fe4c 100644 --- a/src/www/system_camanager.php +++ b/src/www/system_camanager.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2015 Deciso B.V. - Copyright (C) 2008 Shrew Soft Inc. + Copyright (C) 2008 Shrew Soft Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/system_certmanager.php b/src/www/system_certmanager.php index cc2f5f086..5c869d943 100644 --- a/src/www/system_certmanager.php +++ b/src/www/system_certmanager.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2015 Deciso B.V. - Copyright (C) 2008 Shrew Soft Inc. + Copyright (C) 2008 Shrew Soft Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/system_crlmanager.php b/src/www/system_crlmanager.php index c8326c6d2..76afebc00 100644 --- a/src/www/system_crlmanager.php +++ b/src/www/system_crlmanager.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2015 Deciso B.V. - Copyright (C) 2010 Jim Pingle + Copyright (C) 2010 Jim Pingle All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/system_groupmanager.php b/src/www/system_groupmanager.php index c13440b30..f5c2394d9 100644 --- a/src/www/system_groupmanager.php +++ b/src/www/system_groupmanager.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2008 Shrew Soft Inc. + Copyright (C) 2008 Shrew Soft Inc. Copyright (C) 2005 Paul Taylor . Copyright (C) 2003-2005 Manuel Kasper . All rights reserved. diff --git a/src/www/system_usermanager.php b/src/www/system_usermanager.php index c21f887bc..ad0109ce3 100644 --- a/src/www/system_usermanager.php +++ b/src/www/system_usermanager.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2008 Shrew Soft Inc. + Copyright (C) 2008 Shrew Soft Inc. Copyright (C) 2005 Paul Taylor Copyright (C) 2003-2005 Manuel Kasper All rights reserved. diff --git a/src/www/vpn_ipsec.php b/src/www/vpn_ipsec.php index 91017eac6..ab659656a 100644 --- a/src/www/vpn_ipsec.php +++ b/src/www/vpn_ipsec.php @@ -3,7 +3,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. Copyright (C) 2003-2005 Manuel Kasper . - Copyright (C) 2008 Shrew Soft Inc + Copyright (C) 2008 Shrew Soft Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/vpn_ipsec_mobile.php b/src/www/vpn_ipsec_mobile.php index 844e1d198..e96578cf7 100644 --- a/src/www/vpn_ipsec_mobile.php +++ b/src/www/vpn_ipsec_mobile.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2015 Deciso B.V. - Copyright (C) 2008 Shrew Soft Inc + Copyright (C) 2008 Shrew Soft Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/vpn_ipsec_phase1.php b/src/www/vpn_ipsec_phase1.php index 0075e3ce8..5a027df35 100644 --- a/src/www/vpn_ipsec_phase1.php +++ b/src/www/vpn_ipsec_phase1.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2015 Deciso B.V. - Copyright (C) 2008 Shrew Soft Inc + Copyright (C) 2008 Shrew Soft Inc. Copyright (C) 2003-2005 Manuel Kasper Copyright (C) 2014 Ermal Luçi All rights reserved. diff --git a/src/www/vpn_ipsec_phase2.php b/src/www/vpn_ipsec_phase2.php index bd7121ffe..a774dd3f1 100644 --- a/src/www/vpn_ipsec_phase2.php +++ b/src/www/vpn_ipsec_phase2.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014 Deciso B.V. - Copyright (C) 2008 Shrew Soft Inc + Copyright (C) 2008 Shrew Soft Inc. Copyright (C) 2003-2005 Manuel Kasper All rights reserved. diff --git a/src/www/vpn_openvpn_client.php b/src/www/vpn_openvpn_client.php index eba1cd557..838b605b9 100644 --- a/src/www/vpn_openvpn_client.php +++ b/src/www/vpn_openvpn_client.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2008 Shrew Soft Inc. + Copyright (C) 2008 Shrew Soft Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/vpn_openvpn_csc.php b/src/www/vpn_openvpn_csc.php index 083d45e5c..da03f4e8e 100644 --- a/src/www/vpn_openvpn_csc.php +++ b/src/www/vpn_openvpn_csc.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2015 Deciso B.V. - Copyright (C) 2008 Shrew Soft Inc. + Copyright (C) 2008 Shrew Soft Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/vpn_openvpn_export.php b/src/www/vpn_openvpn_export.php index 36620632b..22de6e315 100644 --- a/src/www/vpn_openvpn_export.php +++ b/src/www/vpn_openvpn_export.php @@ -1,9 +1,9 @@ - Copyright (C) 2008 Shrew Soft Inc + Copyright (C) 2008 Shrew Soft Inc. Copyright (C) 2003-2004 Manuel Kasper All rights reserved. diff --git a/src/www/vpn_openvpn_server.php b/src/www/vpn_openvpn_server.php index 2581acc96..aa4c2cb6e 100644 --- a/src/www/vpn_openvpn_server.php +++ b/src/www/vpn_openvpn_server.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2015 Deciso B.V. - Copyright (C) 2008 Shrew Soft Inc. + Copyright (C) 2008 Shrew Soft Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/widgets/widgets/gateways.widget.php b/src/www/widgets/widgets/gateways.widget.php index 2bd83b549..d6b06d8de 100644 --- a/src/www/widgets/widgets/gateways.widget.php +++ b/src/www/widgets/widgets/gateways.widget.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2008 Seth Mos + Copyright (C) 2008 Seth Mos Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/src/www/widgets/widgets/interface_list.widget.php b/src/www/widgets/widgets/interface_list.widget.php index b219f4f41..c59113aee 100644 --- a/src/www/widgets/widgets/interface_list.widget.php +++ b/src/www/widgets/widgets/interface_list.widget.php @@ -3,8 +3,9 @@ /* Copyright (C) 2014-2016 Deciso B.V. Copyright (C) 2007 Scott Dale - Copyright (C) 2004-2005 T. Lechat , Manuel Kasper - and Jonathan Watt . + Copyright (C) 2004-2005 T. Lechat + Copyright (C) 2004-2005 Manuel Kasper + Copyright (C) 2004-2005 Jonathan Watt All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/widgets/widgets/interface_statistics.widget.php b/src/www/widgets/widgets/interface_statistics.widget.php index 555ced749..09a1c928d 100644 --- a/src/www/widgets/widgets/interface_statistics.widget.php +++ b/src/www/widgets/widgets/interface_statistics.widget.php @@ -3,8 +3,9 @@ /* Copyright (C) 2014-2016 Deciso B.V. Copyright (C) 2007 Scott Dale - Copyright (C) 2004-2005 T. Lechat , Manuel Kasper - and Jonathan Watt . + Copyright (C) 2004-2005 T. Lechat + Copyright (C) 2004-2005 Manuel Kasper + Copyright (C) 2004-2005 Jonathan Watt . All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/widgets/widgets/ipsec.widget.php b/src/www/widgets/widgets/ipsec.widget.php index 58eb9e258..da29d98f3 100644 --- a/src/www/widgets/widgets/ipsec.widget.php +++ b/src/www/widgets/widgets/ipsec.widget.php @@ -3,8 +3,9 @@ /* Copyright (C) 2014-2016 Deciso B.V. Copyright (C) 2007 Scott Dale - Copyright (C) 2004-2005 T. Lechat , Manuel Kasper - and Jonathan Watt . + Copyright (C) 2004-2005 T. Lechat + Copyright (C) 2004-2005 Manuel Kasper + Copyright (C) 2004-2005 Jonathan Watt All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/widgets/widgets/log.widget.php b/src/www/widgets/widgets/log.widget.php index bcfd48506..dd4c4b2bd 100644 --- a/src/www/widgets/widgets/log.widget.php +++ b/src/www/widgets/widgets/log.widget.php @@ -3,9 +3,10 @@ /* Copyright (C) 2014 Deciso B.V. Copyright (C) 2007 Scott Dale - Copyright (C) 2009 Jim Pingle (jpingle@gmail.com) - Copyright (C) 2004-2005 T. Lechat , Manuel Kasper - and Jonathan Watt . + Copyright (C) 2009 Jim Pingle + Copyright (C) 2004-2005 T. Lechat + Copyright (C) 2004-2005 Manuel Kasper + Copyright (C) 2004-2005 Jonathan Watt All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/widgets/widgets/ntp_status.widget.php b/src/www/widgets/widgets/ntp_status.widget.php index 6ee851002..e76ff0ee1 100644 --- a/src/www/widgets/widgets/ntp_status.widget.php +++ b/src/www/widgets/widgets/ntp_status.widget.php @@ -3,8 +3,9 @@ /* Copyright (C) 2014 Deciso B.V. Copyright (c) 2007 Scott Dale - Copyright (C) 2004-2005 T. Lechat , Manuel Kasper - and Jonathan Watt . + Copyright (C) 2004-2005 T. Lechat + Copyright (C) 2004-2005 Manuel Kasper + Copyright (C) 2004-2005 Jonathan Watt All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/widgets/widgets/system_information.widget.php b/src/www/widgets/widgets/system_information.widget.php index 79abf33ec..c89d8fb55 100644 --- a/src/www/widgets/widgets/system_information.widget.php +++ b/src/www/widgets/widgets/system_information.widget.php @@ -3,8 +3,9 @@ /* Copyright (C) 2014-2016 Deciso B.V. Copyright (C) 2007 Scott Dale - Copyright (C) 2004-2005 T. Lechat , Manuel Kasper - and Jonathan Watt . + Copyright (C) 2004-2005 T. Lechat + Copyright (C) 2004-2005 Manuel Kasper + Copyright (C) 2004-2005 Jonathan Watt All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/widgets/widgets/thermal_sensors.widget.php b/src/www/widgets/widgets/thermal_sensors.widget.php index d009f2a41..408350ccd 100644 --- a/src/www/widgets/widgets/thermal_sensors.widget.php +++ b/src/www/widgets/widgets/thermal_sensors.widget.php @@ -2,6 +2,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. + 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/src/www/widgets/widgets/traffic_graphs.widget.php b/src/www/widgets/widgets/traffic_graphs.widget.php index 2349095f4..47c2d9230 100644 --- a/src/www/widgets/widgets/traffic_graphs.widget.php +++ b/src/www/widgets/widgets/traffic_graphs.widget.php @@ -3,8 +3,9 @@ /* Copyright (C) 2014-2016 Deciso B.V. Copyright (C) 2007 Scott Dale - Copyright (C) 2004-2005 T. Lechat , Manuel Kasper - and Jonathan Watt . + Copyright (C) 2004-2005 T. Lechat + Copyright (C) 2004-2005 Manuel Kasper + Copyright (C) 2004-2005 Jonathan Watt All rights reserved. Redistribution and use in source and binary forms, with or without