From 9da90df28b0ced461f40e26a80c48741490a4a3f Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Thu, 14 Sep 2017 22:35:25 +0200 Subject: [PATCH] task #0001372: Backup - nom du fichier Bug modele.inc.php --- include/backup.inc.php | 20 +++++++++++++++++--- include/modele.inc.php | 2 +- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/include/backup.inc.php b/include/backup.inc.php index 7af861181..05e3f323f 100644 --- a/include/backup.inc.php +++ b/include/backup.inc.php @@ -63,13 +63,21 @@ if ( isset ($_REQUEST['sa']) ) } else { die ('Aucune connection'); } - + $repo=new Database(0); + // compute file name with date if ( $_REQUEST['t'] == 'd' ) { + // get folder name + $name = $repo->get_value("select dos_name from ac_dossier where dos_id=$1", + array($dossier_number)); + $database=domaine."dossier".$dossier_number; + $filename= str_replace(array('/','\\' ,'<','>','"','[',']',':','*',' ','{','}','&'),'_', $name); + $filename= str_replace("__", "_", $filename); + $filename.="-".date('Ymd'); $args= " -Fc -Z9 --no-owner -h ".getenv("PGHOST")." -p ".getenv("PGPORT")." ".$database; header('Content-type: application/octet'); - header('Content-Disposition:attachment;filename="'.$database.'.bin"',FALSE); + header('Content-Disposition:attachment;filename="'.$filename.'.bin"',FALSE); passthru ($cmd.$args,$a); @@ -77,10 +85,16 @@ if ( isset ($_REQUEST['sa']) ) if ( $_REQUEST['t'] == 'm' ) { + // get template name + $name = $repo->get_value("select mod_name from modeledef where mod_id=$1", + array($dossier_number)); $database=domaine."mod".$dossier_number; + $filename= str_replace(array('/','\\' ,'<','>','"','[',']',':','*',' ','{','}','&'),'_', $name); + $filename= str_replace("__", "_", $filename); + $filename.="-".date('Ymd'); $args= " -Fc -Z9 --no-owner -h ".getenv("PGHOST")." -p ".getenv("PGPORT")." ".$database; header('Content-type: bin/x-application'); - header('Content-Disposition: attachment;filename="'.$database.'.bin"',FALSE); + header('Content-Disposition: attachment;filename="'.$filename.'.bin"',FALSE); $a=passthru ($cmd.$args); } } diff --git a/include/modele.inc.php b/include/modele.inc.php index 941d09734..78d2b71ae 100644 --- a/include/modele.inc.php +++ b/include/modele.inc.php @@ -53,7 +53,7 @@ if (isset($_POST['upd']) && $cn = new Database(); -$fmod_dbid=$http->post("FMOD_DBID"); +$fmod_dbid=$http->post("FMOD_DBID","number",0); // IF FMOD_NAME is posted then must add a template if (isset($_POST["FMOD_NAME"]))