(legacy) cleanup filter.inc requires

src/etc/inc/authgui.inc

@@ -31,7 +31,6 @@
 */
 
 require_once("auth.inc");
-require_once("filter.inc");
 require_once("functions.inc");
 
 // provided via legacy_bindings.inc 

src/etc/inc/captiveportal.inc

@@ -37,7 +37,6 @@
 /* include all configuration functions */
 require_once("config.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("radius.inc");
 require_once("captiveportal.radius_accounting.inc");
 require_once("captiveportal.radius_authentication.inc");

src/etc/inc/vslb.inc

@@ -25,7 +25,6 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
-require_once("filter.inc");
 
 function subnetv4_expand($subnet) {
 	$result = array();

src/www/diag_backup.php

@@ -38,7 +38,6 @@ $nocsrf = true;
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("services.inc");
 require_once("util.inc");
 

src/www/diag_resetstate.php

@@ -29,7 +29,6 @@
 
 
 require_once("guiconfig.inc");
-require_once("filter.inc");
 
 function filter_flush_state_table()
 {

src/www/firewall_aliases_edit.php

@@ -32,7 +32,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 
 /* returns an array consisting of every element of $haystack that is not equal to $needle. */
 function array_exclude($needle, $haystack)

src/www/firewall_aliases_import.php

@@ -32,7 +32,6 @@ $reserved_keywords = array("all", "pass", "block", "out", "queue", "max", "min",
 
 require_once("guiconfig.inc");
 require_once("util.inc");
-require_once("filter.inc");
 
 $pgtitle = array(gettext("Firewall"),gettext("Aliases"),gettext("Bulk import"));
 

src/www/firewall_nat_1to1_edit.php

@@ -28,7 +28,6 @@
 
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
-require_once("filter.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_nat_1to1.php');
 

src/www/firewall_nat_edit.php

@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("filter.inc");
 
 /****f* itemid/delete_id
  * NAME

src/www/firewall_nat_npt_edit.php

@@ -26,6 +26,10 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+require_once("guiconfig.inc");
+require_once("interfaces.inc");
+
+
 function natnptcmp($a, $b) {
 	return ipcmp($a['external'], $b['external']);
 }
@@ -40,10 +44,6 @@ function nat_npt_rules_sort() {
         usort($config['nat']['npt'], "natnptcmp");
 }
 
-require_once("guiconfig.inc");
-require_once("interfaces.inc");
-require_once("filter.inc");
-
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_nat_npt.php');
 
 $ifdisp = get_configured_interface_with_descr();

src/www/firewall_nat_out_edit.php

@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("filter.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_nat_out.php');
 

src/www/firewall_rules_edit.php

@@ -29,7 +29,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("filter.inc");
 
 $firewall_rules_dscp_types = array("af11",
 				"af12",

src/www/firewall_schedule.php

@@ -27,12 +27,13 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-$dayArray = array (gettext('Mon'),gettext('Tues'),gettext('Wed'),gettext('Thur'),gettext('Fri'),gettext('Sat'),gettext('Sun'));
-$monthArray = array (gettext('January'),gettext('February'),gettext('March'),gettext('April'),gettext('May'),gettext('June'),gettext('July'),gettext('August'),gettext('September'),gettext('October'),gettext('November'),gettext('December'));
-
 require_once("guiconfig.inc");
 require_once("filter.inc");
 
+
+$dayArray = array (gettext('Mon'),gettext('Tues'),gettext('Wed'),gettext('Thur'),gettext('Fri'),gettext('Sat'),gettext('Sun'));
+$monthArray = array (gettext('January'),gettext('February'),gettext('March'),gettext('April'),gettext('May'),gettext('June'),gettext('July'),gettext('August'),gettext('September'),gettext('October'),gettext('November'),gettext('December'));
+
 $pgtitle = array(gettext("Firewall"),gettext("Schedules"));
 
 if (!is_array($config['schedules']['schedule']))

src/www/firewall_schedule_edit.php

@@ -27,6 +27,10 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+require_once("guiconfig.inc");
+require_once("functions.inc");
+
+
 /****f* legacy/is_schedule_inuse
  * NAME
  *   checks to see if a schedule is currently in use by a rule
@@ -71,10 +75,6 @@ function schedule_sort(){
         usort($config['schedules']['schedule'], "schedulecmp");
 }
 
-require_once("guiconfig.inc");
-require_once("functions.inc");
-require_once("filter.inc");
-
 $pgtitle = array(gettext("Firewall"),gettext("Schedules"),gettext("Edit"));
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_schedule.php');

src/www/firewall_virtual_ip_edit.php

@@ -30,7 +30,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("filter.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_virtual_ip.php');
 

src/www/interfaces.php

@@ -33,7 +33,6 @@
 
 require_once("guiconfig.inc");
 require_once("ipsec.inc");
-require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("filter.inc");
 require_once("rrd.inc");

src/www/load_balancer_pool_edit.php

@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("filter.inc");
 require_once("util.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/load_balancer_pool.php');

src/www/services_captiveportal.php

@@ -27,14 +27,13 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("captiveportal.inc");
 
 if (substr($_GET['act'], 0, 3) == "get")
 	$nocsrf = true;
 
-require_once("guiconfig.inc");
 
 global $cpzone;
 global $cpzoneid;

src/www/services_captiveportal_filemanager.php

@@ -27,6 +27,10 @@
 	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("functions.inc");
+require_once("captiveportal.inc");
+
 
 $captiveportal_element_sizelimit = 1048576;
 
@@ -42,11 +46,6 @@ function cpelements_sort()
         usort($config['captiveportal'][$cpzone]['element'], "cpelementscmp");
 }
 
-require_once("guiconfig.inc");
-require_once("functions.inc");
-require_once("filter.inc");
-require_once("captiveportal.inc");
-
 $cpzone = $_GET['zone'];
 if (isset($_POST['zone'])) {
         $cpzone = $_POST['zone'];

src/www/services_captiveportal_ip.php

@@ -28,7 +28,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("captiveportal.inc");
 
 $cpzone = $_GET['zone'];

src/www/services_captiveportal_ip_edit.php

@@ -28,6 +28,11 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+require_once("guiconfig.inc");
+require_once("functions.inc");
+require_once("captiveportal.inc");
+
+
 function allowedipscmp($a, $b)
 {
     return strcmp($a['ip'], $b['ip']);
@@ -40,11 +45,6 @@ function allowedips_sort()
     usort($config['captiveportal'][$cpzone]['allowedip'], "allowedipscmp");
 }
 
-require_once("guiconfig.inc");
-require_once("functions.inc");
-require_once("filter.inc");
-require_once("captiveportal.inc");
-
 $pgtitle = array(gettext("Services"),gettext("Captive portal"),gettext("Edit allowed IP address"));
 $shortcut_section = "captiveportal";
 

src/www/services_captiveportal_mac.php

@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("captiveportal.inc");
 
 global $cpzone;

src/www/services_captiveportal_mac_edit.php

@@ -26,6 +26,10 @@
 	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("functions.inc");
+require_once("captiveportal.inc");
+
 
 function passthrumacscmp($a, $b)
 {
@@ -39,11 +43,6 @@ function passthrumacs_sort()
     usort($config['captiveportal'][$cpzone]['passthrumac'], "passthrumacscmp");
 }
 
-require_once("guiconfig.inc");
-require_once("functions.inc");
-require_once("filter.inc");
-require_once("captiveportal.inc");
-
 global $cpzone;
 global $cpzoneid;
 

src/www/services_captiveportal_vouchers.php

@@ -33,7 +33,6 @@ if ($_POST['postafterlogin']) {
 
 require_once('guiconfig.inc');
 require_once('functions.inc');
-require_once('filter.inc');
 require_once('captiveportal.inc');
 require_once('voucher.inc');
 

src/www/services_captiveportal_vouchers_edit.php

@@ -28,7 +28,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("captiveportal.inc");
 require_once("voucher.inc");
 

src/www/services_captiveportal_zones.php

@@ -27,7 +27,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("captiveportal.inc");
 
 global $cpzone;

src/www/services_captiveportal_zones_edit.php

@@ -28,7 +28,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("captiveportal.inc");
 
 $pgtitle = array(gettext("Services"),gettext("Captive portal"),gettext("Edit Zones"));

src/www/services_dnsmasq.php

@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 
 $pconfig['enable'] = isset($config['dnsmasq']['enable']);
 $pconfig['regdhcp'] = isset($config['dnsmasq']['regdhcp']);

src/www/services_upnp.php

@@ -33,7 +33,6 @@ $shortcut_section = "upnp";
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once('miniupnpd.inc');
 
 function upnp_validate_ip($ip, $check_cdir) {

src/www/status_captiveportal.php

@@ -28,7 +28,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("captiveportal.inc");
 
 $cpzone = $_GET['zone'];

src/www/status_captiveportal_expire.php

@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("captiveportal.inc");
 require_once("voucher.inc");
 

src/www/status_captiveportal_test.php

@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("captiveportal.inc");
 require_once("voucher.inc");
 

src/www/status_captiveportal_voucher_rolls.php

@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("captiveportal.inc");
 require_once("voucher.inc");
 

src/www/status_captiveportal_vouchers.php

@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("captiveportal.inc");
 require_once("voucher.inc");
 

src/www/status_interfaces.php

@@ -29,7 +29,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("filter.inc");
 
 if ($_POST['if'] && $_POST['submit']) {
 	$interface = $_POST['if'];

src/www/status_rrd_graph.php

@@ -27,7 +27,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("filter.inc");
 require_once("rrd.inc");
 
 unset($input_errors);

src/www/status_rrd_graph_img.php

@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("filter.inc");
 require_once("rrd.inc");
 
 global $g;

src/www/status_rrd_graph_settings.php

@@ -27,7 +27,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("filter.inc");
 require_once("rrd.inc");
 
 $pconfig['enable'] = isset($config['rrd']['enable']);

src/www/system_gateway_groups.php

@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("openvpn.inc");
 
 // Resync and restart all VPNs using a gateway group.

src/www/widgets/widgets/load_balancer_status.widget.php

@@ -36,6 +36,7 @@ $nocsrf = true;
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
 require_once("functions.inc");
+require_once("filter.inc");
 require_once("vslb.inc");
 
 $now = time();