From 4e3b66c2570b402bc002183cd39326194378d400 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Mon, 20 Jun 2016 16:59:19 +0200 Subject: [PATCH] zapp pfsense-utils.inc --- src/etc/inc/openvpn_wizard.inc | 1 - src/etc/inc/pfsense-utils.inc | 27 ------------------- src/etc/inc/xmlrpc/legacy.inc | 1 - src/etc/rc.bootup | 1 - src/etc/rc.carpbackup | 1 - src/etc/rc.carpmaster | 1 - src/etc/rc.dyndns.update | 1 - src/etc/rc.filter_configure_sync | 1 - src/etc/rc.filter_configure_xmlrpc | 1 - src/etc/rc.initial.setlanip | 1 - src/etc/rc.initial.setports | 1 - src/etc/rc.interfaces_wan_configure | 1 - src/etc/rc.linkup | 1 - src/etc/rc.newipsecdns | 1 - src/etc/rc.newroutedns | 1 - src/etc/rc.newwanip | 1 - src/etc/rc.newwanipv6 | 1 - src/etc/rc.reload_all | 1 - src/etc/rc.reload_interfaces | 1 - src/etc/rc.resolv_conf_generate | 1 - src/etc/rc.update_alias_url_data | 1 - src/etc/rc.update_urltables | 1 - src/sbin/3gstats.php | 1 - src/www/carp_status.php | 1 - src/www/diag_backup.php | 1 - src/www/diag_logs_filter.php | 1 - src/www/diag_logs_settings.php | 1 - src/www/diag_packet_capture.php | 1 - src/www/firewall_aliases_edit.php | 1 - src/www/firewall_nat_1to1_edit.php | 1 - src/www/firewall_nat_edit.php | 1 - src/www/firewall_nat_npt_edit.php | 1 - src/www/firewall_nat_out.php | 1 - src/www/firewall_nat_out_edit.php | 1 - src/www/firewall_rules.php | 1 - src/www/firewall_rules_edit.php | 1 - src/www/firewall_virtual_ip_edit.php | 1 - src/www/interfaces.php | 1 - src/www/interfaces_assign.php | 1 - src/www/interfaces_bridge_edit.php | 1 - src/www/interfaces_gif_edit.php | 1 - src/www/interfaces_gre_edit.php | 1 - src/www/interfaces_lagg_edit.php | 1 - src/www/interfaces_vlan_edit.php | 1 - src/www/reporting_settings.php | 1 - src/www/services_dhcp.php | 1 - src/www/services_dhcp_relay.php | 1 - src/www/services_dhcpv6.php | 1 - src/www/services_dnsmasq.php | 1 - .../services_dnsmasq_domainoverride_edit.php | 1 - src/www/services_dyndns.php | 1 - src/www/services_dyndns_edit.php | 1 - src/www/services_opendns.php | 1 - src/www/services_rfc2136.php | 1 - src/www/services_rfc2136_edit.php | 1 - src/www/services_unbound.php | 1 - src/www/services_unbound_acls.php | 1 - src/www/services_unbound_advanced.php | 1 - src/www/services_unbound_overrides.php | 1 - src/www/status_dhcp_leases.php | 1 - src/www/status_dhcpv6_leases.php | 1 - src/www/status_interfaces.php | 1 - src/www/status_services.php | 1 - src/www/system_advanced_admin.php | 1 - src/www/system_advanced_misc.php | 1 - src/www/system_advanced_network.php | 1 - src/www/system_gateway_groups.php | 1 - src/www/system_gateways.php | 1 - src/www/system_general.php | 1 - src/www/system_routes.php | 1 - src/www/system_routes_edit.php | 1 - src/www/vpn_ipsec.php | 1 - src/www/vpn_ipsec_keys.php | 1 - src/www/vpn_ipsec_mobile.php | 1 - src/www/vpn_ipsec_phase1.php | 1 - src/www/vpn_ipsec_settings.php | 1 - src/www/vpn_openvpn_client.php | 1 - src/www/vpn_openvpn_csc.php | 1 - src/www/vpn_openvpn_export.php | 1 - src/www/vpn_openvpn_export_shared.php | 1 - src/www/vpn_openvpn_server.php | 1 - src/www/widgets/api/get.php | 1 - .../widgets/widgets/carp_status.widget.php | 1 - .../widgets/widgets/dyn_dns_status.widget.php | 1 - .../widgets/widgets/interface_list.widget.php | 1 - .../widgets/load_balancer_status.widget.php | 1 - src/www/widgets/widgets/log.widget.php | 1 - src/www/widgets/widgets/ntp_status.widget.php | 1 - src/www/widgets/widgets/picture.widget.php | 1 - src/www/widgets/widgets/rss.widget.php | 1 - .../widgets/system_information.widget.php | 1 - src/www/widgets/widgets/system_log.widget.php | 1 - src/www/wizard.php | 1 - 93 files changed, 119 deletions(-) delete mode 100644 src/etc/inc/pfsense-utils.inc diff --git a/src/etc/inc/openvpn_wizard.inc b/src/etc/inc/openvpn_wizard.inc index 75f642184..7409ae3db 100644 --- a/src/etc/inc/openvpn_wizard.inc +++ b/src/etc/inc/openvpn_wizard.inc @@ -28,7 +28,6 @@ require_once("openvpn.inc"); require_once("util.inc"); -require_once("pfsense-utils.inc"); function cert_get_subject_hash($crt) { diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc deleted file mode 100644 index c7e7d2f2a..000000000 --- a/src/etc/inc/pfsense-utils.inc +++ /dev/null @@ -1,27 +0,0 @@ - - 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) - RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ diff --git a/src/etc/inc/xmlrpc/legacy.inc b/src/etc/inc/xmlrpc/legacy.inc index 7605ec594..a0b6a7d6a 100644 --- a/src/etc/inc/xmlrpc/legacy.inc +++ b/src/etc/inc/xmlrpc/legacy.inc @@ -130,7 +130,6 @@ function filter_configure_xmlrpc() require_once("openvpn.inc"); require_once("services.inc"); require_once("rrd.inc"); - require_once('pfsense-utils.inc'); filter_configure(); system_routing_configure(); diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup index 42a0229bb..b767e2508 100755 --- a/src/etc/rc.bootup +++ b/src/etc/rc.bootup @@ -125,7 +125,6 @@ require_once("interfaces.inc"); echo "."; require_once("services.inc"); echo "."; -require_once("pfsense-utils.inc"); echo "."; require_once("system.inc"); echo "."; diff --git a/src/etc/rc.carpbackup b/src/etc/rc.carpbackup index 7a6ad3dea..c77ef4340 100755 --- a/src/etc/rc.carpbackup +++ b/src/etc/rc.carpbackup @@ -31,7 +31,6 @@ require_once("config.inc"); require_once("openvpn.inc"); require_once("interfaces.inc"); require_once("util.inc"); -require_once("pfsense-utils.inc"); $argument = str_replace("\n", "", $argv[1]); if (!strstr($argument, "@")) diff --git a/src/etc/rc.carpmaster b/src/etc/rc.carpmaster index ef83444c6..4988ac0f4 100755 --- a/src/etc/rc.carpmaster +++ b/src/etc/rc.carpmaster @@ -31,7 +31,6 @@ require_once("config.inc"); require_once("openvpn.inc"); require_once("interfaces.inc"); require_once("util.inc"); -require_once("pfsense-utils.inc"); $argument = str_replace("\n", "", $argv[1]); if (!strstr($argument, "@")) diff --git a/src/etc/rc.dyndns.update b/src/etc/rc.dyndns.update index aec90baac..a09889f07 100755 --- a/src/etc/rc.dyndns.update +++ b/src/etc/rc.dyndns.update @@ -32,7 +32,6 @@ require_once("interfaces.inc"); require_once("util.inc"); require_once("filter.inc"); require_once("services.inc"); -require_once("pfsense-utils.inc"); /* Interface IP address has changed */ diff --git a/src/etc/rc.filter_configure_sync b/src/etc/rc.filter_configure_sync index 63a2670dd..38669f902 100755 --- a/src/etc/rc.filter_configure_sync +++ b/src/etc/rc.filter_configure_sync @@ -32,7 +32,6 @@ require_once("util.inc"); require_once("filter.inc"); require_once("ipsec.inc"); require_once("system.inc"); -require_once("pfsense-utils.inc"); require_once("interfaces.inc"); require_once("services.inc"); require_once("plugins.inc"); diff --git a/src/etc/rc.filter_configure_xmlrpc b/src/etc/rc.filter_configure_xmlrpc index a5de203a5..fbd51d44a 100755 --- a/src/etc/rc.filter_configure_xmlrpc +++ b/src/etc/rc.filter_configure_xmlrpc @@ -40,7 +40,6 @@ require_once("interfaces.inc"); require_once("openvpn.inc"); require_once("vslb.inc"); require_once("system.inc"); -require_once("pfsense-utils.inc"); require_once("services.inc"); require_once("rrd.inc"); diff --git a/src/etc/rc.initial.setlanip b/src/etc/rc.initial.setlanip index b2387604d..5eedaf463 100755 --- a/src/etc/rc.initial.setlanip +++ b/src/etc/rc.initial.setlanip @@ -36,7 +36,6 @@ require_once("ipsec.inc"); require_once("filter.inc"); require_once("rrd.inc"); require_once("util.inc"); -require_once("pfsense-utils.inc"); require_once("services.inc"); require_once("unbound.inc"); require_once("system.inc"); diff --git a/src/etc/rc.initial.setports b/src/etc/rc.initial.setports index ab4485714..5b3e99e12 100755 --- a/src/etc/rc.initial.setports +++ b/src/etc/rc.initial.setports @@ -38,7 +38,6 @@ require_once("system.inc"); require_once("services.inc"); require_once("interfaces.inc"); require_once("openvpn.inc"); -require_once("pfsense-utils.inc"); require_once("unbound.inc"); if (set_networking_interfaces_ports()) { diff --git a/src/etc/rc.interfaces_wan_configure b/src/etc/rc.interfaces_wan_configure index 215fbfdae..7f1d15f6c 100755 --- a/src/etc/rc.interfaces_wan_configure +++ b/src/etc/rc.interfaces_wan_configure @@ -33,7 +33,6 @@ require_once("filter.inc"); require_once("system.inc"); require_once('openvpn.inc'); require_once("interfaces.inc"); -require_once("pfsense-utils.inc"); require_once("unbound.inc"); require_once("services.inc"); diff --git a/src/etc/rc.linkup b/src/etc/rc.linkup index 88ed019ec..9c7ca07de 100755 --- a/src/etc/rc.linkup +++ b/src/etc/rc.linkup @@ -35,7 +35,6 @@ require_once('ipsec.inc'); require_once('openvpn.inc'); require_once("util.inc"); require_once("system.inc"); -require_once("pfsense-utils.inc"); require_once("unbound.inc"); require_once("services.inc"); diff --git a/src/etc/rc.newipsecdns b/src/etc/rc.newipsecdns index 6a4139986..34e0062a7 100755 --- a/src/etc/rc.newipsecdns +++ b/src/etc/rc.newipsecdns @@ -33,7 +33,6 @@ require_once("util.inc"); require_once("config.inc"); require_once("filter.inc"); require_once('ipsec.inc'); -require_once("pfsense-utils.inc"); require_once("interfaces.inc"); /* make sure to wait until the boot scripts have finished */ diff --git a/src/etc/rc.newroutedns b/src/etc/rc.newroutedns index aed10edb7..a85ac737e 100755 --- a/src/etc/rc.newroutedns +++ b/src/etc/rc.newroutedns @@ -31,7 +31,6 @@ require_once("util.inc"); require_once("config.inc"); require_once("system.inc"); -require_once("pfsense-utils.inc"); require_once("interfaces.inc"); require_once("gwlb.inc"); diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip index 1fc8b4269..f3e6e9ac0 100755 --- a/src/etc/rc.newwanip +++ b/src/etc/rc.newwanip @@ -37,7 +37,6 @@ require_once("rrd.inc"); require_once("util.inc"); require_once("system.inc"); require_once("interfaces.inc"); -require_once("pfsense-utils.inc"); require_once("services.inc"); require_once("unbound.inc"); require_once("plugins.inc"); diff --git a/src/etc/rc.newwanipv6 b/src/etc/rc.newwanipv6 index 68f0502fd..6776fe4c6 100755 --- a/src/etc/rc.newwanipv6 +++ b/src/etc/rc.newwanipv6 @@ -39,7 +39,6 @@ require_once("rrd.inc"); require_once("util.inc"); require_once("system.inc"); require_once("plugins.inc"); -require_once("pfsense-utils.inc"); require_once("interfaces.inc"); /* Interface IP address has changed */ diff --git a/src/etc/rc.reload_all b/src/etc/rc.reload_all index 3cd9ade7e..a0a9898d9 100755 --- a/src/etc/rc.reload_all +++ b/src/etc/rc.reload_all @@ -34,7 +34,6 @@ require_once("filter.inc"); require_once('ipsec.inc'); require_once("util.inc"); require_once("system.inc"); -require_once("pfsense-utils.inc"); require_once("services.inc"); require_once("unbound.inc"); require_once("interfaces.inc"); diff --git a/src/etc/rc.reload_interfaces b/src/etc/rc.reload_interfaces index 42f1a95e0..97895a248 100755 --- a/src/etc/rc.reload_interfaces +++ b/src/etc/rc.reload_interfaces @@ -34,7 +34,6 @@ require_once("openvpn.inc"); require_once('ipsec.inc'); require_once("system.inc"); require_once("interfaces.inc"); -require_once("pfsense-utils.inc"); require_once("services.inc"); require_once("unbound.inc"); diff --git a/src/etc/rc.resolv_conf_generate b/src/etc/rc.resolv_conf_generate index 8481c7bbe..fa0ef94d6 100755 --- a/src/etc/rc.resolv_conf_generate +++ b/src/etc/rc.resolv_conf_generate @@ -31,7 +31,6 @@ require_once("util.inc"); require_once("config.inc"); require_once("system.inc"); require_once("services.inc"); -require_once("pfsense-utils.inc"); require_once("interfaces.inc"); system_resolvconf_generate(true); diff --git a/src/etc/rc.update_alias_url_data b/src/etc/rc.update_alias_url_data index c01f0f40e..3c6685b18 100755 --- a/src/etc/rc.update_alias_url_data +++ b/src/etc/rc.update_alias_url_data @@ -28,7 +28,6 @@ require_once("config.inc"); require_once("util.inc"); -require_once("pfsense-utils.inc"); function update_alias_url_data() diff --git a/src/etc/rc.update_urltables b/src/etc/rc.update_urltables index fafb974a3..4327f18e2 100755 --- a/src/etc/rc.update_urltables +++ b/src/etc/rc.update_urltables @@ -4,7 +4,6 @@ require_once("config.inc"); require_once("util.inc"); require_once("filter.inc"); -require_once("pfsense-utils.inc"); if (!isset($config['aliases']['alias'])) { // No aliases diff --git a/src/sbin/3gstats.php b/src/sbin/3gstats.php index 82effd472..cff97d168 100755 --- a/src/sbin/3gstats.php +++ b/src/sbin/3gstats.php @@ -1,6 +1,5 @@ #!/usr/local/bin/php