Changed proxy page and redirector detections

diff --git a/config/rootfiles/core/28/filelists/files b/config/rootfiles/core/28/filelists/files
index 2c2d15dce921e05c3bf269b9eeb51b0af03fef09..e3b25cea5470a947f83734d382d09e59573f2276 100644 (file)
--- a/config/rootfiles/core/28/filelists/files
+++ b/config/rootfiles/core/28/filelists/files
@@ -39,6 +39,7 @@ srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
 srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/backup.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi
 usr/local/bin/backupiso
 usr/local/bin/updxsetperms
 var/ipfire/updatexlrator/bin/download

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 176adb109afa4a11e6d184a23817a9bbfe7300ee..24d45c5dd0c31b34395e7fc6a23ac7c09bf189ef 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -190,14 +190,14 @@
 * logrotate-3.7.1
 * logwatch-7.3.6
 * lsof-4.78
-* lynis-1.2.3
+* lynis-1.2.6
 * lzo-2.02
 * m4-1.4.4
 * mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.23-ipfire
 * mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.23-ipfire-xen
 * mISDNuser.git-54928dec57bc846f2c2186f3640e69a053cd3641
-* madwifi-hal-testing-r4003-20090416-kmod-2.6.27.23-ipfire
-* madwifi-hal-testing-r4003-20090416-kmod-2.6.27.23-ipfire-xen
+* madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.23-ipfire
+* madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.23-ipfire-xen
 * make-3.81
 * man-db-2.4.3
 * man-pages-2.34
@@ -261,7 +261,7 @@
 * pptp-1.7.2
 * procps-3.2.6
 * psmisc-22.2
-* qemu-0.10.2
+* qemu-0.10.5
 * readline-5.1
 * reiser4progs-1.0.5
 * reiserfsprogs-3.6.19

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
+# -------------------------------------------------------------------