[Ipcop-svn] SF.net SVN: ipcop:[5814] ipcop/trunk/html/cgi-bin/proxy.cgi

[owes]

Revision: 5814
          http://ipcop.svn.sourceforge.net/ipcop/?rev=5814&view=rev
Author:   owes
Date:     2011-08-19 07:09:38 +0000 (Fri, 19 Aug 2011)

Log Message:
-----------
Change path etc. for squidGuard (URL filter).

Modified Paths:
--------------
    ipcop/trunk/html/cgi-bin/proxy.cgi

Modified: ipcop/trunk/html/cgi-bin/proxy.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/proxy.cgi  2011-08-19 07:07:41 UTC (rev 5813)
+++ ipcop/trunk/html/cgi-bin/proxy.cgi  2011-08-19 07:09:38 UTC (rev 5814)
@@ -242,15 +242,17 @@
 
 $https_port = $mainsettings{'GUIPORT'} if (defined($mainsettings{'GUIPORT'}));
 
-if (-e "/var/ipcop/urlfilter/version") { $urlfilter_addon = 1; }
+if (-e "/usr/bin/squidGuard") { $urlfilter_addon = 1; }
 if (-e "/var/ipcop/addons/updatexlrator/version") { $updaccel_addon = 1; }
 
 if ($urlfilter_addon) {
     $filtersettings{'CHILDREN'} = '5';
-    if (-e "/var/ipcop/urlfilter/settings") {
-        &General::readhash("/var/ipcop/urlfilter/settings", \%filtersettings);
+    if (-e "/var/ipcop/proxy/filtersettings") {
+        &General::readhash("/var/ipcop/proxy/filtersettings", 
\%filtersettings);
     }
-    $urlfilterversion = `cat /var/ipcop/urlfilter/version`;
+    $urlfilterversion = `/usr/bin/squidGuard -v 2>&1`;
+    $urlfilterversion =~ s/^SquidGuard://i;
+    $urlfilterversion =~ s/^\s+//g;
     $urlfilterversion =~ s/([^\s]+).*/$1/;
 }
 
@@ -1699,7 +1701,7 @@
     print <<END
 <table width='100%'>
 <tr>
-    <td class='base' colspan='4'><b>$Lang::tr{'url filter'}</b>&nbsp; [ 
$urlfilterversion ]</td>
+    <td class='base' colspan='4'><b>$Lang::tr{'url filter'}</b>&nbsp; [ 
SquidGuard: $urlfilterversion ]</td>
 </tr>
 <tr>
     <td class='base' width='25%'>$Lang::tr{'enabled'}:</td>
@@ -4150,7 +4152,7 @@
             if ($proxysettings{'ENABLE_FILTER'} eq 'on')
             {
                 print FILE <<END
-url_rewrite_program /usr/sbin/squidGuard
+url_rewrite_program /usr/bin/squidGuard
 url_rewrite_children $filtersettings{'CHILDREN'}
 
 END


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system, 
user administration capabilities and model configuration. Take 
the hassle out of deploying and managing Subversion and the 
tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn