[Ipcop-svn] SF.net SVN: ipcop:[6304] ipcop/trunk

[<dot...@us...>]

Revision: 6304
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6304&view=rev
Author:   dotzball
Date:     2012-02-02 07:35:26 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
Delete everything (except custom blacklist) on blacklist update, not only directories.

Modified Paths:
--------------
    ipcop/trunk/html/cgi-bin/urlfilter.cgi
    ipcop/trunk/src/scripts/blacklistupdate.pl

Modified: ipcop/trunk/html/cgi-bin/urlfilter.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/urlfilter.cgi	2012-02-01 11:32:47 UTC (rev 6303)
+++ ipcop/trunk/html/cgi-bin/urlfilter.cgi	2012-02-02 07:35:26 UTC (rev 6304)
@@ -268,7 +268,7 @@
             }
             else {
                 # remove old blacklists (except custom lists)
-                system("rm -rf `find $dbdir/* -maxdepth 0 -type d | grep -v $dbdir/custom` ");
+                system("rm -rf `find $dbdir/* -maxdepth 0 | grep -v $dbdir/custom` ");
 
                 system("cp -r /var/ipcop/proxy/update/blacklists/* $dbdir");
 
@@ -1565,8 +1565,8 @@
         $updatesettings{'CHECKUPDATES'}      = 'off';
         $updatesettings{'CUSTOM_UPDATE_URL'} = '';
 
-        if (-e "$updconffile") { 
-            &General::readhash("$updconffile", \%updatesettings); 
+        if (-e "$updconffile") {
+            &General::readhash("$updconffile", \%updatesettings);
         }
 
         $checked{'ENABLE_AUTOUPDATE'}{'off'}                                = '';
@@ -2330,7 +2330,7 @@
   -->
 <tr>
     <td class='comment2buttons'>
-        &nbsp; <!-- no multiple categories to select, at present... 
+        &nbsp; <!-- no multiple categories to select, at present...
         <img src='/blob.gif' alt='*' /><img src='/blob.gif' alt='*' />&nbsp;$Lang::tr{'urlfilter select multi'}
       -->
     </td>

Modified: ipcop/trunk/src/scripts/blacklistupdate.pl
===================================================================
--- ipcop/trunk/src/scripts/blacklistupdate.pl	2012-02-01 11:32:47 UTC (rev 6303)
+++ ipcop/trunk/src/scripts/blacklistupdate.pl	2012-02-02 07:35:26 UTC (rev 6304)
@@ -76,7 +76,7 @@
         $doSetPermissions = 1;
     }
     elsif ($argument eq '-v') {
-        # verbose 
+        # verbose
         $debugLevel++;
     }
     else {
@@ -228,7 +228,7 @@
                 system("/usr/bin/squidGuard -d -c $target/update.conf -C all");
 
                 # remove old blacklists (except custom lists)
-                system("rm -rf `find $dbdir/* -maxdepth 0 -type d | grep -v $dbdir/custom` ");
+                system("rm -rf `find $dbdir/* -maxdepth 0 | grep -v $dbdir/custom` ");
                 system("cp -r $target/blacklists/* $dbdir");
 
                 &setpermissions ($dbdir);

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