webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

backup: Fix deleting backup files

Browse Source 
Signed-off-by: Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2018-09-20 14:21:41 +01:00
parent 06131f41e4
commit a6c190818a
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config/backup/backup.pl
View File

@@ -138,11 +138,8 @@ elsif ($ARGV[0] eq 'cli') {
elsif ($ARGV[0] eq 'addonbackup') {
system("tar -cvzf /var/ipfire/backup/addons/backup/$ARGV[1].ipf --files-from='/var/ipfire/backup/addons/includes/$ARGV[1]'");
}
elsif ($ARGV[0] =~ /ipf$/ ) {
system("rm /var/ipfire/backup/$ARGV[0]");
}
elsif ($ARGV[0] =~ /iso$/ ) {
system("rm /var/tmp/backupiso/$ARGV[0]");
elsif ($ARGV[0] =~ /\.(iso|ipf)$/ ) {
unlink("$ARGV[0]");
}
elsif ($ARGV[0] eq '') {
printf "No argument given, please use <include><exclude><cli>\n"

1
config/rootfiles/core/124/filelists/files
View File

@@ -21,6 +21,7 @@ srv/web/ipfire/html/redirect-templates/legacy/template.html
usr/bin/install-bootloader
usr/local/bin/backupiso
usr/local/bin/rebuild-initrd
var/ipfire/backup/bin/backup.pl
var/ipfire/backup/exclude
var/ipfire/backup/include
var/ipfire/langs

6
html/cgi-bin/backup.cgi
View File

@@ -137,8 +137,6 @@ elsif ( $cgiparams{'ACTION'} eq "delete" )
my $file = &sanitise_file($cgiparams{'FILE'});
exit(1) unless defined($file);
$file = &File::Basename::basename($file);
system("/usr/local/bin/backupctrl $file >/dev/null 2>&1");
}
@@ -266,7 +264,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='$_.ipf' />
<input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' />
</form>
</td>
@@ -305,7 +303,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='$_.ipf' />
<input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' />
</form>
</td>