From 02cc81eff934bd57edd809b14fae445e5c73cc65 Mon Sep 17 00:00:00 2001 From: Doug Wollison Date: Sat, 21 Nov 2015 12:51:32 -0500 Subject: Added use of class autoloading (GUI stuff only) Any GUI script that loads the guiconfig.inc file will have access to the autoloader. --- src/usr/local/www/classes/Form.class.php | 5 ----- src/usr/local/www/classes/Modal.class.php | 2 -- src/usr/local/www/classes/autoload.inc.php | 12 ++++++++++++ src/usr/local/www/diag_authentication.php | 2 -- src/usr/local/www/diag_backup.php | 2 -- src/usr/local/www/diag_confbak.php | 2 -- src/usr/local/www/diag_dns.php | 2 -- src/usr/local/www/diag_dump_states.php | 2 -- src/usr/local/www/diag_dump_states_sources.php | 2 -- src/usr/local/www/diag_logs.php | 2 -- src/usr/local/www/diag_logs_filter.php | 2 -- src/usr/local/www/diag_logs_settings.php | 2 -- src/usr/local/www/diag_nanobsd.php | 2 -- src/usr/local/www/diag_packet_capture.php | 2 -- src/usr/local/www/diag_pf_info.php | 1 - src/usr/local/www/diag_ping.php | 2 -- src/usr/local/www/diag_resetstate.php | 2 -- src/usr/local/www/diag_routes.php | 2 -- src/usr/local/www/diag_smart.php | 2 -- src/usr/local/www/diag_system_pftop.php | 1 - src/usr/local/www/diag_tables.php | 1 - src/usr/local/www/diag_testport.php | 2 -- src/usr/local/www/diag_traceroute.php | 2 -- src/usr/local/www/firewall_aliases_edit.php | 1 - src/usr/local/www/firewall_aliases_import.php | 1 - src/usr/local/www/firewall_nat_1to1_edit.php | 2 -- src/usr/local/www/firewall_nat_edit.php | 2 -- src/usr/local/www/firewall_nat_npt_edit.php | 2 -- src/usr/local/www/firewall_nat_out.php | 2 -- src/usr/local/www/firewall_nat_out_edit.php | 2 -- src/usr/local/www/firewall_rules_edit.php | 1 - src/usr/local/www/firewall_schedule_edit.php | 2 -- src/usr/local/www/firewall_shaper.php | 2 -- src/usr/local/www/firewall_shaper_vinterface.php | 1 - src/usr/local/www/firewall_virtual_ip_edit.php | 2 -- src/usr/local/www/guiconfig.inc | 8 ++------ src/usr/local/www/interfaces.php | 3 --- src/usr/local/www/interfaces_bridge_edit.php | 2 -- src/usr/local/www/interfaces_gif_edit.php | 2 -- src/usr/local/www/interfaces_gre_edit.php | 2 -- src/usr/local/www/interfaces_groups_edit.php | 1 - src/usr/local/www/interfaces_lagg_edit.php | 2 -- src/usr/local/www/interfaces_ppps_edit.php | 2 -- src/usr/local/www/interfaces_qinq_edit.php | 2 -- src/usr/local/www/interfaces_vlan_edit.php | 1 - src/usr/local/www/interfaces_wireless_edit.php | 2 -- src/usr/local/www/load_balancer_monitor_edit.php | 2 -- src/usr/local/www/load_balancer_pool_edit.php | 2 -- src/usr/local/www/load_balancer_setting.php | 2 -- src/usr/local/www/load_balancer_virtual_server_edit.php | 2 -- src/usr/local/www/pkg_edit.php | 2 -- src/usr/local/www/services_captiveportal.php | 2 -- src/usr/local/www/services_captiveportal_filemanager.php | 2 -- src/usr/local/www/services_captiveportal_hostname_edit.php | 2 -- src/usr/local/www/services_captiveportal_ip_edit.php | 2 -- src/usr/local/www/services_captiveportal_mac_edit.php | 2 -- src/usr/local/www/services_captiveportal_vouchers.php | 2 -- src/usr/local/www/services_captiveportal_vouchers_edit.php | 2 -- src/usr/local/www/services_captiveportal_zones_edit.php | 2 -- src/usr/local/www/services_dhcp.php | 2 -- src/usr/local/www/services_dhcp_edit.php | 2 -- src/usr/local/www/services_dhcp_relay.php | 2 -- src/usr/local/www/services_dhcpv6.php | 2 -- src/usr/local/www/services_dhcpv6_edit.php | 2 -- src/usr/local/www/services_dhcpv6_relay.php | 2 -- src/usr/local/www/services_dnsmasq.php | 2 -- src/usr/local/www/services_dnsmasq_domainoverride_edit.php | 2 -- src/usr/local/www/services_dnsmasq_edit.php | 2 -- src/usr/local/www/services_dyndns_edit.php | 2 -- src/usr/local/www/services_igmpproxy_edit.php | 2 -- src/usr/local/www/services_ntpd.php | 2 -- src/usr/local/www/services_ntpd_gps.php | 2 -- src/usr/local/www/services_ntpd_pps.php | 2 -- src/usr/local/www/services_rfc2136_edit.php | 2 -- src/usr/local/www/services_router_advertisements.php | 2 -- src/usr/local/www/services_snmp.php | 2 -- src/usr/local/www/services_unbound.php | 2 -- src/usr/local/www/services_unbound_acls.php | 2 -- src/usr/local/www/services_unbound_advanced.php | 2 -- src/usr/local/www/services_unbound_domainoverride_edit.php | 2 -- src/usr/local/www/services_unbound_host_edit.php | 2 -- src/usr/local/www/services_wol.php | 2 -- src/usr/local/www/services_wol_edit.php | 2 -- src/usr/local/www/status_captiveportal.php | 2 -- src/usr/local/www/status_captiveportal_expire.php | 2 -- src/usr/local/www/status_captiveportal_test.php | 2 -- src/usr/local/www/status_graph.php | 2 -- src/usr/local/www/status_rrd_graph.php | 2 -- src/usr/local/www/status_rrd_graph_settings.php | 2 -- src/usr/local/www/system.php | 1 - src/usr/local/www/system_advanced_admin.php | 1 - src/usr/local/www/system_advanced_firewall.php | 1 - src/usr/local/www/system_advanced_misc.php | 2 -- src/usr/local/www/system_advanced_network.php | 1 - src/usr/local/www/system_advanced_notifications.php | 2 -- src/usr/local/www/system_advanced_sysctl.php | 1 - src/usr/local/www/system_authservers.php | 1 - src/usr/local/www/system_camanager.php | 1 - src/usr/local/www/system_certmanager.php | 1 - src/usr/local/www/system_crlmanager.php | 2 -- src/usr/local/www/system_gateway_groups_edit.php | 2 -- src/usr/local/www/system_gateways_edit.php | 1 - src/usr/local/www/system_groupmanager.php | 1 - src/usr/local/www/system_groupmanager_addprivs.php | 1 - src/usr/local/www/system_hasync.php | 2 -- src/usr/local/www/system_routes_edit.php | 1 - src/usr/local/www/system_update_settings.php | 2 -- src/usr/local/www/system_usermanager.php | 1 - src/usr/local/www/system_usermanager_addprivs.php | 2 -- src/usr/local/www/system_usermanager_passwordmg.php | 2 -- src/usr/local/www/system_usermanager_settings.php | 1 - src/usr/local/www/vpn_ipsec_keys_edit.php | 1 - src/usr/local/www/vpn_ipsec_mobile.php | 1 - src/usr/local/www/vpn_ipsec_phase1.php | 2 -- src/usr/local/www/vpn_ipsec_phase2.php | 2 -- src/usr/local/www/vpn_ipsec_settings.php | 1 - src/usr/local/www/vpn_openvpn_client.php | 2 -- src/usr/local/www/vpn_openvpn_csc.php | 2 -- src/usr/local/www/vpn_openvpn_server.php | 2 -- src/usr/local/www/vpn_pppoe_edit.php | 2 -- src/usr/local/www/wizard.php | 2 -- 121 files changed, 14 insertions(+), 222 deletions(-) create mode 100644 src/usr/local/www/classes/autoload.inc.php (limited to 'src/usr') diff --git a/src/usr/local/www/classes/Form.class.php b/src/usr/local/www/classes/Form.class.php index b489a72..7964d12 100644 --- a/src/usr/local/www/classes/Form.class.php +++ b/src/usr/local/www/classes/Form.class.php @@ -27,11 +27,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -require_once('classes/Form/Element.class.php'); -require_once('classes/Form/Input.class.php'); -foreach (glob('classes/Form/*.class.php') as $file) - require_once($file); - class Form extends Form_Element { const LABEL_WIDTH = 2; diff --git a/src/usr/local/www/classes/Modal.class.php b/src/usr/local/www/classes/Modal.class.php index 4d5cf4f..44b22b1 100644 --- a/src/usr/local/www/classes/Modal.class.php +++ b/src/usr/local/www/classes/Modal.class.php @@ -1,7 +1,5 @@ '. $savemsg.''); -require_once('classes/Form.class.php'); - $form = new Form('Test'); $section = new Form_Section('Authentication Test'); diff --git a/src/usr/local/www/diag_backup.php b/src/usr/local/www/diag_backup.php index e63dd73..e73b67a 100644 --- a/src/usr/local/www/diag_backup.php +++ b/src/usr/local/www/diag_backup.php @@ -630,8 +630,6 @@ $tab_array[] = array(gettext("Config History"), false, "diag_confbak.php"); $tab_array[] = array(gettext("Backup/Restore"), true, "diag_backup.php"); display_top_tabs($tab_array); -require_once('classes/Form.class.php'); - $form = new Form(false); $form->setMultipartEncoding(); // Allow file uploads diff --git a/src/usr/local/www/diag_confbak.php b/src/usr/local/www/diag_confbak.php index 8d3e7c8..65db90e 100644 --- a/src/usr/local/www/diag_confbak.php +++ b/src/usr/local/www/diag_confbak.php @@ -184,8 +184,6 @@ $tab_array[] = array(gettext("Config History"), true, "diag_confbak.php"); $tab_array[] = array(gettext("Backup/Restore"), false, "diag_backup.php"); display_top_tabs($tab_array); -require('classes/Form.class.php'); - $form = new Form(new Form_Button( 'Submit', gettext("Save") diff --git a/src/usr/local/www/diag_dns.php b/src/usr/local/www/diag_dns.php index 22366bf..88736bc 100755 --- a/src/usr/local/www/diag_dns.php +++ b/src/usr/local/www/diag_dns.php @@ -212,8 +212,6 @@ else if (!$resolved && $type) if ($createdalias) print(''); -require_once('classes/Form.class.php'); - $form = new Form('Lookup'); $section = new Form_Section('DNS Lookup'); diff --git a/src/usr/local/www/diag_dump_states.php b/src/usr/local/www/diag_dump_states.php index 1b3c7be..32ee131 100755 --- a/src/usr/local/www/diag_dump_states.php +++ b/src/usr/local/www/diag_dump_states.php @@ -132,8 +132,6 @@ display_top_tabs($tab_array); // Start of tab content $current_statecount=`pfctl -si | grep "current entries" | awk '{ print $3 }'`; -require_once('classes/Form.class.php'); - $form = new Form(false); $section = new Form_Section('State filter'); diff --git a/src/usr/local/www/diag_dump_states_sources.php b/src/usr/local/www/diag_dump_states_sources.php index daa4fe3..79d9ee4 100644 --- a/src/usr/local/www/diag_dump_states_sources.php +++ b/src/usr/local/www/diag_dump_states_sources.php @@ -125,8 +125,6 @@ events.push(function(){ addGlobal(new Form_Input( 'getactivity', diff --git a/src/usr/local/www/diag_ping.php b/src/usr/local/www/diag_ping.php index afaf0fe..bba519e 100644 --- a/src/usr/local/www/diag_ping.php +++ b/src/usr/local/www/diag_ping.php @@ -168,8 +168,6 @@ include('head.inc'); if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form('Ping'); $section = new Form_Section('Ping'); diff --git a/src/usr/local/www/diag_resetstate.php b/src/usr/local/www/diag_resetstate.php index fcbc3c6..475bdba 100644 --- a/src/usr/local/www/diag_resetstate.php +++ b/src/usr/local/www/diag_resetstate.php @@ -123,8 +123,6 @@ if (isset($config['system']['lb_use_sticky'])) $tab_array[] = array(gettext("Reset States"), true, "diag_resetstate.php"); display_top_tabs($tab_array); -require_once('classes/Form.class.php'); - $resetbtn = new Form_Button( 'Submit', 'Reset' diff --git a/src/usr/local/www/diag_routes.php b/src/usr/local/www/diag_routes.php index 161ad78..a39ad22 100644 --- a/src/usr/local/www/diag_routes.php +++ b/src/usr/local/www/diag_routes.php @@ -103,8 +103,6 @@ $shortcut_section = "routing"; include('head.inc'); -require_once('classes/Form.class.php'); - $form = new Form('Update'); $form->addGlobal(new Form_Input( 'isAjax', diff --git a/src/usr/local/www/diag_smart.php b/src/usr/local/www/diag_smart.php index cccbdb7..7be9888 100644 --- a/src/usr/local/www/diag_smart.php +++ b/src/usr/local/www/diag_smart.php @@ -110,8 +110,6 @@ if (!file_exists('/dev/' . $targetdev)) { return; } -require_once('classes/Form.class.php'); - $tab_array = array(); $tab_array[0] = array(gettext("Information/Tests"), ($action != 'config'), $_SERVER['PHP_SELF'] . "?action=default"); $tab_array[1] = array(gettext("Config"), ($action == 'config'), $_SERVER['PHP_SELF'] . "?action=config"); diff --git a/src/usr/local/www/diag_system_pftop.php b/src/usr/local/www/diag_system_pftop.php index d43f1b5..db06ed2 100644 --- a/src/usr/local/www/diag_system_pftop.php +++ b/src/usr/local/www/diag_system_pftop.php @@ -118,7 +118,6 @@ if ($_REQUEST['sorttype'] && in_array($_REQUEST['sorttype'], $sorttypes) && if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); $form = new Form(false); $form->addGlobal(new Form_Input( 'getactivity', diff --git a/src/usr/local/www/diag_tables.php b/src/usr/local/www/diag_tables.php index 51fb2d7..8c8ae36 100644 --- a/src/usr/local/www/diag_tables.php +++ b/src/usr/local/www/diag_tables.php @@ -125,7 +125,6 @@ include("head.inc"); if ($savemsg) print_info_box($savemsg); -require_once('classes/Form.class.php'); $form = new Form('Show'); $section = new Form_Section('Table to display'); diff --git a/src/usr/local/www/diag_testport.php b/src/usr/local/www/diag_testport.php index e2dc326..c009929 100644 --- a/src/usr/local/www/diag_testport.php +++ b/src/usr/local/www/diag_testport.php @@ -245,8 +245,6 @@ else { print(''); } -require_once('classes/Form.class.php'); - $form = new Form('Test'); $section = new Form_Section('Test Port'); diff --git a/src/usr/local/www/diag_traceroute.php b/src/usr/local/www/diag_traceroute.php index 549c195..a593207 100644 --- a/src/usr/local/www/diag_traceroute.php +++ b/src/usr/local/www/diag_traceroute.php @@ -138,8 +138,6 @@ if ($_POST || $_REQUEST['host']) { if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form('Traceroute'); $section = new Form_Section('Traceroute'); diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php index 413b0d3..aaffcc2 100755 --- a/src/usr/local/www/firewall_aliases_edit.php +++ b/src/usr/local/www/firewall_aliases_edit.php @@ -617,7 +617,6 @@ if (empty($tab)) { if ($input_errors) print_input_errors($input_errors); -require('classes/Form.class.php'); $form = new Form; $form->addGlobal(new Form_Input( diff --git a/src/usr/local/www/firewall_aliases_import.php b/src/usr/local/www/firewall_aliases_import.php index fe12bb0..14a72ec 100755 --- a/src/usr/local/www/firewall_aliases_import.php +++ b/src/usr/local/www/firewall_aliases_import.php @@ -194,7 +194,6 @@ include("head.inc"); if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); $form = new Form; $section = new Form_Section('Alias details'); diff --git a/src/usr/local/www/firewall_nat_1to1_edit.php b/src/usr/local/www/firewall_nat_1to1_edit.php index 87bf7b6..f17358c 100644 --- a/src/usr/local/www/firewall_nat_1to1_edit.php +++ b/src/usr/local/www/firewall_nat_1to1_edit.php @@ -378,8 +378,6 @@ function dsttype_selected() { if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form(new Form_Button( 'Submit', gettext("Save") diff --git a/src/usr/local/www/firewall_nat_edit.php b/src/usr/local/www/firewall_nat_edit.php index 86cd2ac..03f0312 100644 --- a/src/usr/local/www/firewall_nat_edit.php +++ b/src/usr/local/www/firewall_nat_edit.php @@ -633,8 +633,6 @@ include("head.inc"); if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form(new Form_Button( 'Submit', gettext("Save") diff --git a/src/usr/local/www/firewall_nat_npt_edit.php b/src/usr/local/www/firewall_nat_npt_edit.php index 7fca814..dae73cf 100644 --- a/src/usr/local/www/firewall_nat_npt_edit.php +++ b/src/usr/local/www/firewall_nat_npt_edit.php @@ -209,8 +209,6 @@ include("head.inc"); if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('Edit NAT NPt entry'); diff --git a/src/usr/local/www/firewall_nat_out.php b/src/usr/local/www/firewall_nat_out.php index 2126e75..e5c61eb 100644 --- a/src/usr/local/www/firewall_nat_out.php +++ b/src/usr/local/www/firewall_nat_out.php @@ -253,8 +253,6 @@ $tab_array[] = array(gettext("Outbound"), true, "firewall_nat_out.php"); $tab_array[] = array(gettext("NPt"), false, "firewall_nat_npt.php"); display_top_tabs($tab_array); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('General Logging Options'); diff --git a/src/usr/local/www/firewall_nat_out_edit.php b/src/usr/local/www/firewall_nat_out_edit.php index 8d44ee3..750409d 100644 --- a/src/usr/local/www/firewall_nat_out_edit.php +++ b/src/usr/local/www/firewall_nat_out_edit.php @@ -439,8 +439,6 @@ function build_target_list() { if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form(new Form_Button( 'Submit', gettext("Save") diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index d4450d2..efdb420 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -986,7 +986,6 @@ include("head.inc"); if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); $form = new Form; $section = new Form_Section('Edit Firewall rule'); diff --git a/src/usr/local/www/firewall_schedule_edit.php b/src/usr/local/www/firewall_schedule_edit.php index 4d9f28e..973fc39 100644 --- a/src/usr/local/www/firewall_schedule_edit.php +++ b/src/usr/local/www/firewall_schedule_edit.php @@ -381,8 +381,6 @@ function build_month_list() { if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('Schedule information'); diff --git a/src/usr/local/www/firewall_shaper.php b/src/usr/local/www/firewall_shaper.php index fb7b3c1..e003144 100644 --- a/src/usr/local/www/firewall_shaper.php +++ b/src/usr/local/www/firewall_shaper.php @@ -64,8 +64,6 @@ ##|*MATCH=firewall_shaper.php* ##|-PRIV -require_once('classes/Form.class.php'); - require("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); diff --git a/src/usr/local/www/firewall_shaper_vinterface.php b/src/usr/local/www/firewall_shaper_vinterface.php index a3c56ff..ee0021a 100644 --- a/src/usr/local/www/firewall_shaper_vinterface.php +++ b/src/usr/local/www/firewall_shaper_vinterface.php @@ -64,7 +64,6 @@ ##|*MATCH=firewall_shaper_vinterface.php* ##|-PRIV -require_once('classes/Form.class.php'); require("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); diff --git a/src/usr/local/www/firewall_virtual_ip_edit.php b/src/usr/local/www/firewall_virtual_ip_edit.php index dc0655f..60a2e91 100644 --- a/src/usr/local/www/firewall_virtual_ip_edit.php +++ b/src/usr/local/www/firewall_virtual_ip_edit.php @@ -347,8 +347,6 @@ function build_if_list() { if ($input_errors) print_input_errors($input_errors); -require('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('Edit Virtual IP'); diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc index 7a89ffd..0ea3659 100644 --- a/src/usr/local/www/guiconfig.inc +++ b/src/usr/local/www/guiconfig.inc @@ -84,12 +84,8 @@ require_once("authgui.inc"); /* parse the configuration and include all configuration functions */ require_once("functions.inc"); -/* Pull in all the gui related display classes) */ -foreach (scandir("/usr/local/www/classes/") as $file) { - if (substr($file, -4) == ".inc") { - require_once("classes/{$file}"); - } -} +/* Include the autoloader for all the GUI display classes */ +require_once("classes/autoload.inc.php"); /* Set the default interface language */ if ($config['system']['language'] <> "") { diff --git a/src/usr/local/www/interfaces.php b/src/usr/local/www/interfaces.php index a753348..a0aa609 100644 --- a/src/usr/local/www/interfaces.php +++ b/src/usr/local/www/interfaces.php @@ -1681,9 +1681,6 @@ if ($savemsg) print_info_box($savemsg, 'success'); -require_once('classes/Form.class.php'); -require_once('classes/Modal.class.php'); - $form = new Form(new Form_Button( 'Submit', gettext("Save") diff --git a/src/usr/local/www/interfaces_bridge_edit.php b/src/usr/local/www/interfaces_bridge_edit.php index 2a33d12..34303ba 100644 --- a/src/usr/local/www/interfaces_bridge_edit.php +++ b/src/usr/local/www/interfaces_bridge_edit.php @@ -364,8 +364,6 @@ include("head.inc"); if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('Bridge Configuration'); diff --git a/src/usr/local/www/interfaces_gif_edit.php b/src/usr/local/www/interfaces_gif_edit.php index 6ffd45f..f8b65d0 100644 --- a/src/usr/local/www/interfaces_gif_edit.php +++ b/src/usr/local/www/interfaces_gif_edit.php @@ -198,8 +198,6 @@ include("head.inc"); if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('GIF Configuration'); diff --git a/src/usr/local/www/interfaces_gre_edit.php b/src/usr/local/www/interfaces_gre_edit.php index 6d2f1bd..c62b930 100644 --- a/src/usr/local/www/interfaces_gre_edit.php +++ b/src/usr/local/www/interfaces_gre_edit.php @@ -193,8 +193,6 @@ include("head.inc"); if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('GRE Configuration'); diff --git a/src/usr/local/www/interfaces_groups_edit.php b/src/usr/local/www/interfaces_groups_edit.php index 9735213..3eb804e 100644 --- a/src/usr/local/www/interfaces_groups_edit.php +++ b/src/usr/local/www/interfaces_groups_edit.php @@ -241,7 +241,6 @@ $tab_array[9] = array(gettext("Bridges"), false, "interfaces_bridge.php"); $tab_array[10] = array(gettext("LAGG"), false, "interfaces_lagg.php"); display_top_tabs($tab_array); -require_once('classes/Form.class.php'); $form = new Form; $section = new Form_Section('Interface Group Edit'); diff --git a/src/usr/local/www/interfaces_lagg_edit.php b/src/usr/local/www/interfaces_lagg_edit.php index 952bb16..cf0de63 100644 --- a/src/usr/local/www/interfaces_lagg_edit.php +++ b/src/usr/local/www/interfaces_lagg_edit.php @@ -241,8 +241,6 @@ function build_member_list() { $pgtitle = array(gettext("Interfaces"),gettext("LAGG"),gettext("Edit")); $shortcut_section = "interfaces"; include("head.inc"); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('LAGG Configuration'); diff --git a/src/usr/local/www/interfaces_ppps_edit.php b/src/usr/local/www/interfaces_ppps_edit.php index 99bd22b..37e180a 100644 --- a/src/usr/local/www/interfaces_ppps_edit.php +++ b/src/usr/local/www/interfaces_ppps_edit.php @@ -605,8 +605,6 @@ $linkparamstr = gettext('Bandwidth is set only for MLLP conncetions and when lin 'MRU will be auto-negotiated by default' . '
' . 'Set only for MLLP conncetions. MRRU will be auto-negotiated by default.'); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('PPPs Configuration'); diff --git a/src/usr/local/www/interfaces_qinq_edit.php b/src/usr/local/www/interfaces_qinq_edit.php index 7222aba..20c1c35 100644 --- a/src/usr/local/www/interfaces_qinq_edit.php +++ b/src/usr/local/www/interfaces_qinq_edit.php @@ -258,8 +258,6 @@ include("head.inc"); if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form(new Form_Button( 'Submit', gettext("Save") diff --git a/src/usr/local/www/interfaces_vlan_edit.php b/src/usr/local/www/interfaces_vlan_edit.php index a3f341a..c3099f1 100644 --- a/src/usr/local/www/interfaces_vlan_edit.php +++ b/src/usr/local/www/interfaces_vlan_edit.php @@ -202,7 +202,6 @@ if ($input_errors) { print_input_errors($input_errors); } -require_once('classes/Form.class.php'); $form = new Form; $section = new Form_Section('Interface VLAN Edit'); diff --git a/src/usr/local/www/interfaces_wireless_edit.php b/src/usr/local/www/interfaces_wireless_edit.php index c14b3a2..ddf0a95 100644 --- a/src/usr/local/www/interfaces_wireless_edit.php +++ b/src/usr/local/www/interfaces_wireless_edit.php @@ -204,8 +204,6 @@ include("head.inc"); if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('Wireless Interface'); diff --git a/src/usr/local/www/load_balancer_monitor_edit.php b/src/usr/local/www/load_balancer_monitor_edit.php index 63d8eab..40d4025 100644 --- a/src/usr/local/www/load_balancer_monitor_edit.php +++ b/src/usr/local/www/load_balancer_monitor_edit.php @@ -291,8 +291,6 @@ events.push(function(){ if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form(new Form_Button( 'Submit', gettext("Save") diff --git a/src/usr/local/www/load_balancer_pool_edit.php b/src/usr/local/www/load_balancer_pool_edit.php index 26a9cbe..122c178 100644 --- a/src/usr/local/www/load_balancer_pool_edit.php +++ b/src/usr/local/www/load_balancer_pool_edit.php @@ -323,8 +323,6 @@ events.push(function(){ if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form(new Form_Button( 'Submit', gettext("Save") diff --git a/src/usr/local/www/load_balancer_setting.php b/src/usr/local/www/load_balancer_setting.php index f7d2f5b..ea77209 100644 --- a/src/usr/local/www/load_balancer_setting.php +++ b/src/usr/local/www/load_balancer_setting.php @@ -143,8 +143,6 @@ $tab_array[] = array(gettext("Monitors"), false, "load_balancer_monitor.php"); $tab_array[] = array(gettext("Settings"), true, "load_balancer_setting.php"); display_top_tabs($tab_array); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('Relayd Global Settings'); diff --git a/src/usr/local/www/load_balancer_virtual_server_edit.php b/src/usr/local/www/load_balancer_virtual_server_edit.php index 6837c89..d8b8225 100644 --- a/src/usr/local/www/load_balancer_virtual_server_edit.php +++ b/src/usr/local/www/load_balancer_virtual_server_edit.php @@ -201,8 +201,6 @@ include("head.inc"); if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('Edit Load Balancer - Virtual Server entry'); diff --git a/src/usr/local/www/pkg_edit.php b/src/usr/local/www/pkg_edit.php index eee16d6..cf7b197 100644 --- a/src/usr/local/www/pkg_edit.php +++ b/src/usr/local/www/pkg_edit.php @@ -530,8 +530,6 @@ function parse_package_templates() { } // Start of page display -require_once('classes/Form.class.php'); - if ($input_errors) print_input_errors($input_errors); diff --git a/src/usr/local/www/services_captiveportal.php b/src/usr/local/www/services_captiveportal.php index 0cfbed0..d2d0f81 100644 --- a/src/usr/local/www/services_captiveportal.php +++ b/src/usr/local/www/services_captiveportal.php @@ -566,8 +566,6 @@ $tab_array[] = array(gettext("Vouchers"), false, "services_captiveportal_voucher $tab_array[] = array(gettext("File Manager"), false, "services_captiveportal_filemanager.php?zone={$cpzone}"); display_top_tabs($tab_array, true); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('Captive Portal Configuration'); diff --git a/src/usr/local/www/services_captiveportal_filemanager.php b/src/usr/local/www/services_captiveportal_filemanager.php index 34be0fe..a6cbea3 100644 --- a/src/usr/local/www/services_captiveportal_filemanager.php +++ b/src/usr/local/www/services_captiveportal_filemanager.php @@ -179,8 +179,6 @@ $tab_array[] = array(gettext("Vouchers"), false, "services_captiveportal_voucher $tab_array[] = array(gettext("File Manager"), true, "services_captiveportal_filemanager.php?zone={$cpzone}"); display_top_tabs($tab_array, true); -require_once('classes/Form.class.php'); - if ($_GET['act'] == 'add') { $form = new Form(new Form_Button( diff --git a/src/usr/local/www/services_captiveportal_hostname_edit.php b/src/usr/local/www/services_captiveportal_hostname_edit.php index 739b46e..e03c25a 100644 --- a/src/usr/local/www/services_captiveportal_hostname_edit.php +++ b/src/usr/local/www/services_captiveportal_hostname_edit.php @@ -202,8 +202,6 @@ include("head.inc"); if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form(new Form_Button( 'Submit', gettext("Save") diff --git a/src/usr/local/www/services_captiveportal_ip_edit.php b/src/usr/local/www/services_captiveportal_ip_edit.php index 1ee804b..c68de13 100644 --- a/src/usr/local/www/services_captiveportal_ip_edit.php +++ b/src/usr/local/www/services_captiveportal_ip_edit.php @@ -237,8 +237,6 @@ include("head.inc"); if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('Edit Captive Portal IP rule'); diff --git a/src/usr/local/www/services_captiveportal_mac_edit.php b/src/usr/local/www/services_captiveportal_mac_edit.php index 5de3e66..cb1cb16 100644 --- a/src/usr/local/www/services_captiveportal_mac_edit.php +++ b/src/usr/local/www/services_captiveportal_mac_edit.php @@ -221,8 +221,6 @@ include("head.inc"); if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('Edit MAC address rules'); diff --git a/src/usr/local/www/services_captiveportal_vouchers.php b/src/usr/local/www/services_captiveportal_vouchers.php index 84e0e72..7230c4e 100644 --- a/src/usr/local/www/services_captiveportal_vouchers.php +++ b/src/usr/local/www/services_captiveportal_vouchers.php @@ -500,8 +500,6 @@ if ($pconfig['enable']) : ?> " . gettext("You must apply the changes in order for them to take effect.")); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('General DNS Forwarder Options'); diff --git a/src/usr/local/www/services_dnsmasq_domainoverride_edit.php b/src/usr/local/www/services_dnsmasq_domainoverride_edit.php index d5387b6..539f3f7 100644 --- a/src/usr/local/www/services_dnsmasq_domainoverride_edit.php +++ b/src/usr/local/www/services_dnsmasq_domainoverride_edit.php @@ -160,8 +160,6 @@ include("head.inc"); if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('Domain override options'); diff --git a/src/usr/local/www/services_dnsmasq_edit.php b/src/usr/local/www/services_dnsmasq_edit.php index 2c51e9e..4df85d9 100644 --- a/src/usr/local/www/services_dnsmasq_edit.php +++ b/src/usr/local/www/services_dnsmasq_edit.php @@ -237,8 +237,6 @@ include("head.inc"); if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('Host override options'); diff --git a/src/usr/local/www/services_dyndns_edit.php b/src/usr/local/www/services_dyndns_edit.php index 4edaa37..9c3aad3 100644 --- a/src/usr/local/www/services_dyndns_edit.php +++ b/src/usr/local/www/services_dyndns_edit.php @@ -256,8 +256,6 @@ if ($input_errors) if ($savemsg) print_info_box($savemsg, 'success'); -require_once('classes/Form.class.php'); - $form = new Form; $section = new Form_Section('Dynamic DNS Client'); diff --git a/src/usr/local/www/services_igmpproxy_edit.php b/src/usr/local/www/services_igmpproxy_edit.php index 88bcf17..920e702 100644 --- a/src/usr/local/www/services_igmpproxy_edit.php +++ b/src/usr/local/www/services_igmpproxy_edit.php @@ -157,8 +157,6 @@ include("head.inc"); if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - // These two inputs appear in the original file. Don't know what they are for // but they are here just in case. diff --git a/src/usr/local/www/services_ntpd.php b/src/usr/local/www/services_ntpd.php index c1feccf..cccc4a0 100644 --- a/src/usr/local/www/services_ntpd.php +++ b/src/usr/local/www/services_ntpd.php @@ -283,8 +283,6 @@ $tab_array[] = array(gettext("Serial GPS"), false, "services_ntpd_gps.php"); $tab_array[] = array(gettext("PPS"), false, "services_ntpd_pps.php"); display_top_tabs($tab_array); -require_once('classes/Form.class.php'); - $form = new Form; $section = new Form_Section('NTP server configuration'); diff --git a/src/usr/local/www/services_ntpd_gps.php b/src/usr/local/www/services_ntpd_gps.php index ab769ab..35e08bb 100644 --- a/src/usr/local/www/services_ntpd_gps.php +++ b/src/usr/local/www/services_ntpd_gps.php @@ -234,8 +234,6 @@ $tab_array[] = array(gettext("Serial GPS"), true, "services_ntpd_gps.php"); $tab_array[] = array(gettext("PPS"), false, "services_ntpd_pps.php"); display_top_tabs($tab_array); -require_once('classes/Form.class.php'); - $form = new Form; $section = new Form_Section('NTP Serial GPS Configuration'); diff --git a/src/usr/local/www/services_ntpd_pps.php b/src/usr/local/www/services_ntpd_pps.php index 9de8431..be73731 100644 --- a/src/usr/local/www/services_ntpd_pps.php +++ b/src/usr/local/www/services_ntpd_pps.php @@ -152,8 +152,6 @@ $tab_array[] = array(gettext("Serial GPS"), false, "services_ntpd_gps.php"); $tab_array[] = array(gettext("PPS"), true, "services_ntpd_pps.php"); display_top_tabs($tab_array); -require_once('classes/Form.class.php'); - $form = new Form; $section = new Form_Section('NTP Serial PPS Configuration'); diff --git a/src/usr/local/www/services_rfc2136_edit.php b/src/usr/local/www/services_rfc2136_edit.php index 98ae22c..07e70f9 100644 --- a/src/usr/local/www/services_rfc2136_edit.php +++ b/src/usr/local/www/services_rfc2136_edit.php @@ -156,8 +156,6 @@ if ($_POST) { $pgtitle = array(gettext("Services"), gettext("RFC 2136 client"), gettext("Edit")); include("head.inc"); -require_once('classes/Form.class.php'); - if ($input_errors) print_input_errors($input_errors); diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php index d0e1a49..1e75866 100644 --- a/src/usr/local/www/services_router_advertisements.php +++ b/src/usr/local/www/services_router_advertisements.php @@ -271,8 +271,6 @@ $tab_array[] = array(gettext("DHCPv6 Server"), false, "services_dhcpv6.php?if= $tab_array[] = array(gettext("Router Advertisements"), true, "services_router_advertisements.php?if={$if}"); display_top_tabs($tab_array, false, 'nav nav-tabs'); -require_once('classes/Form.class.php'); - $form = new Form(new Form_Button( 'Submit', gettext("Save") diff --git a/src/usr/local/www/services_snmp.php b/src/usr/local/www/services_snmp.php index 2bd8703..80e8bbd 100644 --- a/src/usr/local/www/services_snmp.php +++ b/src/usr/local/www/services_snmp.php @@ -222,8 +222,6 @@ if ($input_errors) if ($savemsg) print_info_box($savemsg); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('SNMP Daemon'); diff --git a/src/usr/local/www/services_unbound.php b/src/usr/local/www/services_unbound.php index 3064d65..6c3f7ff 100644 --- a/src/usr/local/www/services_unbound.php +++ b/src/usr/local/www/services_unbound.php @@ -258,8 +258,6 @@ $tab_array[] = array(gettext("Advanced settings"), false, "services_unbound_adva $tab_array[] = array(gettext("Access Lists"), false, "/services_unbound_acls.php"); display_top_tabs($tab_array, true); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('General DNS Resolver Options'); diff --git a/src/usr/local/www/services_unbound_acls.php b/src/usr/local/www/services_unbound_acls.php index 895af29..40b65ba 100644 --- a/src/usr/local/www/services_unbound_acls.php +++ b/src/usr/local/www/services_unbound_acls.php @@ -216,8 +216,6 @@ $tab_array[] = array(gettext("Advanced settings"), false, "services_unbound_adva $tab_array[] = array(gettext("Access Lists"), true, "/services_unbound_acls.php"); display_top_tabs($tab_array, true); -require_once('classes/Form.class.php'); - if($act=="new" || $act=="edit") { $form = new Form(); diff --git a/src/usr/local/www/services_unbound_advanced.php b/src/usr/local/www/services_unbound_advanced.php index 919b5e7..451e60e 100644 --- a/src/usr/local/www/services_unbound_advanced.php +++ b/src/usr/local/www/services_unbound_advanced.php @@ -244,8 +244,6 @@ $tab_array[] = array(gettext("Advanced settings"), true, "services_unbound_advan $tab_array[] = array(gettext("Access Lists"), false, "/services_unbound_acls.php"); display_top_tabs($tab_array, true); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('Advanced Resolver Options'); diff --git a/src/usr/local/www/services_unbound_domainoverride_edit.php b/src/usr/local/www/services_unbound_domainoverride_edit.php index d3c2144..ae3d3f1 100644 --- a/src/usr/local/www/services_unbound_domainoverride_edit.php +++ b/src/usr/local/www/services_unbound_domainoverride_edit.php @@ -148,8 +148,6 @@ $pgtitle = array(gettext("Services"), gettext("DNS Resolver"), gettext("Edit Dom $shortcut_section = "resolver"; include("head.inc"); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('Domain Override'); diff --git a/src/usr/local/www/services_unbound_host_edit.php b/src/usr/local/www/services_unbound_host_edit.php index 2882968..341440d 100644 --- a/src/usr/local/www/services_unbound_host_edit.php +++ b/src/usr/local/www/services_unbound_host_edit.php @@ -235,8 +235,6 @@ $pgtitle = array(gettext("Services"),gettext("DNS Resolver"),gettext("Edit Host $shortcut_section = "resolver"; include("head.inc"); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('Host override options'); diff --git a/src/usr/local/www/services_wol.php b/src/usr/local/www/services_wol.php index 8cd6a0c..1a524b3 100644 --- a/src/usr/local/www/services_wol.php +++ b/src/usr/local/www/services_wol.php @@ -68,8 +68,6 @@ ##|-PRIV require("guiconfig.inc"); -require_once('classes/Form.class.php'); - if (!is_array($config['wol']['wolentry'])) { $config['wol']['wolentry'] = array(); } diff --git a/src/usr/local/www/services_wol_edit.php b/src/usr/local/www/services_wol_edit.php index b196f83..2a45dc4 100644 --- a/src/usr/local/www/services_wol_edit.php +++ b/src/usr/local/www/services_wol_edit.php @@ -77,8 +77,6 @@ function wol_sort() { } require("guiconfig.inc"); -require_once('classes/Form.class.php'); - if (!is_array($config['wol']['wolentry'])) { $config['wol']['wolentry'] = array(); } diff --git a/src/usr/local/www/status_captiveportal.php b/src/usr/local/www/status_captiveportal.php index 74c92e4..75259ea 100644 --- a/src/usr/local/www/status_captiveportal.php +++ b/src/usr/local/www/status_captiveportal.php @@ -146,8 +146,6 @@ endif; // Load MAC-Manufacturer table $mac_man = load_mac_manufacturer_table(); -require_once('classes/Form.class.php'); - if (count($a_cp) > 1) { $form = new Form(false); diff --git a/src/usr/local/www/status_captiveportal_expire.php b/src/usr/local/www/status_captiveportal_expire.php index 611e78d..79cf621 100644 --- a/src/usr/local/www/status_captiveportal_expire.php +++ b/src/usr/local/www/status_captiveportal_expire.php @@ -98,8 +98,6 @@ $tab_array[] = array(gettext("Test Vouchers"), false, "status_captiveportal_test $tab_array[] = array(gettext("Expire Vouchers"), true, "status_captiveportal_expire.php?zone={$cpzone}"); display_top_tabs($tab_array); -require_once('classes/Form.class.php'); - $form = new Form; $section = new Form_Section('Expire Vouchers'); diff --git a/src/usr/local/www/status_captiveportal_test.php b/src/usr/local/www/status_captiveportal_test.php index 0a85848..faac9ff 100644 --- a/src/usr/local/www/status_captiveportal_test.php +++ b/src/usr/local/www/status_captiveportal_test.php @@ -99,8 +99,6 @@ $tab_array[] = array(gettext("Test Vouchers"), true, "status_captiveportal_test. $tab_array[] = array(gettext("Expire Vouchers"), false, "status_captiveportal_expire.php?zone={$cpzone}"); display_top_tabs($tab_array); -require_once('classes/Form.class.php'); - $form = new Form; $section = new Form_Section('Test Vouchers'); diff --git a/src/usr/local/www/status_graph.php b/src/usr/local/www/status_graph.php index 4525192..fdc3b4a 100644 --- a/src/usr/local/www/status_graph.php +++ b/src/usr/local/www/status_graph.php @@ -152,8 +152,6 @@ $pgtitle = array(gettext("Status"),gettext("Traffic Graph")); include("head.inc"); -require_once('classes/Form.class.php'); - $form = new Form(false); $form->addClass('auto-submit'); diff --git a/src/usr/local/www/status_rrd_graph.php b/src/usr/local/www/status_rrd_graph.php index c58278b..d90c75a 100644 --- a/src/usr/local/www/status_rrd_graph.php +++ b/src/usr/local/www/status_rrd_graph.php @@ -535,8 +535,6 @@ display_top_tabs(make_tabs()); if ($input_errors && count($input_errors)) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form(false); $section = new Form_Section('Graph settings'); diff --git a/src/usr/local/www/status_rrd_graph_settings.php b/src/usr/local/www/status_rrd_graph_settings.php index 4edb737..4aadcbd 100644 --- a/src/usr/local/www/status_rrd_graph_settings.php +++ b/src/usr/local/www/status_rrd_graph_settings.php @@ -193,8 +193,6 @@ if ($input_errors) if ($savemsg) print_info_box($savemsg, 'success'); -require_once('classes/Form.class.php'); - $form = new Form; $section = new Form_Section('Graph settings'); diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php index 23d1447..1ff3369 100644 --- a/src/usr/local/www/system.php +++ b/src/usr/local/www/system.php @@ -332,7 +332,6 @@ if ($savemsg)
addInput(new Form_Input( diff --git a/src/usr/local/www/system_advanced_admin.php b/src/usr/local/www/system_advanced_admin.php index 8f69a54..174fb7c 100644 --- a/src/usr/local/www/system_advanced_admin.php +++ b/src/usr/local/www/system_advanced_admin.php @@ -337,7 +337,6 @@ display_top_tabs($tab_array); ?>
setAction('system_authservers.php?act=edit'); diff --git a/src/usr/local/www/system_camanager.php b/src/usr/local/www/system_camanager.php index 8e612ff..6e5459a 100644 --- a/src/usr/local/www/system_camanager.php +++ b/src/usr/local/www/system_camanager.php @@ -460,7 +460,6 @@ foreach ($a_ca as $i => $ca): exit; } -require_once('classes/Form.class.php'); $form = new Form; //$form->setAction('system_camanager.php?act=edit'); if (isset($id) && $a_ca[$id]) diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php index cc07f06..e1d6a52 100644 --- a/src/usr/local/www/system_certmanager.php +++ b/src/usr/local/www/system_certmanager.php @@ -682,7 +682,6 @@ foreach($a_cert as $i => $cert): exit; } -require_once('classes/Form.class.php'); $form = new Form; if ($act == "csr" || (($_POST['save'] == gettext("Update")) && $input_errors)) diff --git a/src/usr/local/www/system_crlmanager.php b/src/usr/local/www/system_crlmanager.php index 8dbf2aa..b84de92 100644 --- a/src/usr/local/www/system_crlmanager.php +++ b/src/usr/local/www/system_crlmanager.php @@ -371,8 +371,6 @@ $tab_array[] = array(gettext("Certificates"), false, "system_certmanager.php"); $tab_array[] = array(gettext("Certificate Revocation"), true, "system_crlmanager.php"); display_top_tabs($tab_array); -require_once('classes/Form.class.php'); - if ($act == "new" || $act == gettext("Save") || $input_errors) { if (!isset($id)) { $form = new Form(); diff --git a/src/usr/local/www/system_gateway_groups_edit.php b/src/usr/local/www/system_gateway_groups_edit.php index 870dd57..0e5db0b 100644 --- a/src/usr/local/www/system_gateway_groups_edit.php +++ b/src/usr/local/www/system_gateway_groups_edit.php @@ -218,8 +218,6 @@ $protocol_array = array_values(array_unique($gateway_protocol)); if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('Edit gateway group entry'); diff --git a/src/usr/local/www/system_gateways_edit.php b/src/usr/local/www/system_gateways_edit.php index 300e1fb..102ce74 100644 --- a/src/usr/local/www/system_gateways_edit.php +++ b/src/usr/local/www/system_gateways_edit.php @@ -668,7 +668,6 @@ events.push(function(){ setAction('system_groupmanager.php?act=edit'); $form->addGlobal(new Form_Input( diff --git a/src/usr/local/www/system_groupmanager_addprivs.php b/src/usr/local/www/system_groupmanager_addprivs.php index 39c3a6d..f92b2fc 100644 --- a/src/usr/local/www/system_groupmanager_addprivs.php +++ b/src/usr/local/www/system_groupmanager_addprivs.php @@ -170,7 +170,6 @@ $tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.ph $tab_array[] = array(gettext("Servers"), false, "system_authservers.php"); display_top_tabs($tab_array); -require_once('classes/Form.class.php'); $form = new Form; if (isset($groupid)) { diff --git a/src/usr/local/www/system_hasync.php b/src/usr/local/www/system_hasync.php index 7fab42e..0f1bdcd 100755 --- a/src/usr/local/www/system_hasync.php +++ b/src/usr/local/www/system_hasync.php @@ -131,8 +131,6 @@ foreach ($ifaces as $ifname => $iface) { include("head.inc"); -require_once('classes/Form.class.php'); - $form = new Form; $section = new Form_Section('State Synchronization Settings (pfsync)'); diff --git a/src/usr/local/www/system_routes_edit.php b/src/usr/local/www/system_routes_edit.php index 183075e..c75c37b 100644 --- a/src/usr/local/www/system_routes_edit.php +++ b/src/usr/local/www/system_routes_edit.php @@ -264,7 +264,6 @@ include("head.inc"); if ($input_errors) print_input_errors($input_errors); -require_once('classes/Form.class.php'); $form = new Form; if (isset($id) && $a_routes[$id]) { diff --git a/src/usr/local/www/system_update_settings.php b/src/usr/local/www/system_update_settings.php index fcc9374..76355f0 100644 --- a/src/usr/local/www/system_update_settings.php +++ b/src/usr/local/www/system_update_settings.php @@ -128,8 +128,6 @@ $tab_array[] = array(gettext("Update Settings"), true, "system_update_settings.p $tab_array[] = array(gettext("System update"), false, "pkg_mgr_install.php?id=firmware"); display_top_tabs($tab_array); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('Firmware Branch'); diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php index e046698..8117ff7 100644 --- a/src/usr/local/www/system_usermanager.php +++ b/src/usr/local/www/system_usermanager.php @@ -543,7 +543,6 @@ foreach($a_user as $i => $userent): exit; } -require_once('classes/Form.class.php'); $form = new Form; if ($act == "new" || $act == "edit" || $input_errors): diff --git a/src/usr/local/www/system_usermanager_addprivs.php b/src/usr/local/www/system_usermanager_addprivs.php index 10bcd2c..279d9c9 100644 --- a/src/usr/local/www/system_usermanager_addprivs.php +++ b/src/usr/local/www/system_usermanager_addprivs.php @@ -170,8 +170,6 @@ $tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.ph $tab_array[] = array(gettext("Servers"), false, "system_authservers.php"); display_top_tabs($tab_array); -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('User privileges'); diff --git a/src/usr/local/www/system_usermanager_passwordmg.php b/src/usr/local/www/system_usermanager_passwordmg.php index 858e9b9..0ce2da1 100644 --- a/src/usr/local/www/system_usermanager_passwordmg.php +++ b/src/usr/local/www/system_usermanager_passwordmg.php @@ -130,8 +130,6 @@ if ($islocal == false) { exit; } -require_once('classes/Form.class.php'); - $form = new Form(); $section = new Form_Section('Update Password'); diff --git a/src/usr/local/www/system_usermanager_settings.php b/src/usr/local/www/system_usermanager_settings.php index ac6e034..2b62918 100644 --- a/src/usr/local/www/system_usermanager_settings.php +++ b/src/usr/local/www/system_usermanager_settings.php @@ -150,7 +150,6 @@ display_top_tabs($tab_array); if(!$pconfig['backend']) $pconfig['backend'] = "pfsense"; -require_once('classes/Form.class.php'); $form = new Form; $section = new Form_Section('Settings'); diff --git a/src/usr/local/www/vpn_ipsec_keys_edit.php b/src/usr/local/www/vpn_ipsec_keys_edit.php index 1619016..a55a728 100644 --- a/src/usr/local/www/vpn_ipsec_keys_edit.php +++ b/src/usr/local/www/vpn_ipsec_keys_edit.php @@ -163,7 +163,6 @@ include("head.inc");