aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/Fit123/bin/cpaddon/filter.inc3
-rwxr-xr-xconfig/Fit123/bin/dnssrv/system.abc2
-rw-r--r--config/autoconfigbackup/autoconfigbackup.xml2
-rw-r--r--config/clamsmtp.inc7
-rw-r--r--config/freenas/www/diag_fn_logs_settings.php3
-rw-r--r--config/frickin/frickin.inc3
-rw-r--r--config/havp/havp.inc4
-rw-r--r--config/igmpproxy/filter.tmp3
-rw-r--r--config/ovpnenhance/openvpn.inc_tls3
-rw-r--r--config/p3scan.inc4
-rw-r--r--config/siproxd.inc3
-rw-r--r--config/spamd.inc4
-rw-r--r--config/squid-head/squid.inc4
-rw-r--r--config/squid/squid.inc4
-rw-r--r--config/squid/squid_ng.inc3
-rw-r--r--config/squid3/squid.inc4
-rw-r--r--config/squid3/squid_ng.inc3
-rw-r--r--config/tinydns/tinydns.inc3
18 files changed, 54 insertions, 8 deletions
diff --git a/config/Fit123/bin/cpaddon/filter.inc b/config/Fit123/bin/cpaddon/filter.inc
index 9d74cbb3..1d1822db 100644
--- a/config/Fit123/bin/cpaddon/filter.inc
+++ b/config/Fit123/bin/cpaddon/filter.inc
@@ -39,6 +39,9 @@ require_once("functions.inc");
require_once("pkg-utils.inc");
require_once("notices.inc");
+if(!function_exists("filter_configure"))
+ requre_once("filter.inc");
+
if($config['system']['shapertype'] <> "m0n0")
require_once ("shaper.inc");
diff --git a/config/Fit123/bin/dnssrv/system.abc b/config/Fit123/bin/dnssrv/system.abc
index 24021aab..e19bf785 100755
--- a/config/Fit123/bin/dnssrv/system.abc
+++ b/config/Fit123/bin/dnssrv/system.abc
@@ -30,6 +30,8 @@
*/
require("guiconfig.inc");
+if(!function_exists("filter_configure"))
+ requre_once("filter.inc");
$pconfig['hostname'] = $config['system']['hostname'];
$pconfig['domain'] = $config['system']['domain'];
diff --git a/config/autoconfigbackup/autoconfigbackup.xml b/config/autoconfigbackup/autoconfigbackup.xml
index 9e8b89ef..ea514554 100644
--- a/config/autoconfigbackup/autoconfigbackup.xml
+++ b/config/autoconfigbackup/autoconfigbackup.xml
@@ -149,6 +149,8 @@
<custom_php_resync_config_command>
<![CDATA[
exec("echo > /cf/conf/lastpfSbackup.txt");
+ if(!function_exists("filter_configure"))
+ requre_once("filter.inc");
filter_configure();
if($savemsg)
$savemsg .= "<br/>";
diff --git a/config/clamsmtp.inc b/config/clamsmtp.inc
index 08d9e23b..7b7cf121 100644
--- a/config/clamsmtp.inc
+++ b/config/clamsmtp.inc
@@ -2,7 +2,9 @@
require_once('globals.inc');
require_once('config.inc');
require_once('service-utils.inc');
-require_once('filter.inc');
+
+if(!function_exists("filter_configure"))
+ requre_once("filter.inc");
function clamsmtp_install_command() {
global $g;
@@ -51,4 +53,5 @@ EOD;
restart_service('clamsmtp');
filter_configure();
}
-?>
+
+?> \ No newline at end of file
diff --git a/config/freenas/www/diag_fn_logs_settings.php b/config/freenas/www/diag_fn_logs_settings.php
index a51e8479..5aadb7b8 100644
--- a/config/freenas/www/diag_fn_logs_settings.php
+++ b/config/freenas/www/diag_fn_logs_settings.php
@@ -49,6 +49,9 @@ require_once("guiconfig.inc");
require_once("freenas_guiconfig.inc");
require_once("freenas_functions.inc");
+if(!function_exists("filter_configure"))
+ requre_once("filter.inc");
+
$pconfig['reverse'] = isset($config['syslog']['reverse']);
$pconfig['nentries'] = $config['syslog']['nentries'];
$pconfig['remoteserver'] = $config['syslog']['remoteserver'];
diff --git a/config/frickin/frickin.inc b/config/frickin/frickin.inc
index a79345bb..4c77f144 100644
--- a/config/frickin/frickin.inc
+++ b/config/frickin/frickin.inc
@@ -29,6 +29,9 @@
POSSIBILITY OF SUCH DAMAGE.
*/
+if(!function_exists("filter_configure"))
+ requre_once("filter.inc");
+
function frickin_custom_php_install_command() {
global $config;
if(file_exists("/tmp/frickin.tgz")) {
diff --git a/config/havp/havp.inc b/config/havp/havp.inc
index 649626b1..e5df91e6 100644
--- a/config/havp/havp.inc
+++ b/config/havp/havp.inc
@@ -36,9 +36,11 @@ require_once('util.inc');
require_once('system.inc');
require_once('pfsense-utils.inc');
require_once('pkg-utils.inc');
-require_once('filter.inc');
require_once('service-utils.inc');
+if(!function_exists("filter_configure"))
+ requre_once("filter.inc");
+
# ------------------------------------------------------------------------------
# globals
# ------------------------------------------------------------------------------
diff --git a/config/igmpproxy/filter.tmp b/config/igmpproxy/filter.tmp
index fa79ac54..acf32eb1 100644
--- a/config/igmpproxy/filter.tmp
+++ b/config/igmpproxy/filter.tmp
@@ -39,6 +39,9 @@ require_once("functions.inc");
require_once("pkg-utils.inc");
require_once("notices.inc");
+if(!function_exists("filter_configure"))
+ requre_once("filter.inc");
+
if($config['system']['shapertype'] <> "m0n0")
require_once ("shaper.inc");
diff --git a/config/ovpnenhance/openvpn.inc_tls b/config/ovpnenhance/openvpn.inc_tls
index 9ea4c7da..92a2d103 100644
--- a/config/ovpnenhance/openvpn.inc_tls
+++ b/config/ovpnenhance/openvpn.inc_tls
@@ -38,6 +38,9 @@ require_once('config.inc');
require_once('pfsense-utils.inc');
require_once('util.inc');
+if(!function_exists("filter_configure"))
+ requre_once("filter.inc");
+
// Return the list of ciphers OpenVPN supports
function openvpn_get_ciphers($pkg) {
foreach ($pkg['fields']['field'] as $i => $field) {
diff --git a/config/p3scan.inc b/config/p3scan.inc
index 4f9a025b..b1058cc6 100644
--- a/config/p3scan.inc
+++ b/config/p3scan.inc
@@ -3,7 +3,9 @@ require_once('globals.inc');
require_once('config.inc');
require_once('util.inc');
require_once('service-utils.inc');
-require_once('filter.inc');
+
+if(!function_exists("filter_configure"))
+ requre_once("filter.inc");
define('VIRUSDIR', '/var/tmp/p3scan');
diff --git a/config/siproxd.inc b/config/siproxd.inc
index 147eee31..05cf515e 100644
--- a/config/siproxd.inc
+++ b/config/siproxd.inc
@@ -27,6 +27,9 @@
POSSIBILITY OF SUCH DAMAGE.
*/
+if(!function_exists("filter_configure"))
+ requre_once("filter.inc");
+
function sync_package_sipproxd_users() {
conf_mount_rw();
config_lock();
diff --git a/config/spamd.inc b/config/spamd.inc
index 48aea12e..ebf0c567 100644
--- a/config/spamd.inc
+++ b/config/spamd.inc
@@ -28,6 +28,10 @@
POSSIBILITY OF SUCH DAMAGE.
*/
+
+if(!function_exists("filter_configure"))
+ requre_once("filter.inc");
+
function sync_package_spamd() {
global $config, $g;
diff --git a/config/squid-head/squid.inc b/config/squid-head/squid.inc
index 08cf3121..10c87949 100644
--- a/config/squid-head/squid.inc
+++ b/config/squid-head/squid.inc
@@ -4,9 +4,11 @@ require_once('config.inc');
require_once('util.inc');
require_once('pfsense-utils.inc');
require_once('pkg-utils.inc');
-require_once('filter.inc');
require_once('service-utils.inc');
+if(!function_exists("filter_configure"))
+ requre_once("filter.inc");
+
define('RC_BASE', '/usr/local/etc/rc.d');
define('SQUID_CONFBASE', '/usr/local/etc/squid');
define('SQUID_LOGDIR', '/var/squid/log');
diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index 4200f02e..2d4da84c 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -34,9 +34,11 @@ require_once('config.inc');
require_once('util.inc');
require_once('pfsense-utils.inc');
require_once('pkg-utils.inc');
-require_once('filter.inc');
require_once('service-utils.inc');
+if(!function_exists("filter_configure"))
+ requre_once("filter.inc");
+
define('SQUID_CONFBASE', '/usr/local/etc/squid');
define('SQUID_ACLDIR', '/var/squid/acl');
define('SQUID_PASSWD', '/var/etc/squid.passwd');
diff --git a/config/squid/squid_ng.inc b/config/squid/squid_ng.inc
index dc18e349..f54448ae 100644
--- a/config/squid/squid_ng.inc
+++ b/config/squid/squid_ng.inc
@@ -31,6 +31,9 @@
*/
+if(!function_exists("filter_configure"))
+ requre_once("filter.inc");
+
function global_write_squid_config()
{
global $config;
diff --git a/config/squid3/squid.inc b/config/squid3/squid.inc
index 3aa3c95c..efd3388b 100644
--- a/config/squid3/squid.inc
+++ b/config/squid3/squid.inc
@@ -34,9 +34,11 @@ require_once('config.inc');
require_once('util.inc');
require_once('pfsense-utils.inc');
require_once('pkg-utils.inc');
-require_once('filter.inc');
require_once('service-utils.inc');
+if(!function_exists("filter_configure"))
+ requre_once("filter.inc");
+
define('SQUID_CONFBASE', '/usr/local/etc/squid');
define('SQUID_ACLDIR', '/var/squid/acl');
define('SQUID_PASSWD', '/var/etc/squid.passwd');
diff --git a/config/squid3/squid_ng.inc b/config/squid3/squid_ng.inc
index dc18e349..f54448ae 100644
--- a/config/squid3/squid_ng.inc
+++ b/config/squid3/squid_ng.inc
@@ -31,6 +31,9 @@
*/
+if(!function_exists("filter_configure"))
+ requre_once("filter.inc");
+
function global_write_squid_config()
{
global $config;
diff --git a/config/tinydns/tinydns.inc b/config/tinydns/tinydns.inc
index 057dafb9..ec38ca7d 100644
--- a/config/tinydns/tinydns.inc
+++ b/config/tinydns/tinydns.inc
@@ -30,7 +30,8 @@
POSSIBILITY OF SUCH DAMAGE.
*/
-require_once("filter.inc");
+if(!function_exists("filter_configure"))
+ requre_once("filter.inc");
function tinydns_custom_php_install_command() {
global $g, $config;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 00:23:19 +0000