Weiter am Backup gebastelt

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@979 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 645a4f82b00369f69e1affaf6096bf2d577c1682..86b9eb5bd4a0717ac23f9553c94b280c189f7b68 100644 (file)
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -61,7 +61,7 @@ elsif ($ARGV[0] eq 'restore') {
   system("cd / && tar -xvz --preserve -f /tmp/restore.ipf");
 }
 elsif ($ARGV[0] eq 'restoreaddon') {
-  system("mv /tmp/$ARGV[1] /var/ipfire/backup/addons/backup/$ARGV[1]");
+  if ( -e "/tmp/$ARGV[1]" ){system("mv /tmp/$ARGV[1] /var/ipfire/backup/addons/backup/$ARGV[1]");}
   system("cd / && tar -xvz --preserve -f /var/ipfire/backup/addons/backup/$ARGV[1]");
 }
 elsif ($ARGV[0] eq 'cli') {

diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi
index f6bf6cc07385be7dd409909ec7379639fb1ce229..3c59ef62233cde17ee3ab305b05b08541c44440a 100644 (file)
--- a/html/cgi-bin/backup.cgi
+++ b/html/cgi-bin/backup.cgi
@@ -177,10 +177,12 @@ END
 &Header::openbox('100%', 'center', 'addons');
 
 my @addonincluds = `ls /var/ipfire/backup/addons/includes/ 2>/dev/null`;
+my %addons = `ls /var/ipfire/backup/addons/backup/ 2>/dev/null`;
 
 print "<table width='95%' cellspacing='0'>";
 foreach (@addonincluds){
 chomp($_);
+delete($addons{$_."\.ipf\n"});
 my $Datei = "/var/ipfire/backup/addons/backup/".$_.".ipf";
 my @Info = stat($Datei);
 my $Size = $Info[7] / 1024;
@@ -206,7 +208,7 @@ END
 ;
 }
 else{
-  print "<tr><td align='center'>$Lang::tr{'backup from'} $_ </td><td colspan='2' width='10'></td>";
+  print "<tr><td align='center'>$Lang::tr{'backup from'} $_ </td><td width='5' align='right'></td><td width='5' align='right'></td>";
 }
 print <<END
        <td align='right' width='5'>
@@ -219,6 +221,34 @@ print <<END
 END
 ;
 }
+foreach (keys(%addons)){
+chomp($_);
+my $Datei = "/var/ipfire/backup/addons/backup/".$_;
+my @Info = stat($Datei);
+my $Size = $Info[7] / 1024;
+$Size = sprintf("%2d", $Size);
+my $addon=substr($_,0,length($_)-4);
+print "<tr><td align='center'>$Lang::tr{'backup from'} $addon $Lang::tr{'size'} $Size KB $Lang::tr{'date'} ".localtime($Info[9])."</td>";
+print <<END
+       <td align='right' width='5'>
+               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+               <input type='hidden' name='ACTION' value='downloadaddon' />
+               <input type='hidden' name='FILE' value='$_' />
+               <input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/package-x-generic.png' />
+               </form>
+       </td>
+       <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/$_' />
+               <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' />
+               </form>
+       </td>
+       <td align='right' width='5'></td></tr>
+END
+;
+}
+
 print "</table>";
 &Header::closebox();
 

diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh
index 0ec8d8f8083dda6c973ad1fe4c18c260cced9f6c..28ede3ce2a55483259d4893b6e60b23dc3ca6e90 100644 (file)
--- a/src/pakfire/lib/functions.sh
+++ b/src/pakfire/lib/functions.sh
@@ -36,16 +36,16 @@ remove_files() {
        echo "...Finished."
 }
 
-make_backup(){
-       if [ -e "/var/ipfire/backup/addons/include/${1}" ];then
+make_backup() {
+       if [ -e "/var/ipfire/backup/addons/includes/${1}" ];then
        echo "Creating Backup..."
        /usr/local/bin/backupctrl addonbackup ${1}
        echo "...Finished."
        fi
 }
 
-restore_backup(){
-       if [ -e "/var/ipfire/backup/addons/backup/${1}" ];then
+restore_backup() {
+       if [ -e "/var/ipfire/backup/addons/backup/${1}.ipf" ];then
        echo "Restoring Backup..."
        /usr/local/bin/backupctrl restoreaddon ${1}.ipf
        echo "...Finished."