X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fbackup.cgi;h=8c938149642380152562767a4752bf0309fc3529;hp=d160349ff1d2e36f4302c02b02238b6dfe63ca73;hb=98e8c7b563dcede542b9c78ceed2e279c2358abc;hpb=5504342a5e6739afd32dda2ec381686efe24c276

diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi
old mode 100755
new mode 100644
index d160349ff..8c9381496
--- a/html/cgi-bin/backup.cgi
+++ b/html/cgi-bin/backup.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2005-2010  IPFire Team                                        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -35,6 +35,8 @@ my %cgiparams=();
 my %checked = ();
 my $message = "";
 my $errormessage = "";
+my @backups = "";
+my @backupisos = "";
 
 $a = new CGI;
 
@@ -64,6 +66,8 @@ if ( $cgiparams{'ACTION'} eq "download" )
 		open(DLFILE, "</var/ipfire/backup/$cgiparams{'FILE'}") or die "Unable to open $cgiparams{'FILE'}: $!";
 		my @fileholder = <DLFILE>;
 		print "Content-Type:application/x-download\n";
+		my @fileinfo = stat("/var/ipfire/backup/$cgiparams{'FILE'}");
+		print "Content-Length:$fileinfo[7]\n";
 		print "Content-Disposition:attachment;filename=$cgiparams{'FILE'}\n\n";
 		print @fileholder;
 		exit (0);
@@ -73,6 +77,8 @@ if ( $cgiparams{'ACTION'} eq "downloadiso" )
 		open(DLFILE, "</var/tmp/backupiso/$cgiparams{'FILE'}") or die "Unable to open $cgiparams{'FILE'}: $!";
 		my @fileholder = <DLFILE>;
 		print "Content-Type:application/x-download\n";
+		my @fileinfo = stat("/var/tmp/backupiso/$cgiparams{'FILE'}");
+		print "Content-Length:$fileinfo[7]\n";
 		print "Content-Disposition:attachment;filename=$cgiparams{'FILE'}\n\n";
 		print @fileholder;
 		exit (0);
@@ -82,6 +88,8 @@ if ( $cgiparams{'ACTION'} eq "downloadaddon" )
 		open(DLFILE, "</var/ipfire/backup/addons/backup/$cgiparams{'FILE'}") or die "Unable to open $cgiparams{'FILE'}: $!";
 		my @fileholder = <DLFILE>;
 		print "Content-Type:application/x-download\n";
+		my @fileinfo = stat("/var/ipfire/backup/addons/backup/$cgiparams{'FILE'}");
+		print "Content-Length:$fileinfo[7]\n";
 		print "Content-Disposition:attachment;filename=$cgiparams{'FILE'}\n\n";
 		print @fileholder;
 		exit (0);
@@ -150,8 +158,13 @@ if ( $message ne "" ){
 	&Header::closebox();
 }
 
-my @backups = `cd /var/ipfire/backup/ && ls *.ipf 2>/dev/null`;
-my @backupisos = `cd /var/tmp/backupiso/ && ls *.iso 2>/dev/null`;
+if ( -e "/var/ipfire/backup/" ){
+	@backups = `cd /var/ipfire/backup/ && ls *.ipf 2>/dev/null`;
+}
+
+if ( -e "/var/tmp/backupiso/" ){
+	@backupisos = `cd /var/tmp/backupiso/ && ls *.iso 2>/dev/null`;
+}
 
 &Header::openbox('100%', 'center', $Lang::tr{'backup'});
 
@@ -186,6 +199,7 @@ print <<END
 END
 ;
 foreach (@backups){
+if ( $_ !~ /ipf$/){next;}
 chomp($_);
 my $Datei = "/var/ipfire/backup/".$_;
 my @Info = stat($Datei);
@@ -195,6 +209,7 @@ print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Siz
 print "<td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='delete' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' /></form></td></tr>";
 }
 foreach (@backupisos){
+if ( $_ !~ /iso$/){next;}
 chomp($_);
 my $Datei = "/var/tmp/backupiso/".$_;
 my @Info = stat($Datei);
@@ -252,7 +267,7 @@ print <<END
 	<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/$_.ipf' />
+		<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>
@@ -318,4 +333,4 @@ END
 ;
 &Header::closebox();
 &Header::closebigbox();
-&Header::closepage();
+&Header::closepage();
\ No newline at end of file