From 4bffccf81377f0ced14989f5caa591c9f2c8e7c9 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Tue, 23 Feb 2016 10:28:34 +0100
Subject: [PATCH] (legacy/plugins) move plugin_scan to system.inc for
 dependency reasons

---
 src/etc/inc/plugins.inc                       | 23 ---------------
 src/etc/inc/system.inc                        | 29 ++++++++++++++++++-
 src/www/vpn_l2tp.php                          |  1 +
 src/www/vpn_l2tp_users.php                    |  1 +
 src/www/vpn_l2tp_users_edit.php               |  1 +
 src/www/vpn_pptp.php                          |  1 +
 src/www/vpn_pptp_users.php                    |  1 +
 src/www/vpn_pptp_users_edit.php               |  1 +
 .../widgets/services_status.widget.php        |  1 +
 9 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/src/etc/inc/plugins.inc b/src/etc/inc/plugins.inc
index 5f01b9862..f4f43b11a 100644
--- a/src/etc/inc/plugins.inc
+++ b/src/etc/inc/plugins.inc
@@ -26,29 +26,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-function plugin_scan()
-{
-    $path = '/usr/local/etc/inc/plugins.inc.d/';
-    $ext = '.inc';
-
-    $ret = array();
-
-    $plugins = glob($path . '*' . $ext);
-    if (!is_array($plugins)) {
-        return $ret;
-    }
-
-    sort($plugins);
-
-    foreach ($plugins as $plugin) {
-        $name = preg_replace('/' . preg_quote($path, '/') . '/', '', $plugin);
-        $name = preg_replace('/' . preg_quote($ext, '/') . '/', '', $name);
-        $ret[$name] = $plugin;
-    }
-
-    return $ret;
-}
-
 function plugins_services()
 {
     $services = array();
diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index dbc0a8f9c..14c6052b4 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -1,6 +1,7 @@
 <?php
 
 /*
+  Copyright (C) 2016 Franco Fichtner <franco@opnsense.org>
   Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
   All rights reserved.
 
@@ -844,7 +845,6 @@ function system_syslogd_start()
             }
         }
 
-
         asort($separatelogfacilities);
         $facilitylist = implode(',', array_unique($separatelogfacilities));
         $syslogconf .= "!-{$facilitylist}\n";
@@ -1804,3 +1804,30 @@ function get_possible_traffic_source_addresses($include_ipv6_link_local=false) {
     }
     return $sourceips;
 }
+
+/**
+ * scan plugins for legacy system
+ * @return array
+ */
+function plugin_scan()
+{
+    $path = '/usr/local/etc/inc/plugins.inc.d/';
+    $ext = '.inc';
+
+    $ret = array();
+
+    $plugins = glob($path . '*' . $ext);
+    if (!is_array($plugins)) {
+        return $ret;
+    }
+
+    sort($plugins);
+
+    foreach ($plugins as $plugin) {
+        $name = preg_replace('/' . preg_quote($path, '/') . '/', '', $plugin);
+        $name = preg_replace('/' . preg_quote($ext, '/') . '/', '', $name);
+        $ret[$name] = $plugin;
+    }
+
+    return $ret;
+}
diff --git a/src/www/vpn_l2tp.php b/src/www/vpn_l2tp.php
index 66abff2e9..22aee009f 100644
--- a/src/www/vpn_l2tp.php
+++ b/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("system.inc");
 require_once("plugins.inc");
 require_once("plugins.inc.d/vpn.inc");
 
diff --git a/src/www/vpn_l2tp_users.php b/src/www/vpn_l2tp_users.php
index 8e098f23a..61124daef 100644
--- a/src/www/vpn_l2tp_users.php
+++ b/src/www/vpn_l2tp_users.php
@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("services.inc");
+require_once("system.inc");
 require_once("plugins.inc");
 require_once("plugins.inc.d/vpn.inc");
 
diff --git a/src/www/vpn_l2tp_users_edit.php b/src/www/vpn_l2tp_users_edit.php
index e6fc24f0d..c5b49bdf0 100644
--- a/src/www/vpn_l2tp_users_edit.php
+++ b/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("system.inc");
 require_once("plugins.inc");
 require_once("plugins.inc.d/vpn.inc");
 
diff --git a/src/www/vpn_pptp.php b/src/www/vpn_pptp.php
index fa9edcf3a..cad25e260 100644
--- a/src/www/vpn_pptp.php
+++ b/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("system.inc");
 require_once("plugins.inc");
 require_once("pfsense-utils.inc");
 require_once('plugins.inc.d/vpn.inc');
diff --git a/src/www/vpn_pptp_users.php b/src/www/vpn_pptp_users.php
index d7a0bd97e..e1702adaf 100644
--- a/src/www/vpn_pptp_users.php
+++ b/src/www/vpn_pptp_users.php
@@ -29,6 +29,7 @@
 
 require_once('guiconfig.inc');
 require_once('services.inc');
+require_once("system.inc");
 require_once("plugins.inc");
 require_once('plugins.inc.d/vpn.inc');
 
diff --git a/src/www/vpn_pptp_users_edit.php b/src/www/vpn_pptp_users_edit.php
index 24e60bd85..a70621dbc 100644
--- a/src/www/vpn_pptp_users_edit.php
+++ b/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("system.inc");
 require_once("plugins.inc");
 require_once('plugins.inc.d/vpn.inc');
 
diff --git a/src/www/widgets/widgets/services_status.widget.php b/src/www/widgets/widgets/services_status.widget.php
index cd4325c69..b0279dd76 100644
--- a/src/www/widgets/widgets/services_status.widget.php
+++ b/src/www/widgets/widgets/services_status.widget.php
@@ -33,6 +33,7 @@ $nocsrf = true;
 
 require_once("guiconfig.inc");
 require_once("services.inc");
+require_once("system.inc");
 require_once('plugins.inc');
 require_once("ipsec.inc");
 require_once("interfaces.inc");