Merge branch 'master' into next

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / proxy.cgi

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 5f56a4515a20b03e23dc5cffb12abf860160bc88..137f528bfbc325805664b9bc0e95673432c48d60 100644 (file)
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -983,8 +983,13 @@ my $count = `arp -a | wc -l`;
 if ( $count < 1 ){$count = 1;}
 if ( -e "/usr/bin/squidclamav" ) {
        print "<td class='base'><b>".$Lang::tr{'advproxy squidclamav'}."</b><br />";
-       print $Lang::tr{'advproxy enabled'}."<input type='checkbox' name='ENABLE_CLAMAV' ".$checked{'ENABLE_CLAMAV'}{'on'}." /><br />";
-       print "+ ".int(( $count**(1/3)) * 8);
+       if ( ! -e "/var/run/clamav/clamd.pid" ){
+               print "<font color='red'>clamav not running</font><br /><br />";
+               $proxysettings{'ENABLE_CLAMAV'} = 'off';
+               }
+       else {
+               print $Lang::tr{'advproxy enabled'}."<input type='checkbox' name='ENABLE_CLAMAV' ".$checked{'ENABLE_CLAMAV'}{'on'}." /><br />";
+               print "+ ".int(( $count**(1/3)) * 8);}
        print "</td>";
 } else {
        print "<td></td>";
@@ -3996,4 +4001,4 @@ sub writecachemgr
   return;
 }
 
-# -------------------------------------------------------------------
\ No newline at end of file
+# -------------------------------------------------------------------