Fixed Backup CGI

Removed Kaspersky from Update Booster

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@1006 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/updxlrator/updxlrator b/config/updxlrator/updxlrator
index 3edf4a67e7cce6d133735e472c5ae842004195df..33f8d89eff68ab37ecf15fb8851e9c8fe0678859 100644 (file)
--- a/config/updxlrator/updxlrator
+++ b/config/updxlrator/updxlrator
@@ -156,13 +156,14 @@ while (<>) {
        }
        
        # ----------------------------------------------------------- 
-       # Section: Kaspersky Downloads 
+       # Section: Kaspersky Downloads
+  # not working properly 
        # -----------------------------------------------------------  
        
-       if ($dsturl =~ m@^http://dnl-.*\.kaspersky-labs\.com\/(diffs|bases|AutoPatches).*$@i) 
-       { 
-       $from_local_cache = &cache_access($dsturl,$hostaddr,$username,"Kaspersky"); 
-       }
+       #if ($dsturl =~ m@^http://dnl-.*\.kaspersky-labs\.com\/(diffs|bases|AutoPatches).*$@i) 
+       #{ 
+       #$from_local_cache = &cache_access($dsturl,$hostaddr,$username,"Kaspersky"); 
+       #}
 
        # ----------------------------------------------------------- 
 

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 5088629dfd077408c1b23846ffa9d7d0805890e9..b37e88197cbc98c215fcc96c7de34294c955c01a 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,31 @@
+------------------------------------------------------------------------
+r1005 | ms | 2007-10-27 13:02:37 +0400 (Sat, 27 Oct 2007) | 2 lines
+
+Made the website compatible to XHTML.
+
+------------------------------------------------------------------------
+r1004 | ms | 2007-10-27 11:48:17 +0400 (Sat, 27 Oct 2007) | 2 lines
+
+The hplip tool was added for printing with HP.
+
+------------------------------------------------------------------------
+r1003 | ms | 2007-10-27 02:28:09 +0400 (Sat, 27 Oct 2007) | 2 lines
+
+You need to change the version in the pakfire.conf, too.
+
+------------------------------------------------------------------------
+r1002 | ms | 2007-10-27 02:26:23 +0400 (Sat, 27 Oct 2007) | 4 lines
+
+Added some custom patches for openswan
+tagged rc2
+fixed red and cleanfs by arne
+
+------------------------------------------------------------------------
+r1001 | maniacikarus | 2007-10-26 22:09:41 +0400 (Fri, 26 Oct 2007) | 3 lines
+
+corrected mpfire stream url
+changed some directories for backup
+
 ------------------------------------------------------------------------
 r1000 | ms | 2007-10-26 19:14:59 +0400 (Fri, 26 Oct 2007) | 2 lines
 

diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi
index 2d84b70b68104c8a33ce01630f0f7464d1fc65d8..0e29ace5fda2fce8cdc97c5e1d5a40c23b618d4f 100644 (file)
--- a/html/cgi-bin/backup.cgi
+++ b/html/cgi-bin/backup.cgi
@@ -182,12 +182,18 @@ END
 &Header::openbox('100%', 'center', 'addons');
 
 my @addonincluds = `ls /var/ipfire/backup/addons/includes/ 2>/dev/null`;
-my %addons = `ls /var/ipfire/backup/addons/backup/ 2>/dev/null`;
+my @addons = `ls /var/ipfire/backup/addons/backup/ 2>/dev/null`;
+my %addons;
+
+foreach (@addons){
+       my $addon=substr($_,0,length($_)-5);
+       $addons{$addon}='';
+}
 
 print "<table width='95%' cellspacing='0'>";
 foreach (@addonincluds){
 chomp($_);
-delete($addons{$_."\.ipf\n"});
+delete $addons{$_};
 my $Datei = "/var/ipfire/backup/addons/backup/".$_.".ipf";
 my @Info = stat($Datei);
 my $Size = $Info[7] / 1024;
@@ -228,24 +234,23 @@ END
 }
 foreach (keys(%addons)){
 chomp($_);
-my $Datei = "/var/ipfire/backup/addons/backup/".$_;
+my $Datei = "/var/ipfire/backup/addons/backup/".$_.".ipf";
 my @Info = stat($Datei);
 my $Size = $Info[7] / 1024;
 $Size = sprintf("%2d", $Size);
-my $addon=substr($_,0,length($_)-4);
-print "<tr><td align='center'>$Lang::tr{'backup from'} $addon $Lang::tr{'size'} $Size KB $Lang::tr{'date'} ".localtime($Info[9])."</td>";
+print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size KB $Lang::tr{'date'} ".localtime($Info[9])."</td>";
 print <<END
        <td align='right' width='5'>
                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                <input type='hidden' name='ACTION' value='downloadaddon' />
-               <input type='hidden' name='FILE' value='$_' />
+               <input type='hidden' name='FILE' value='$_.ipf' />
                <input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/package-x-generic.png' />
                </form>
        </td>
        <td align='right' width='5'>
                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                <input type='hidden' name='ACTION' value='delete' />
-               <input type='hidden' name='FILE' value='addons/backup/$_' />
+               <input type='hidden' name='FILE' value='addons/backup/$_.ipf' />
                <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' />
                </form>
        </td>