From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 20 Sep 2018 13:21:41 +0000 (+0100)
Subject: backup: Fix deleting backup files
X-Git-Tag: v2.21-core124~13
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=a6c190818a15342db5d91f4219587aa08f692173

backup: Fix deleting backup files

Signed-off-by: Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index ce16e7f42f..ce89116356 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -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"
diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files
index e3e295706a..9d0d14b644 100644
--- a/config/rootfiles/core/124/filelists/files
+++ b/config/rootfiles/core/124/filelists/files
@@ -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
diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi
index 2a036279d5..cac4146ab9 100644
--- a/html/cgi-bin/backup.cgi
+++ b/html/cgi-bin/backup.cgi
@@ -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>