src: strip pugins.inc from files, automatically included

(cherry picked from commit 1d4ca0ff)
(cherry picked from commit 0e03967c)

src/etc/inc/xmlrpc/service.inc

@@ -30,7 +30,6 @@
 
 require_once("services.inc");
 require_once("system.inc");
-require_once('plugins.inc');
 require_once("vslb.inc");
 require_once('util.inc');
 require_once("unbound.inc");

src/etc/rc.bootup

@@ -53,8 +53,6 @@ require_once("vslb.inc");
 echo ".";
 require_once("filter.inc");
 echo ".";
-require_once("plugins.inc");
-echo ".";
 require_once("ipsec.inc");
 echo ".";
 require_once("openvpn.inc");

src/etc/rc.filter_configure_sync

@@ -34,6 +34,5 @@ require_once("ipsec.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("services.inc");
-require_once("plugins.inc");
 
 filter_configure_sync();

src/etc/rc.newwanip

@@ -39,7 +39,6 @@ require_once("system.inc");
 require_once("interfaces.inc");
 require_once("services.inc");
 require_once("unbound.inc");
-require_once("plugins.inc");
 
 // Do not process while booting
 if (file_exists('/var/run/booting')) {

src/etc/rc.newwanipv6

@@ -38,7 +38,6 @@ require_once("services.inc");
 require_once("rrd.inc");
 require_once("util.inc");
 require_once("system.inc");
-require_once("plugins.inc");
 require_once("interfaces.inc");
 
 /* Interface IP address has changed */

src/etc/rc.reload_all

@@ -37,7 +37,6 @@ require_once("system.inc");
 require_once("services.inc");
 require_once("unbound.inc");
 require_once("interfaces.inc");
-require_once("plugins.inc");
 
 global $config;
 

src/www/diag_ipsec.php

@@ -31,7 +31,6 @@
 
 require_once("guiconfig.inc");
 require_once("services.inc");
-require_once("plugins.inc");
 
 /**
  * search config for phase 1 description

src/www/diag_ipsec_leases.php

@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
-require_once("plugins.inc");
 
 $service_hook = 'ipsec';
 

src/www/diag_ipsec_sad.php

@@ -32,7 +32,6 @@ require_once("guiconfig.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
-require_once("plugins.inc");
 
 $service_hook = 'ipsec';
 

src/www/diag_ipsec_spd.php

@@ -32,7 +32,6 @@ require_once("guiconfig.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
-require_once("plugins.inc");
 
 $service_hook = 'ipsec';
 

src/www/diag_logs_filter.php

@@ -35,7 +35,6 @@ require_once("filter.inc");
 require_once("filter_log.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
-require_once("plugins.inc");
 
 /********************************************************************************************************************
  * imported from easyrule.inc/php

src/www/diag_logs_filter_dynamic.php

@@ -32,7 +32,6 @@ require_once("guiconfig.inc");
 require_once("filter_log.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
-require_once("plugins.inc");
 
 $filter_logfile = '/var/log/filter.log';
 

src/www/diag_logs_filter_summary.php

@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("filter_log.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
-require_once("plugins.inc");
 
 $filter_logfile = '/var/log/filter.log';
 $lines = 5000; // Maximum number of log entries to fetch

src/www/diag_logs_settings.php

@@ -34,7 +34,6 @@ require_once("interfaces.inc");
 require_once("filter.inc");
 require_once("system.inc");
 require_once("services.inc");
-require_once("plugins.inc");
 
 function clear_all_log_files()
 {

src/www/diag_logs_template.inc

@@ -32,7 +32,6 @@
 require_once("guiconfig.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
-require_once("plugins.inc");
 require_once("services.inc");
 
 /* expects $logfile to point to the system path */

src/www/interfaces_groups.php

@@ -30,7 +30,6 @@
 
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
-require_once("plugins.inc");
 
 if (!isset($config['ifgroups']['ifgroupentry'])) {
     $a_ifgroups = array();
@@ -38,7 +37,6 @@ if (!isset($config['ifgroups']['ifgroupentry'])) {
     $a_ifgroups = &$config['ifgroups']['ifgroupentry'];
 }
 
-
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     if (!empty($a_ifgroups[$_POST['id']])) {
         $id = $_POST['id'];

src/www/interfaces_groups_edit.php

@@ -30,7 +30,6 @@
 
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
-require_once("plugins.inc");
 
 if (!isset($config['ifgroups']) || !is_array($config['ifgroups'])) {
     $config['ifgroups'] = array();

src/www/status_openvpn.php

@@ -32,7 +32,6 @@
 require_once("guiconfig.inc");
 require_once("openvpn.inc");
 require_once("services.inc");
-require_once("plugins.inc");
 require_once("interfaces.inc");
 
 function kill_client($port, $remipp)

src/www/status_services.php

@@ -30,7 +30,6 @@
 
 require_once("guiconfig.inc");
 require_once("services.inc");
-require_once('plugins.inc');
 require_once("vslb.inc");
 require_once("system.inc");
 require_once("unbound.inc");

src/www/vpn_ipsec.php

@@ -33,7 +33,6 @@ require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
-require_once("plugins.inc");
 
 /*
  *  Return phase2 idinfo in text format

src/www/vpn_ipsec_keys.php

@@ -32,7 +32,6 @@ require_once("ipsec.inc");
 require_once("filter.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
-require_once("plugins.inc");
 
 if (!isset($config['ipsec']) || !is_array($config['ipsec'])) {
     $config['ipsec'] = array();

src/www/vpn_ipsec_keys_edit.php

@@ -31,7 +31,6 @@ require_once("interfaces.inc");
 require_once("guiconfig.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
-require_once("plugins.inc");
 
 if (!isset($config['ipsec']) || !is_array($config['ipsec'])) {
     $config['ipsec'] = array();

src/www/vpn_ipsec_mobile.php

@@ -32,7 +32,6 @@ require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
-require_once("plugins.inc");
 
 if (!isset($config['ipsec']) || !is_array($config['ipsec'])) {
     $config['ipsec'] = array();

src/www/vpn_ipsec_phase1.php

@@ -34,7 +34,6 @@ require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
-require_once("plugins.inc");
 
 /*
  * ikeid management functions

src/www/vpn_ipsec_phase2.php

@@ -32,7 +32,6 @@ require_once("guiconfig.inc");
 require_once("interfaces.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
-require_once("plugins.inc");
 
 /**
  * combine ealgos and keylen_* tags

src/www/vpn_ipsec_settings.php

@@ -32,7 +32,6 @@ require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
-require_once("plugins.inc");
 
 if (!isset($config['ipsec']) || !is_array($config['ipsec'])) {
     $config['ipsec'] = array();

src/www/vpn_openvpn_client.php

@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("openvpn.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
-require_once("plugins.inc");
 
 if (!isset($config['openvpn']['openvpn-client'])) {
     $config['openvpn']['openvpn-client'] = array();

src/www/vpn_openvpn_csc.php

@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("openvpn.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
-require_once("plugins.inc");
 
 // define all fields used in this form
 $all_form_fields = "custom_options,disable,common_name,block,description

src/www/vpn_openvpn_export.php

@@ -34,7 +34,6 @@ require_once("openvpn.inc");
 require_once("services.inc");
 require_once("filter.inc");
 require_once("interfaces.inc");
-require_once("plugins.inc");
 
 function openvpn_client_export_prefix($srvid, $usrid = null, $crtid = null)
 {

src/www/vpn_openvpn_server.php

@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("openvpn.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
-require_once("plugins.inc");
 
 if (!isset($config['openvpn']['openvpn-server'])) {
     $config['openvpn']['openvpn-server'] = array();

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

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

src/www/wizard.php

@@ -33,7 +33,6 @@ require_once("filter.inc");
 require_once("rrd.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
-require_once("plugins.inc");
 
 /*
  * find_ip_interface($ip): return the interface where an ip is defined