lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

(legacy/plugins) move plugin_scan to system.inc for dependency reasons

Browse Source
This commit is contained in:
Ad Schellevis 2016-02-23 10:28:34 +01:00
parent 9fdca30079
commit 4bffccf813
9 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/etc/inc/plugins.inc
View File

@ -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();

29
src/etc/inc/system.inc
View File

@ -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;
}

1
src/www/vpn_l2tp.php
View File

@ -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");

1
src/www/vpn_l2tp_users.php
View File

@ -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");

1
src/www/vpn_l2tp_users_edit.php
View File

@ -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");

1
src/www/vpn_pptp.php
View File

@ -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');

1
src/www/vpn_pptp_users.php
View File

@ -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');

1
src/www/vpn_pptp_users_edit.php
View File

@ -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');

1
src/www/widgets/widgets/services_status.widget.php
View File

@ -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");