X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fbackup.cgi;h=86e21cf34ea1601a74ff55684385763139a325bd;hb=a4d24f90525ff980c36decfda4755777f3974004;hp=bc7f498b14a147ae40b62c041add347afde3513f;hpb=33e1f48cfbb2a62fabf089b0e1e0e9480e86f2b8;p=ipfire-2.x.git diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi index bc7f498b14..86e21cf34e 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 # # # # 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 # @@ -21,8 +21,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; use File::Copy; require '/var/ipfire/general-functions.pl'; @@ -35,6 +35,8 @@ my %cgiparams=(); my %checked = (); my $message = ""; my $errormessage = ""; +my @backups = ""; +my @backupisos = ""; $a = new CGI; @@ -51,17 +53,32 @@ $cgiparams{'BACKUPLOGS'} = ''; ############################################################################################################################ ################################################ Workaround for Directories ################################################ -system("/usr/local/bin/backupctrl makedirs >/dev/null 2>&1 ") unless ( -e '/var/ipfire/backup/addons'); +system("/usr/local/bin/backupctrl makedirs >/dev/null 2>&1 ") unless ( -e '/var/ipfire/backup/addons/backup') ; ############################################################################################################################ ############################################## System calls ohne Http Header ############################################### +# Replace slashes from filename +$cgiparams{'FILE'} =~ s/\///; if ( $cgiparams{'ACTION'} eq "download" ) { open(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); +} +if ( $cgiparams{'ACTION'} eq "downloadiso" ) +{ + open(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); @@ -71,6 +88,8 @@ if ( $cgiparams{'ACTION'} eq "downloadaddon" ) open(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); @@ -113,8 +132,13 @@ sub refreshpage{&Header::openbox( 'Waiting', 1, "/dev/null 2>&1");} - else {system("/usr/local/bin/backupctrl exclude >/dev/null 2>&1");} + if ( $cgiparams{'BACKUPLOGS'} eq "include" ) { + system("/usr/local/bin/backupctrl include >/dev/null 2>&1"); + } elsif ( $cgiparams{'BACKUPLOGS'} eq "exclude" ) { + system("/usr/local/bin/backupctrl exclude >/dev/null 2>&1"); + } elsif ( $cgiparams{'BACKUPLOGS'} eq "iso" ) { + system("/usr/local/bin/backupctrl iso >/dev/null 2>&1"); + } } if ( $cgiparams{'ACTION'} eq "addonbackup" ) { @@ -134,17 +158,33 @@ if ( $message ne "" ){ &Header::closebox(); } -my @backups = `cd /var/ipfire/backup/ && ls *.ipf 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 < - + + + "; +my $Size = $Info[7] / 1024 / 1024; +$Size = sprintf("%0.2f", $Size); +print ""; +print ""; +} +foreach (@backupisos){ +if ( $_ !~ /iso$/){next;} +chomp($_); +my $Datei = "/var/tmp/backupiso/".$_; +my @Info = stat($Datei); +my $Size = $Info[7] / 1024 / 1024; +$Size = sprintf("%0.2f", $Size); +print ""; print ""; } print </dev/null`; my @addons = `ls /var/ipfire/backup/addons/backup/ 2>/dev/null`; @@ -200,9 +251,17 @@ delete $addons{$_}; my $Datei = "/var/ipfire/backup/addons/backup/".$_.".ipf"; my @Info = stat($Datei); my $Size = $Info[7] / 1024; -$Size = sprintf("%2d", $Size); + if ( -e $Datei ){ -print ""; + if ($Size < 1) { + $Size = sprintf("%.2f", $Size); + print ""; + } else { + $Size = sprintf("%2d", $Size); + print ""; + + } + print <
@@ -214,7 +273,7 @@ print < - + @@ -253,7 +312,7 @@ print <
- +
$Lang::tr{'logs'}$Lang::tr{'include logfiles'} - / - $Lang::tr{'exclude logfiles'} -
$Lang::tr{'logs'} + $Lang::tr{'include logfiles'}
+ $Lang::tr{'exclude logfiles'}
+END +; +my $MACHINE=`uname -m`; +if ( ! ( $MACHINE =~ "arm" )) { + print" $Lang::tr{'generate iso'}
" +} +print < +
@@ -165,12 +205,23 @@ print <$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size KB
$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size MB
$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size MB
$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size KB $Lang::tr{'date'} ".localtime($Info[9])."
$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size KB $Lang::tr{'date'} ".localtime($Info[9])."
$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size KB $Lang::tr{'date'} ".localtime($Info[9])."