Changed urlfilter custom black/white list database rebuilding

[people/teissler/ipfire-2.x.git] / html / cgi-bin / updatexlrator.cgi

diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi
index fb457a3581149833db60179b15deb3f9b5b1794c..261b32a30de97006914552b4455a459f122fb72e 100644 (file)
--- a/html/cgi-bin/updatexlrator.cgi
+++ b/html/cgi-bin/updatexlrator.cgi
@@ -48,7 +48,7 @@ my $filedate='';
 my $lastaccess='';
 my $lastcheck='';
 
-my $repository = "/srv/web/ipfire/html/updatecache";
+my $repository = "/var/updatecache";
 my $hintcolour = '#FFFFCC';
 
 my $sfNoSource='0';
@@ -75,9 +75,8 @@ my $chk_cron_mly = "${General::swroot}/updatexlrator/autocheck/cron.monthly";
 
 $xlratorsettings{'ACTION'} = '';
 $xlratorsettings{'ENABLE_LOG'} = 'off';
-$xlratorsettings{'CHILDREN'} = '5';
 $xlratorsettings{'PASSIVE_MODE'} = 'off';
-$xlratorsettings{'MAX_DISK_USAGE'} = '75';
+$xlratorsettings{'MAX_DISK_USAGE'} = '95';
 $xlratorsettings{'LOW_DOWNLOAD_PRIORITY'} = 'off';
 $xlratorsettings{'ENABLE_AUTOCHECK'} = 'off';
 $xlratorsettings{'FULL_AUTOSYNC'} = 'off';
@@ -148,11 +147,6 @@ if ($xlratorsettings{'ACTION'} eq $Lang::tr{'updxlrtr purge'})
 
 if ($xlratorsettings{'ACTION'} eq $Lang::tr{'save'})
 {
-       if (!($xlratorsettings{'CHILDREN'} =~ /^\d+$/) || ($xlratorsettings{'CHILDREN'} < 1))
-       {
-               $errormessage = $Lang::tr{'updxlrtr invalid num of children'};
-               goto ERROR;
-       }
        if (!($xlratorsettings{'MAX_DISK_USAGE'} =~ /^\d+$/) || ($xlratorsettings{'MAX_DISK_USAGE'} < 1) || ($xlratorsettings{'MAX_DISK_USAGE'} > 100))
        {
                $errormessage = $Lang::tr{'updxlrtr invalid disk usage'};
@@ -164,11 +158,6 @@ if ($xlratorsettings{'ACTION'} eq $Lang::tr{'save'})
 
 if ($xlratorsettings{'ACTION'} eq $Lang::tr{'updxlrtr save and restart'})
 {
-       if (!($xlratorsettings{'CHILDREN'} =~ /^\d+$/) || ($xlratorsettings{'CHILDREN'} < 1))
-       {
-               $errormessage = $Lang::tr{'updxlrtr invalid num of children'};
-               goto ERROR;
-       }
        if (!($xlratorsettings{'MAX_DISK_USAGE'} =~ /^\d+$/) || ($xlratorsettings{'MAX_DISK_USAGE'} < 1) || ($xlratorsettings{'MAX_DISK_USAGE'} > 100))
        {
                $errormessage = $Lang::tr{'updxlrtr invalid disk usage'};
@@ -255,8 +244,6 @@ print <<END
 <tr>
        <td class='base' width='25%'>$Lang::tr{'updxlrtr enable log'}:</td>
        <td class='base' width='20%'><input type='checkbox' name='ENABLE_LOG' $checked{'ENABLE_LOG'}{'on'} /></td>
-       <td class='base' width='25%'>$Lang::tr{'updxlrtr children'}:</td>
-       <td class='base' width='30%'><input type='text' name='CHILDREN' value='$xlratorsettings{'CHILDREN'}' size='5' /></td>
 </tr>
 <tr>
        <td class='base'>$Lang::tr{'updxlrtr passive mode'}:</td>
@@ -461,28 +448,31 @@ END
                print "\t\t<td align='center' nowrap='nowrap'>&nbsp;";
                if ($metadata[1] eq 'Adobe')
                {
-                       print "<img src='/images/updxl-src-adobe.gif' alt='Adobe'}' />&nbsp;</td>\n";
+                       print "<img src='/images/updxl-src-adobe.gif' alt='Adobe' />&nbsp;</td>\n";
                } elsif ($metadata[1] eq 'Microsoft')
                {
-                       print "<img src='/images/updxl-src-windows.gif' alt='Microsoft'}' />&nbsp;</td>\n";
+                       print "<img src='/images/updxl-src-windows.gif' alt='Microsoft' />&nbsp;</td>\n";
                } elsif ($metadata[1] eq 'Symantec')
                {
-                       print "<img src='/images/updxl-src-symantec.gif' alt='Symantec'}' />&nbsp;</td>\n";
+                       print "<img src='/images/updxl-src-symantec.gif' alt='Symantec' />&nbsp;</td>\n";
                } elsif ($metadata[1] eq 'Avira')
                {
-                       print "<img src='/images/updxl-src-avira.gif' alt='Avira'}' />&nbsp;</td>\n";
+                       print "<img src='/images/updxl-src-avira.gif' alt='Avira' />&nbsp;</td>\n";
                } elsif ($metadata[1] eq 'Avast')
                {
-                       print "<img src='/images/updxl-src-avast.gif' alt='Avast'}' />&nbsp;</td>\n";
+                       print "<img src='/images/updxl-src-avast.gif' alt='Avast' />&nbsp;</td>\n";
                } elsif ($metadata[1] eq 'IPFire')
                {
-                       print "<img src='/images/IPFire.png' width='18' height='18' alt='IPFire'}' />&nbsp;</td>\n";
-               } elsif ($metadata[1] eq 'Appel')
+                       print "<img src='/images/IPFire.png' width='18' height='18' alt='IPFire' />&nbsp;</td>\n";
+               } elsif ($metadata[1] eq 'Apple')
+               {
+                       print "<img src='/images/updxl-src-apple.gif' alt='Apple' />&nbsp;</td>\n";
+               } elsif ($metadata[1] eq 'Kaspersky')
                {
-                       print "<img src='/images/Apple.png' width='18' height='18' alt='Apple'}' />&nbsp;</td>\n";
+                       print "<img src='/images/updxl-src-kaspersky.gif' alt='Kaspersky' />&nbsp;</td>\n";
                } elsif ($metadata[1] eq 'Linux')
                {
-                       print "<img src='/images/tux.png' alt='Linux'}' />&nbsp;</td>\n";
+                       print "<img src='/images/tux.png' alt='Linux' />&nbsp;</td>\n";
                } else
                {
                        print "<img src='/images/updxl-src-unknown.gif' alt='$Lang::tr{'updxlrtr unknown'}' />&nbsp;</td>\n";
@@ -580,12 +570,12 @@ print <<END
                <td align='center'><img src='/images/updxl-src-avast.gif' alt='Avast' /></td>
                <td class='base'>Avast</td>
                <td class='base'>&nbsp;</td>
+               <td align='center'><img src='/images/updxl-src-kaspersky.gif' alt='Kaspersky' /></td>
+               <td class='base'>Kaspersky</td>
+               <td class='base'>&nbsp;</td>
                <td align='center'><img src='/images/updxl-src-unknown.gif' alt='$Lang::tr{'updxlrtr unknown'}' /></td>
                <td class='base'>$Lang::tr{'updxlrtr unknown'}</td>
                <td class='base'>&nbsp;</td>
-               <td align='center'></td>
-               <td class='base'></td>
-               <td class='base'>&nbsp;</td>
        </tr>
 </table>
 END