X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fbackup.cgi;h=86e21cf34ea1601a74ff55684385763139a325bd;hb=b0d9fad3f94fb73b1686c5e6a948066497638d26;hp=d160349ff1d2e36f4302c02b02238b6dfe63ca73;hpb=b0324a5142a5cb047107ca54a1edead6e1b4d43b;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi
index d160349ff..86e21cf34 100644
--- 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-2013  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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,10 +158,15 @@ 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'});
+&Header::openbox('100%', 'center', );
 
 print <<END
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
@@ -163,7 +176,13 @@ print <<END
 	<td align='left'>
 		<input type='radio' name='BACKUPLOGS' value='include'/> $Lang::tr{'include logfiles'}<br/>
 		<input type='radio' name='BACKUPLOGS' value='exclude' checked='checked'/> $Lang::tr{'exclude logfiles'}<br/>
-		<input type='radio' name='BACKUPLOGS' value='iso' /> $Lang::tr{'generate iso'}
+END
+;
+my $MACHINE=`uname -m`;
+if ( ! ( $MACHINE =~ "arm" )) {
+	print"		<input type='radio' name='BACKUPLOGS' value='iso' /> $Lang::tr{'generate iso'}<br/>"
+}
+print <<END
 	</td>
 </tr>
 <tr><td align='center' colspan='2'>
@@ -186,6 +205,7 @@ print <<END
 END
 ;
 foreach (@backups){
+if ( $_ !~ /ipf$/){next;}
 chomp($_);
 my $Datei = "/var/ipfire/backup/".$_;
 my @Info = stat($Datei);
@@ -195,6 +215,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);
@@ -212,7 +233,7 @@ END
 ############################################################################################################################
 ############################################# Backups von Addons erstellen #################################################
 
-&Header::openbox('100%', 'center', 'addons');
+&Header::openbox('100%', 'center', $Lang::tr{'addons'});
 
 my @addonincluds = `ls /var/ipfire/backup/addons/includes/ 2>/dev/null`;
 my @addons = `ls /var/ipfire/backup/addons/backup/ 2>/dev/null`;
@@ -252,7 +273,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>