Require filter.inc and shaper.inc

36 files changed, 114 insertions, 8 deletions

diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index 21f4cc2..a880a13 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -50,6 +50,9 @@ ini_set('max_input_time', '0');
 /* omit no-cache headers because it confuses IE with file downloads */
 $omit_nocacheheaders = true;
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 function add_base_packages_menu_items() {
 	global $g, $config;
diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php
index 58eb128..5c02cd9 100755
--- a/usr/local/www/diag_logs_settings.php
+++ b/usr/local/www/diag_logs_settings.php
@@ -43,6 +43,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 $pconfig['reverse'] = isset($config['syslog']['reverse']);
 $pconfig['nentries'] = $config['syslog']['nentries'];
diff --git a/usr/local/www/firewall_aliases.php b/usr/local/www/firewall_aliases.php
index d5c1043..2926dd1 100755
--- a/usr/local/www/firewall_aliases.php
+++ b/usr/local/www/firewall_aliases.php
@@ -42,6 +42,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 if (!is_array($config['aliases']['alias']))
 	$config['aliases']['alias'] = array();
diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index 7664d04..c54eb2e 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -46,6 +46,9 @@
 $pgtitle = array("Firewall","Aliases","Edit");
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 if (!is_array($config['aliases']['alias']))
 	$config['aliases']['alias'] = array();
diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php
index 212aaff..3516c6f 100755
--- a/usr/local/www/firewall_nat.php
+++ b/usr/local/www/firewall_nat.php
@@ -42,6 +42,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 require_once("itemid.inc");
 
 if (!is_array($config['nat']['rule']))
diff --git a/usr/local/www/firewall_nat_1to1.php b/usr/local/www/firewall_nat_1to1.php
index 1aecbb8..d44ced8 100755
--- a/usr/local/www/firewall_nat_1to1.php
+++ b/usr/local/www/firewall_nat_1to1.php
@@ -40,6 +40,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 if (!is_array($config['nat']['onetoone'])) {
 	$config['nat']['onetoone'] = array();
diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php
index c5681db..5838210 100755
--- a/usr/local/www/firewall_nat_out.php
+++ b/usr/local/www/firewall_nat_out.php
@@ -42,6 +42,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 if (!is_array($config['nat']['advancedoutbound']['rule']))
 	$config['nat']['advancedoutbound']['rule'] = array();
diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php
index 0a064f6..902dd26 100755
--- a/usr/local/www/firewall_rules.php
+++ b/usr/local/www/firewall_rules.php
@@ -43,6 +43,9 @@
 
 $pgtitle = array("Firewall", "Rules");
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 function check_for_advaned_options(&$item) {
 	$item_set = "";
diff --git a/usr/local/www/firewall_schedule_edit.php b/usr/local/www/firewall_schedule_edit.php
index 1e15246..f318611 100644
--- a/usr/local/www/firewall_schedule_edit.php
+++ b/usr/local/www/firewall_schedule_edit.php
@@ -55,6 +55,9 @@ function schedule_sort(){
 
 $pgtitle = array("Firewall","Schedules","Edit");
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 $starttimehr = 00;
 $starttimemin = 00;
diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php
index 181a51e..bbb4154 100755
--- a/usr/local/www/firewall_shaper.php
+++ b/usr/local/www/firewall_shaper.php
@@ -40,6 +40,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 if($_GET['reset'] <> "") {
 	/* XXX: Huh, why are we killing php? */
diff --git a/usr/local/www/firewall_shaper_layer7.php b/usr/local/www/firewall_shaper_layer7.php
index b9fb4f6..1fe4ead 100755
--- a/usr/local/www/firewall_shaper_layer7.php
+++ b/usr/local/www/firewall_shaper_layer7.php
@@ -39,6 +39,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 // Variables protocols (dynamic) and structures (static)
 $avail_protos =& generate_protocols_array();
diff --git a/usr/local/www/firewall_shaper_queues.php b/usr/local/www/firewall_shaper_queues.php
index 990ed39..d335f94 100755
--- a/usr/local/www/firewall_shaper_queues.php
+++ b/usr/local/www/firewall_shaper_queues.php
@@ -40,6 +40,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 if($_GET['reset'] <> "") {
 	mwexec("killall -9 pfctl php");
diff --git a/usr/local/www/firewall_shaper_vinterface.php b/usr/local/www/firewall_shaper_vinterface.php
index 3a27bb5..f3b5536 100644
--- a/usr/local/www/firewall_shaper_vinterface.php
+++ b/usr/local/www/firewall_shaper_vinterface.php
@@ -41,6 +41,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 if($_GET['reset'] <> "") {
 	/* XXX: Huh, why are we killing php? */
diff --git a/usr/local/www/firewall_shaper_wizards.php b/usr/local/www/firewall_shaper_wizards.php
index 69c3dd2..1557242 100755
--- a/usr/local/www/firewall_shaper_wizards.php
+++ b/usr/local/www/firewall_shaper_wizards.php
@@ -40,6 +40,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 if($_GET['reset'] <> "") {
 	/* XXX: Huh, why are we killing php? */
diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php
index 46df4f8..a88a217 100755
--- a/usr/local/www/firewall_virtual_ip.php
+++ b/usr/local/www/firewall_virtual_ip.php
@@ -49,6 +49,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 if (!is_array($config['virtualip']['vip'])) {
 	$config['virtualip']['vip'] = array();
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 16cff63..02d2abc 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -45,6 +45,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 if ($_REQUEST['if'])
 	$if = $_REQUEST['if'];
diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php
index 1fa6070..89f8631 100755
--- a/usr/local/www/interfaces_assign.php
+++ b/usr/local/www/interfaces_assign.php
@@ -42,6 +42,9 @@
 
 $pgtitle = array("Interfaces", "Assign network ports");
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 /*
 	In this file, "port" refers to the physical port name,
diff --git a/usr/local/www/load_balancer_monitor.php b/usr/local/www/load_balancer_monitor.php
index d5a95fa..797412b 100755
--- a/usr/local/www/load_balancer_monitor.php
+++ b/usr/local/www/load_balancer_monitor.php
@@ -40,6 +40,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 require("util.inc");
 
 if (!is_array($config['load_balancer']['monitor_type'])) {
diff --git a/usr/local/www/load_balancer_pool.php b/usr/local/www/load_balancer_pool.php
index 71f0a05..103cb7e 100755
--- a/usr/local/www/load_balancer_pool.php
+++ b/usr/local/www/load_balancer_pool.php
@@ -40,6 +40,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 if (!is_array($config['load_balancer']['lbpool'])) {
 	$config['load_balancer']['lbpool'] = array();
diff --git a/usr/local/www/load_balancer_relay_action.php b/usr/local/www/load_balancer_relay_action.php
index d8c72b4..9ee0deb 100755
--- a/usr/local/www/load_balancer_relay_action.php
+++ b/usr/local/www/load_balancer_relay_action.php
@@ -40,6 +40,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 if (!is_array($config['load_balancer']['lbaction'])) {
 	$config['load_balancer']['lbaction'] = array();
diff --git a/usr/local/www/load_balancer_relay_protocol.php b/usr/local/www/load_balancer_relay_protocol.php
index fe78443..cfa8086 100755
--- a/usr/local/www/load_balancer_relay_protocol.php
+++ b/usr/local/www/load_balancer_relay_protocol.php
@@ -40,6 +40,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 if (!is_array($config['load_balancer']['lbprotocol'])) {
 	$config['load_balancer']['lbprotocol'] = array();
diff --git a/usr/local/www/load_balancer_virtual_server.php b/usr/local/www/load_balancer_virtual_server.php
index bf733d3..063b02d 100755
--- a/usr/local/www/load_balancer_virtual_server.php
+++ b/usr/local/www/load_balancer_virtual_server.php
@@ -39,7 +39,10 @@
 ##|*MATCH=load_balancer_virtual_server.php*
 ##|-PRIV
 
-require_once("guiconfig.inc");
+require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 require_once("vslb.inc");
 
 if (!is_array($config['load_balancer']['virtual_server'])) {
diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php
index 4f46a74..85d9372 100755
--- a/usr/local/www/pkg_edit.php
+++ b/usr/local/www/pkg_edit.php
@@ -38,7 +38,10 @@
 ##|*MATCH=pkg_edit.php*
 ##|-PRIV
 
-require_once("guiconfig.inc");
+require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 require_once("pkg-utils.inc");
 
 /* dummy stubs needed by some code that was MFC'd */
diff --git a/usr/local/www/pkg_mgr_install.php b/usr/local/www/pkg_mgr_install.php
index 62835e8..4076a72 100755
--- a/usr/local/www/pkg_mgr_install.php
+++ b/usr/local/www/pkg_mgr_install.php
@@ -39,7 +39,10 @@
 ##|*MATCH=pkg_mgr_install.php*
 ##|-PRIV
 
-require_once("guiconfig.inc");
+require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 require_once("pkg-utils.inc");
 
 $static_output = "";
diff --git a/usr/local/www/services_dnsmasq.php b/usr/local/www/services_dnsmasq.php
index e39af3f..853d17d 100755
--- a/usr/local/www/services_dnsmasq.php
+++ b/usr/local/www/services_dnsmasq.php
@@ -40,6 +40,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 $pconfig['enable']  = isset($config['dnsmasq']['enable']);
 $pconfig['regdhcp'] = isset($config['dnsmasq']['regdhcp']);
diff --git a/usr/local/www/system.php b/usr/local/www/system.php
index bc4c413..84036e2 100755
--- a/usr/local/www/system.php
+++ b/usr/local/www/system.php
@@ -41,6 +41,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 $pconfig['hostname'] = $config['system']['hostname'];
 $pconfig['domain'] = $config['system']['domain'];
diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php
index 595deb1..39fdbe8 100644
--- a/usr/local/www/system_advanced_admin.php
+++ b/usr/local/www/system_advanced_admin.php
@@ -45,6 +45,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 $pconfig['webguiproto'] = $config['system']['webgui']['protocol'];
 $pconfig['webguiport'] = $config['system']['webgui']['port'];
diff --git a/usr/local/www/system_advanced_firewall.php b/usr/local/www/system_advanced_firewall.php
index b124795..d0306e6 100644
--- a/usr/local/www/system_advanced_firewall.php
+++ b/usr/local/www/system_advanced_firewall.php
@@ -44,6 +44,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 $pconfig['disablefilter'] = $config['system']['disablefilter'];
 $pconfig['rfc959workaround'] = $config['system']['rfc959workaround'];
diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php
index b830978..6bd5d3a 100644
--- a/usr/local/www/system_advanced_misc.php
+++ b/usr/local/www/system_advanced_misc.php
@@ -44,6 +44,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 $pconfig['harddiskstandby'] = $config['system']['harddiskstandby'];
 $pconfig['lb_use_sticky'] = isset($config['system']['lb_use_sticky']);
diff --git a/usr/local/www/system_advanced_network.php b/usr/local/www/system_advanced_network.php
index 2b3b48e..ef309e9 100644
--- a/usr/local/www/system_advanced_network.php
+++ b/usr/local/www/system_advanced_network.php
@@ -1,3 +1,4 @@
+
 <?php
 /* $Id$ */
 /*
@@ -44,7 +45,10 @@
 ##|-PRIV
 
 require("guiconfig.inc");
-require("filter.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
+
 
 $pconfig['ipv6nat_enable'] = isset($config['diag']['ipv6nat']['enable']);
 $pconfig['ipv6nat_ipaddr'] = $config['diag']['ipv6nat']['ipaddr'];
diff --git a/usr/local/www/system_gateway_groups.php b/usr/local/www/system_gateway_groups.php
index 2bf23f9..e292402 100755
--- a/usr/local/www/system_gateway_groups.php
+++ b/usr/local/www/system_gateway_groups.php
@@ -40,6 +40,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 if (!is_array($config['gateways']['gateway_group']))
 	$config['gateways']['gateway_group'] = array();
diff --git a/usr/local/www/system_gateways.php b/usr/local/www/system_gateways.php
index 6152300..39d6076 100755
--- a/usr/local/www/system_gateways.php
+++ b/usr/local/www/system_gateways.php
@@ -40,6 +40,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 $a_gateways = return_gateways_array();
 $a_gateways_arr = array();
diff --git a/usr/local/www/system_routes.php b/usr/local/www/system_routes.php
index 5b5581e..a9160c5 100755
--- a/usr/local/www/system_routes.php
+++ b/usr/local/www/system_routes.php
@@ -40,6 +40,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 
 if (!is_array($config['staticroutes']['route']))
 	$config['staticroutes']['route'] = array();
diff --git a/usr/local/www/vpn_ipsec.php b/usr/local/www/vpn_ipsec.php
index b8c0aae..d244ae6 100755
--- a/usr/local/www/vpn_ipsec.php
+++ b/usr/local/www/vpn_ipsec.php
@@ -36,8 +36,10 @@
 ##|*MATCH=vpn_ipsec.php*
 ##|-PRIV
 
-require("functions.inc");
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
 
diff --git a/usr/local/www/vpn_pptp.php b/usr/local/www/vpn_pptp.php
index f841d98..5707b1b 100755
--- a/usr/local/www/vpn_pptp.php
+++ b/usr/local/www/vpn_pptp.php
@@ -36,6 +36,9 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 require_once("vpn.inc");
 
 if (!is_array($config['pptpd']['radius'])) {
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php
index 85d8aa0..d3679d7 100755
--- a/usr/local/www/xmlrpc.php
+++ b/usr/local/www/xmlrpc.php
@@ -38,11 +38,12 @@
 ##|*MATCH=xmlrpc.php*
 ##|-PRIV
 
-
+require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
 require_once("xmlrpc_server.inc");
 require_once("xmlrpc.inc");
-require_once("config.inc");
-require_once("functions.inc");
 require_once("array_intersect_key.inc");
 
 /* grab sync to ip if enabled */