src: first shuffling for splitting off plugins from core

src/etc/inc/plugins.inc

+<?php
+
+/*
+ * Copyright (C) 2016 Franco Fichtner <franco@opnsense.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+foreach (glob('/usr/local/etc/inc/plugins.inc.d/*.inc') as $plugin) {
+    require_once $plugin;
+}

src/etc/rc.bootup

@@ -150,7 +150,7 @@ require_once("vslb.inc");
 echo ".";
 require_once("filter.inc");
 echo ".";
-require_once("vpn.inc");
+require_once("plugins.inc");
 echo ".";
 require_once("openvpn.inc");
 echo ".";

src/etc/rc.filter_configure_sync

@@ -30,11 +30,10 @@
 require_once("config.inc");
 require_once("util.inc");
 require_once("filter.inc");
-require_once("vpn.inc");
+require_once("plugins.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 require_once("services.inc");
 
-
 filter_configure_sync();

src/etc/rc.initial.setlanip

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

src/etc/rc.initial.setports

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

src/etc/rc.linkup

@@ -31,6 +31,7 @@
 require_once("config.inc");
 require_once("filter.inc");
 require_once("interfaces.inc");
+require_once('plugins.inc');
 require_once('openvpn.inc');
 require_once("util.inc");
 require_once("system.inc");
@@ -72,7 +73,6 @@ function handle_argument_group($iface, $argument2) {
                 case "start":
                     log_error("DEVD Ethernet attached event for {$iface}");
                     log_error("HOTPLUG: Configuring interface {$iface}");
-                    require_once("vpn.inc");
                     // Do not try to readd to bridge otherwise em(4) has problems
                     interface_configure($iface, true, true);
                     break;

src/etc/rc.newipsecdns

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

src/etc/rc.newwanip

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

src/etc/rc.newwanipv6

@@ -32,7 +32,7 @@
 require_once("config.inc");
 require_once("interfaces.inc");
 require_once("filter.inc");
-require_once("vpn.inc");
+require_once("plugins.inc");
 require_once("openvpn.inc");
 require_once("services.inc");
 require_once("rrd.inc");

src/etc/rc.reload_all

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

src/etc/rc.reload_interfaces

@@ -31,10 +31,9 @@ require_once("config.inc");
 require_once("filter.inc");
 require_once("util.inc");
 require_once("openvpn.inc");
-require_once("vpn.inc");
+require_once("plugins.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
-require_once("openvpn.inc");
 require_once("pfsense-utils.inc");
 require_once("services.inc");
 require_once("unbound.inc");

src/www/diag_ipsec_leases.php

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

src/www/diag_ipsec_sad.php

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

src/www/diag_ipsec_spd.php

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

src/www/diag_logs_vpn.inc

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

src/www/interfaces.php

@@ -32,10 +32,9 @@
 */
 
 require_once("guiconfig.inc");
-require_once("vpn.inc");
+require_once("plugins.inc");
 require_once("filter.inc");
 require_once("rrd.inc");
-require_once("vpn.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("openvpn.inc");

src/www/interfaces_assign.php

@@ -30,7 +30,7 @@
 
 require_once("guiconfig.inc");
 require_once("filter.inc");
-require_once("vpn.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,7 @@ require_once("unbound.inc");
 require_once("pfsense-utils.inc");
 require_once("openvpn.inc");
 require_once("filter.inc");
-require_once("vpn.inc");
+require_once("plugins.inc");
 require_once("interfaces.inc");
 require_once("rrd.inc");
 

src/www/system_advanced_misc.php

@@ -31,7 +31,7 @@
 
 require_once("guiconfig.inc");
 require_once("filter.inc");
-require_once("vpn.inc");
+require_once("plugins.inc");
 require_once("vslb.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");

src/www/system_gateway_groups_edit.php

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

src/www/vpn_ipsec.php

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

src/www/vpn_ipsec_keys.php

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

src/www/vpn_ipsec_keys_edit.php

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

src/www/vpn_ipsec_mobile.php

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

src/www/vpn_ipsec_phase1.php

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

src/www/vpn_ipsec_phase2.php

@@ -30,7 +30,7 @@
 
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
-require_once("vpn.inc");
+require_once("plugins.inc");
 require_once("services.inc");
 
 /**

src/www/vpn_ipsec_settings.php

@@ -29,7 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("filter.inc");
-require_once("vpn.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("vpn.inc");
+require_once("plugins.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("vpn.inc");
+require_once("plugins.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("vpn.inc");
+require_once("plugins.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("vpn.inc");
+require_once("plugins.inc");
 require_once("interfaces.inc");
 
 if (!is_array($config['pppoes'])) {

src/www/vpn_pppoe_edit.php

@@ -29,7 +29,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("vpn.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('vpn.inc');
+require_once('plugins.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('vpn.inc');
+require_once('plugins.inc');
 
 if (!is_array($config['pptpd']['user'])) {
     $config['pptpd']['user'] = array();

src/www/vpn_pptp_users_edit.php

@@ -44,7 +44,7 @@ function pptpd_users_sort()
 }
 
 require_once('guiconfig.inc');
-require_once('vpn.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,7 @@ $nocsrf = true;
 
 require_once("guiconfig.inc");
 require_once("services.inc");
-require_once("vpn.inc");
+require_once("plugins.inc");
 require_once("widgets/include/services_status.inc");
 require_once("interfaces.inc");