From 48d0fd00e97fd9c86b5ae81154651ba8ee86c6c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 10 Feb 2012 11:09:34 +0100
Subject: [PATCH] Fix: Can delete and downlaod backup files

---
 htdocs/admin/tools/dolibarr_export.php | 21 ++++++++++++---------
 htdocs/admin/tools/export.php          | 15 +++++++--------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 32b44a7e360..cdda93f4e0f 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -28,15 +28,14 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 
 $langs->load("admin");
 
+$action=GETPOST('action');
+
 $sortfield = GETPOST("sortfield");
 $sortorder = GETPOST("sortorder");
 $page = GETPOST("page");
-
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="p.name";
-if ($page < 0) {
-    $page = 0;
-}
+if (! $sortorder) $sortorder="DESC";
+if (! $sortfield) $sortfield="date";
+if ($page < 0) { $page = 0; }
 $limit = $conf->liste_limit;
 $offset = $limit * $page;
 
@@ -48,8 +47,11 @@ if (! $user->admin) accessforbidden();
  * Actions
  */
 
-// None
-
+if ($action == 'delete')
+{
+    dol_delete_file($conf->admin->dir_output.'/backup/'.GETPOST('urlfile'),1);
+    $action='';
+}
 
 
 /*
@@ -384,7 +386,8 @@ print "\n";
 <?php
 
 $filearray=dol_dir_list($conf->admin->dir_output.'/backup','files',0,'','',$sortfield,(strtolower($sortorder)=='asc'?SORT_ASC:SORT_DESC),1);
-$result=$formfile->list_of_documents($filearray,null,'systemtools','',1,'',1,0,'',0,$langs->trans("PreviousDumpFiles"));
+$result=$formfile->list_of_documents($filearray,null,'systemtools','',1,'backup/',1,0,$langs->trans("NoBackupFileAvailable"),0,$langs->trans("PreviousDumpFiles"));
+print '<br>';
 
 
 llxFooter();
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index ddd275d31fa..3de0cfdc223 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -28,6 +28,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 
 $langs->load("admin");
 
+$action=GETPOST('action');
 $what=GETPOST("what");
 $export_type=GETPOST("export_type");
 $file=GETPOST('filename_template');
@@ -55,7 +56,11 @@ if ($file && ! $what)
  * Actions
  */
 
-// None
+if ($action == 'delete')
+{
+    dol_delete_file($conf->admin->dir_output.'/backup/'.GETPOST('urlfile'),1);
+    $action='';
+}
 
 
 /*
@@ -347,13 +352,7 @@ if ($what)
 }
 
 $filearray=dol_dir_list($conf->admin->dir_output.'/backup','files',0,'','',$sortfield,(strtolower($sortorder)=='asc'?SORT_ASC:SORT_DESC),1);
-$result=$formfile->list_of_documents($filearray,null,'systemtools','',1,'',1,0,'',0,$langs->trans("PreviousDumpFiles"));
-
-if ($result == 0)
-{
-    print $langs->trans("NoBackupFileAvailable").'<br>';
-    print $langs->trans("ToBuildBackupFileClickHere",DOL_URL_ROOT.'/admin/tools/dolibarr_export.php').'<br>';
-}
+$result=$formfile->list_of_documents($filearray,null,'systemtools','',1,'backup/',1,0,($langs->trans("NoBackupFileAvailable").'<br>'.$langs->trans("ToBuildBackupFileClickHere",DOL_URL_ROOT.'/admin/tools/dolibarr_export.php')),0,$langs->trans("PreviousDumpFiles"));
 
 print '<br>';