plugins: don't need so many includes

(cherry picked from commit c9b70766)

src/etc/rc.filter_configure_sync

@@ -31,7 +31,6 @@ require_once("config.inc");
 require_once("util.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");
-require_once("plugins.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");
 require_once("interfaces.inc");

src/etc/rc.initial.setlanip

@@ -32,7 +32,6 @@ require_once("config.inc");
 require_once("interfaces.inc");
 require_once("openvpn.inc");
 require_once("util.inc");
-require_once("plugins.inc");
 require_once("ipsec.inc");
 require_once("filter.inc");
 require_once("rrd.inc");

src/etc/rc.initial.setports

@@ -32,7 +32,6 @@ require_once("config.inc");
 require_once("config.console.inc");
 require_once("filter.inc");
 require_once("util.inc");
-require_once("plugins.inc");
 require_once("ipsec.inc");
 require_once("rrd.inc");
 require_once("system.inc");

src/etc/rc.linkup

@@ -31,7 +31,6 @@
 require_once("config.inc");
 require_once("filter.inc");
 require_once("interfaces.inc");
-require_once('plugins.inc');
 require_once('ipsec.inc');
 require_once('openvpn.inc');
 require_once("util.inc");

src/etc/rc.newipsecdns

@@ -32,7 +32,6 @@
 require_once("util.inc");
 require_once("config.inc");
 require_once("filter.inc");
-require_once("plugins.inc");
 require_once('ipsec.inc');
 require_once("pfsense-utils.inc");
 require_once("interfaces.inc");

src/etc/rc.newwanip

@@ -31,7 +31,6 @@
 /* parse the configuration and include all functions used below */
 require_once("config.inc");
 require_once("filter.inc");
-require_once("plugins.inc");
 require_once('ipsec.inc');
 require_once("openvpn.inc");
 require_once("rrd.inc");

src/etc/rc.newwanipv6

@@ -32,7 +32,6 @@
 require_once("config.inc");
 require_once("interfaces.inc");
 require_once("filter.inc");
-require_once("plugins.inc");
 require_once('ipsec.inc');
 require_once("openvpn.inc");
 require_once("services.inc");

src/etc/rc.reload_all

@@ -31,7 +31,6 @@ require_once("config.inc");
 require_once("interfaces.inc");
 require_once("openvpn.inc");
 require_once("filter.inc");
-require_once("plugins.inc");
 require_once('ipsec.inc');
 require_once("util.inc");
 require_once("system.inc");

src/etc/rc.reload_interfaces

@@ -32,7 +32,6 @@ require_once("filter.inc");
 require_once("util.inc");
 require_once("openvpn.inc");
 require_once('ipsec.inc');
-require_once("plugins.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("pfsense-utils.inc");

src/www/diag_ipsec_leases.php

@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("plugins.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
 require_once("interfaces.inc");

src/www/diag_ipsec_sad.php

@@ -29,7 +29,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("plugins.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
 require_once("interfaces.inc");

src/www/diag_ipsec_spd.php

@@ -29,7 +29,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("plugins.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
 require_once("interfaces.inc");

src/www/diag_logs_vpn.inc

@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("plugins.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 

src/www/interfaces.php

@@ -32,7 +32,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("plugins.inc");
 require_once("filter.inc");
 require_once("rrd.inc");
 require_once("system.inc");

src/www/interfaces_assign.php

@@ -30,7 +30,6 @@
 
 require_once("guiconfig.inc");
 require_once("filter.inc");
-require_once("plugins.inc");
 require_once("rrd.inc");
 require_once("system.inc");
 require_once("interfaces.inc");

src/www/status_services.php

@@ -36,7 +36,6 @@ require_once("unbound.inc");
 require_once("pfsense-utils.inc");
 require_once("openvpn.inc");
 require_once("filter.inc");
-require_once("plugins.inc");
 require_once("ipsec.inc");
 require_once("interfaces.inc");
 require_once("rrd.inc");

src/www/system_advanced_misc.php

@@ -31,7 +31,6 @@
 
 require_once("guiconfig.inc");
 require_once("filter.inc");
-require_once("plugins.inc");
 require_once("ipsec.inc");
 require_once("vslb.inc");
 require_once("system.inc");
@@ -39,7 +38,6 @@ require_once("pfsense-utils.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
 
-
 $crypto_modules = array('glxsb' => gettext("AMD Geode LX Security Block"),
                         'aesni' => gettext("AES-NI CPU-based Acceleration")
 );

src/www/system_gateway_groups_edit.php

@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("plugins.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
 require_once("interfaces.inc");

src/www/vpn_ipsec.php

@@ -30,7 +30,6 @@
 
 require_once("guiconfig.inc");
 require_once("filter.inc");
-require_once("plugins.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
 require_once("pfsense-utils.inc");

src/www/vpn_ipsec_keys.php

@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("plugins.inc");
 require_once("ipsec.inc");
 require_once("filter.inc");
 require_once("services.inc");

src/www/vpn_ipsec_keys_edit.php

@@ -29,7 +29,6 @@
 
 require_once("interfaces.inc");
 require_once("guiconfig.inc");
-require_once("plugins.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
 

src/www/vpn_ipsec_mobile.php

@@ -30,7 +30,6 @@
 require_once("interfaces.inc");
 require_once("guiconfig.inc");
 require_once("filter.inc");
-require_once("plugins.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
 require_once("pfsense-utils.inc");

src/www/vpn_ipsec_phase1.php

@@ -32,7 +32,6 @@
 require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");
-require_once("plugins.inc");
 require_once("services.inc");
 require_once("pfsense-utils.inc");
 require_once("interfaces.inc");

src/www/vpn_ipsec_phase2.php

@@ -31,7 +31,6 @@
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
 require_once("ipsec.inc");
-require_once("plugins.inc");
 require_once("services.inc");
 
 /**

src/www/vpn_ipsec_settings.php

@@ -30,7 +30,6 @@
 require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");
-require_once("plugins.inc");
 require_once("services.inc");
 require_once("pfsense-utils.inc");
 require_once("interfaces.inc");

src/www/vpn_l2tp.php

@@ -28,7 +28,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("plugins.inc");
+require_once("plugins.inc.d/vpn.inc");
 require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 

src/www/vpn_l2tp_users.php

@@ -28,7 +28,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("plugins.inc");
+require_once("plugins.inc.d/vpn.inc");
 
 if (!isset($config['l2tp']['user'])) {
     $config['l2tp']['user'] = array();

src/www/vpn_l2tp_users_edit.php

@@ -44,7 +44,7 @@ function l2tp_users_sort()
 }
 
 require_once("guiconfig.inc");
-require_once("plugins.inc");
+require_once("plugins.inc.d/vpn.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/vpn_l2tp_users.php');
 

src/www/vpn_pppoe.php

@@ -29,7 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("filter.inc");
-require_once("plugins.inc");
+require_once("plugins.inc.d/vpn.inc");
 require_once("interfaces.inc");
 
 if (!is_array($config['pppoes'])) {

src/www/vpn_pppoe_edit.php

@@ -29,7 +29,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("plugins.inc");
 require_once("interfaces.inc");
 
 function vpn_pppoe_get_id()

src/www/vpn_pptp.php

@@ -30,7 +30,7 @@
 require_once('guiconfig.inc');
 require_once('interfaces.inc');
 require_once('filter.inc');
-require_once('plugins.inc');
+require_once('plugins.inc.d/vpn.inc');
 require_once("pfsense-utils.inc");
 
 if (!is_array($config['pptpd']['radius'])) {

src/www/vpn_pptp_users.php

@@ -28,7 +28,7 @@
 */
 
 require_once('guiconfig.inc');
-require_once('plugins.inc');
+require_once('plugins.inc.d/vpn.inc');
 
 if (!is_array($config['pptpd']['user'])) {
     $config['pptpd']['user'] = array();

src/www/vpn_pptp_users_edit.php

@@ -34,17 +34,16 @@ function pptpusercmp($a, $b)
 
 function pptpd_users_sort()
 {
-        global $config;
+    global $config;
 
     if (!is_array($config['ppptpd']['user'])) {
             return;
     }
 
-        usort($config['pptpd']['user'], "pptpusercmp");
+    usort($config['pptpd']['user'], "pptpusercmp");
 }
 
 require_once('guiconfig.inc');
-require_once('plugins.inc');
 
 if (!is_array($config['pptpd']['user'])) {
     $config['pptpd']['user'] = array();

src/www/widgets/widgets/services_status.widget.php

@@ -33,7 +33,6 @@ $nocsrf = true;
 
 require_once("guiconfig.inc");
 require_once("services.inc");
-require_once("plugins.inc");
 require_once("ipsec.inc");
 require_once("widgets/include/services_status.inc");
 require_once("interfaces.inc");