From 57b3cff9d4667e258d75f099598ed0519ed77202 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 7 Jun 2021 10:45:21 +0200 Subject: [PATCH] src: more cleanups on static pages --- src/www/diag_confbak.php | 3 +- src/www/diag_packet_capture.php | 2 +- src/www/firewall_nat_1to1_edit.php | 55 +++++++++++++++--------------- src/www/firewall_nat_edit.php | 4 +-- src/www/firewall_nat_npt_edit.php | 54 ++++++++++++++--------------- src/www/firewall_nat_out_edit.php | 4 +-- src/www/firewall_rules_edit.php | 2 +- src/www/firewall_scrub_edit.php | 2 +- src/www/services_dhcp_edit.php | 2 +- src/www/services_dhcpv6_edit.php | 2 +- src/www/system_authservers.php | 4 +-- src/www/system_certmanager.php | 6 ++-- src/www/system_crlmanager.php | 4 +-- src/www/system_usermanager.php | 8 ++--- src/www/vpn_ipsec_phase1.php | 3 +- src/www/vpn_ipsec_phase2.php | 3 +- src/www/vpn_openvpn_client.php | 2 +- src/www/vpn_openvpn_csc.php | 2 +- src/www/vpn_openvpn_server.php | 2 +- 19 files changed, 80 insertions(+), 84 deletions(-) diff --git a/src/www/diag_confbak.php b/src/www/diag_confbak.php index 7c10aacf5..d4cce1dcd 100644 --- a/src/www/diag_confbak.php +++ b/src/www/diag_confbak.php @@ -222,8 +222,7 @@ include("fbegin.inc"); - + diff --git a/src/www/diag_packet_capture.php b/src/www/diag_packet_capture.php index 09642f819..861d1d412 100644 --- a/src/www/diag_packet_capture.php +++ b/src/www/diag_packet_capture.php @@ -446,7 +446,7 @@ include("fbegin.inc"); - + diff --git a/src/www/firewall_nat_1to1_edit.php b/src/www/firewall_nat_1to1_edit.php index 23c727084..bc13d0633 100644 --- a/src/www/firewall_nat_1to1_edit.php +++ b/src/www/firewall_nat_1to1_edit.php @@ -1,36 +1,35 @@ - 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. -*/ + * Copyright (C) 2014 Deciso B.V. + * Copyright (C) 2003-2004 Manuel Kasper + * 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. + */ require_once("guiconfig.inc"); require_once("interfaces.inc"); - $a_1to1 = &config_read_array('nat', 'onetoone'); if ($_SERVER['REQUEST_METHOD'] === 'GET') { @@ -436,9 +435,9 @@ include("head.inc"); - + diff --git a/src/www/firewall_nat_edit.php b/src/www/firewall_nat_edit.php index 8f0575e5a..d9adbd254 100644 --- a/src/www/firewall_nat_edit.php +++ b/src/www/firewall_nat_edit.php @@ -1001,9 +1001,9 @@ $( document ).ready(function() { - + diff --git a/src/www/firewall_nat_npt_edit.php b/src/www/firewall_nat_npt_edit.php index a2683ed19..03cdfe1c2 100644 --- a/src/www/firewall_nat_npt_edit.php +++ b/src/www/firewall_nat_npt_edit.php @@ -1,31 +1,31 @@ - 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. -*/ + * Copyright (C) 2014 Deciso B.V. + * Copyright (C) 2011 Seth Mos + * 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. + */ require_once("guiconfig.inc"); require_once("interfaces.inc"); @@ -242,9 +242,9 @@ $( document ).ready(function() { - + diff --git a/src/www/firewall_nat_out_edit.php b/src/www/firewall_nat_out_edit.php index 1f721a843..40f0cac6d 100644 --- a/src/www/firewall_nat_out_edit.php +++ b/src/www/firewall_nat_out_edit.php @@ -830,9 +830,9 @@ include("head.inc"); - + - + diff --git a/src/www/firewall_scrub_edit.php b/src/www/firewall_scrub_edit.php index 2147a5b17..85dfcfcf8 100644 --- a/src/www/firewall_scrub_edit.php +++ b/src/www/firewall_scrub_edit.php @@ -556,7 +556,7 @@ include("head.inc"); - + diff --git a/src/www/services_dhcp_edit.php b/src/www/services_dhcp_edit.php index 63df46fd7..a5cfca92d 100644 --- a/src/www/services_dhcp_edit.php +++ b/src/www/services_dhcp_edit.php @@ -385,7 +385,7 @@ include("head.inc"); diff --git a/src/www/services_dhcpv6_edit.php b/src/www/services_dhcpv6_edit.php index 6db2d6157..e3c9173c2 100644 --- a/src/www/services_dhcpv6_edit.php +++ b/src/www/services_dhcpv6_edit.php @@ -248,7 +248,7 @@ include("head.inc"); diff --git a/src/www/system_authservers.php b/src/www/system_authservers.php index b510f3255..6f2eb9fe8 100644 --- a/src/www/system_authservers.php +++ b/src/www/system_authservers.php @@ -662,7 +662,7 @@ endif; ?>

-
+
@@ -782,7 +782,7 @@ endif; ?> - + diff --git a/src/www/system_certmanager.php b/src/www/system_certmanager.php index 86fe83bfe..8be6f6ffe 100644 --- a/src/www/system_certmanager.php +++ b/src/www/system_certmanager.php @@ -1317,7 +1317,7 @@ $( document ).ready(function() { - + @@ -1980,7 +1980,7 @@ $( document ).ready(function() { - +
@@ -1988,7 +1988,7 @@ $( document ).ready(function() { - +
diff --git a/src/www/system_crlmanager.php b/src/www/system_crlmanager.php index 137f14494..2ae1c4363 100644 --- a/src/www/system_crlmanager.php +++ b/src/www/system_crlmanager.php @@ -374,7 +374,7 @@ include("head.inc"); - + @@ -441,7 +441,7 @@ include("head.inc"); - + diff --git a/src/www/system_usermanager.php b/src/www/system_usermanager.php index 200da25f6..deab01a50 100644 --- a/src/www/system_usermanager.php +++ b/src/www/system_usermanager.php @@ -605,7 +605,7 @@ $( document ).ready(function() { - /> + /> @@ -614,7 +614,7 @@ $( document ).ready(function() { - + -
- +
+

/> diff --git a/src/www/vpn_ipsec_phase1.php b/src/www/vpn_ipsec_phase1.php index 6d11f5b06..2b39fc093 100644 --- a/src/www/vpn_ipsec_phase1.php +++ b/src/www/vpn_ipsec_phase1.php @@ -762,8 +762,7 @@ include("head.inc"); diff --git a/src/www/vpn_ipsec_phase2.php b/src/www/vpn_ipsec_phase2.php index fe2abd6e2..6228643bc 100644 --- a/src/www/vpn_ipsec_phase2.php +++ b/src/www/vpn_ipsec_phase2.php @@ -575,8 +575,7 @@ if (isset($input_errors) && count($input_errors) > 0) { diff --git a/src/www/vpn_openvpn_client.php b/src/www/vpn_openvpn_client.php index 51739b98c..11dc41d61 100644 --- a/src/www/vpn_openvpn_client.php +++ b/src/www/vpn_openvpn_client.php @@ -566,7 +566,7 @@ $( document ).ready(function() { diff --git a/src/www/vpn_openvpn_csc.php b/src/www/vpn_openvpn_csc.php index 3307c2e39..5855f469a 100644 --- a/src/www/vpn_openvpn_csc.php +++ b/src/www/vpn_openvpn_csc.php @@ -416,7 +416,7 @@ if ($act!="new" && $act!="edit") { diff --git a/src/www/vpn_openvpn_server.php b/src/www/vpn_openvpn_server.php index 285ea70e4..cb7b43172 100644 --- a/src/www/vpn_openvpn_server.php +++ b/src/www/vpn_openvpn_server.php @@ -644,7 +644,7 @@ $( document ).ready(function() {