plugins: rules change, plugins.inc is required now

This is done so that services.inc can load plugins when
plugins.inc was invoked, if not, it stays clear of the
extra work.

src/www/diag_logs_l2tp.php

@@ -19,7 +19,6 @@ $tab_array = array();
 $tab_array[] = array(gettext("L2TP Logins"), $mode != "raw", "/diag_logs_l2tp.php");
 $tab_array[] = array(gettext("L2TP Raw"), $mode == "raw", "/diag_logs_l2tp.php?mode=raw");
 
-require_once 'services.inc';
 $service_hook = 'l2tpd';
 
 require_once 'diag_logs_vpn.inc';

src/www/diag_logs_pptp.php

@@ -19,7 +19,6 @@ $tab_array = array();
 $tab_array[] = array(gettext("PPTP Logins"), $mode != "raw", "/diag_logs_pptp.php");
 $tab_array[] = array(gettext("PPTP Raw"), $mode == "raw", "/diag_logs_pptp.php?mode=raw");
 
-require_once 'services.inc';
 $service_hook = 'pptpd';
 
 require_once 'diag_logs_vpn.inc';

src/www/diag_logs_vpn.inc

@@ -29,6 +29,8 @@
 
 require_once("guiconfig.inc");
 require_once("system.inc");
+require_once('services.inc');
+require_once('plugins.inc');
 require_once("interfaces.inc");
 
 if (empty($config['syslog']['nentries'])) {

src/www/status_services.php

@@ -30,6 +30,7 @@
 
 require_once("guiconfig.inc");
 require_once("services.inc");
+require_once('plugins.inc');
 require_once("vslb.inc");
 require_once("system.inc");
 require_once("unbound.inc");
@@ -177,8 +178,6 @@ function service_control_restart($name, $extras)
 
 $services = services_get();
 
-require_once 'plugins.inc';
-
 foreach (plugins_services() as $service) {
     $services[] = $service;
 }

src/www/vpn_l2tp.php

@@ -31,6 +31,7 @@ require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 require_once("services.inc");
+require_once("plugins.inc");
 require_once("plugins.inc.d/vpn.inc");
 
 if (!isset($config['l2tp']['radius']) || !is_array($config['l2tp']['radius'])) {

src/www/vpn_l2tp_users.php

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

src/www/vpn_l2tp_users_edit.php

@@ -45,6 +45,7 @@ function l2tp_users_sort()
 
 require_once("guiconfig.inc");
 require_once("services.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_pptp.php

@@ -31,6 +31,7 @@ require_once('guiconfig.inc');
 require_once('interfaces.inc');
 require_once('filter.inc');
 require_once('services.inc');
+require_once("plugins.inc");
 require_once("pfsense-utils.inc");
 require_once('plugins.inc.d/vpn.inc');
 

src/www/vpn_pptp_users.php

@@ -29,6 +29,7 @@
 
 require_once('guiconfig.inc');
 require_once('services.inc');
+require_once("plugins.inc");
 require_once('plugins.inc.d/vpn.inc');
 
 if (!is_array($config['pptpd']['user'])) {

src/www/vpn_pptp_users_edit.php

@@ -45,6 +45,7 @@ function pptpd_users_sort()
 
 require_once('guiconfig.inc');
 require_once('services.inc');
+require_once("plugins.inc");
 require_once('plugins.inc.d/vpn.inc');
 
 if (!is_array($config['pptpd']['user'])) {

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

@@ -33,14 +33,13 @@ $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");
+require_once("widgets/include/services_status.inc");
 
 $services = services_get();
 
-require_once 'plugins.inc';
-
 foreach (plugins_services() as $service) {
     $services[] = $service;
 }