aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfig/dansguardian/dansguardian.inc6
-rw-r--r--config/dansguardian/dansguardian.php2
2 files changed, 4 insertions, 4 deletions
diff --git a/config/dansguardian/dansguardian.inc b/config/dansguardian/dansguardian.inc
index 505cb0f3..b1c79a97 100755
--- a/config/dansguardian/dansguardian.inc
+++ b/config/dansguardian/dansguardian.inc
@@ -1133,8 +1133,8 @@ EOF;
$cconf_file=file_get_contents($cconf);
if (preg_match("/User (\w+)/",$cconf_file,$matches)){
#clamd script file
- $clamav_script='/usr/local/etc/rc.d/clamav-clamd';
- $script_file=file($clamav_script);
+ $script='/usr/local/etc/rc.d/clamav-clamd';
+ $script_file=file($script);
$new_clamav_startup="";
$cpreg_m[0]="@NO@";
$cpreg_m[1]="@/usr/local@";
@@ -1154,7 +1154,7 @@ EOF;
$new_clamav_startup.=preg_replace($cpreg_m,$cpreg_r,$script_line);
}
}
- file_put_contents($clamav_script, $new_clamav_startup, LOCK_EX);
+ file_put_contents($script, $new_clamav_startup, LOCK_EX);
chmod ($script,0755);
if (file_exists('/var/run/dansguardian.pid') && is_process_running('clamd')){
diff --git a/config/dansguardian/dansguardian.php b/config/dansguardian/dansguardian.php
index e23578dc..b9c972a1 100644
--- a/config/dansguardian/dansguardian.php
+++ b/config/dansguardian/dansguardian.php
@@ -41,7 +41,7 @@ require_once("/usr/local/pkg/dansguardian.inc");
function fetch_blacklist($log_notice=true,$install_process=false) {
global $config,$g;
- if (is_array($config['installedpackages']['dansguardianblacklist'] && is_array($config['installedpackages']['dansguardianblacklist']['config']))){
+ if (is_array($config['installedpackages']['dansguardianblacklist']) && is_array($config['installedpackages']['dansguardianblacklist']['config'])){
$url=$config['installedpackages']['dansguardianblacklist']['config'][0]['url'];
$uw="Found a previouns install, checking Blacklist config...";
}