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 ce16e7f42fcc1d5fd4a3341b95414a8382f87014..ce89116356408ce0aa5e596d479c8d848f0cb327 100644 (file)
--- 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 e3e295706abdb3c2b43fae606d6df2f51e5cf9d7..9d0d14b644a2fa2f79272a4e5e9f450753534f10 100644 (file)
--- 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 2a036279d58e5316db2f647977890dac0c586779..cac4146ab94e59e5ab93e3c06ce763b5045435c7 100644 (file)
--- 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>