From 9a49264cb5398836742892aa1de9d3dbc2aab1c7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 7 Mar 2011 00:16:02 +0000
Subject: [PATCH] Fix: Generated doc in wrong dir
---
htdocs/document.php | 4 ++--
htdocs/fourn/facture/document.php | 9 ++++++---
htdocs/fourn/facture/fiche.php | 4 ++--
.../modules/supplier_invoice/pdf/pdf_canelle.modules.php | 4 ++--
.../modules/supplier_order/pdf/pdf_muscadet.modules.php | 4 ++--
5 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/htdocs/document.php b/htdocs/document.php
index 44f5776bd71..2dcc58e4e71 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -208,7 +208,7 @@ if ($modulepart)
{
$accessallowed=1;
}
- $original_file=$conf->fournisseur->dir_output.'/commande/'.$original_file;
+ $original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE ref='".$refname."' AND entity=".$conf->entity;
}
@@ -219,7 +219,7 @@ if ($modulepart)
{
$accessallowed=1;
}
- $original_file=$conf->fournisseur->dir_output.'/facture/'.$original_file;
+ $original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn WHERE facnumber='".$refname."' AND entity=".$conf->entity;
}
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 4e7c0a86161..7fafe0bd48f 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -69,7 +69,8 @@ if ($_POST['sendit'] && ! empty($conf->global->MAIN_UPLOAD_DOC))
$facture = new FactureFournisseur($db);
if ($facture->fetch($facid))
{
- $upload_dir = $conf->fournisseur->dir_output.'/facture/'.get_exdir($facture->id,2).$facture->id;
+ $ref=dol_sanitizeFileName($facture->ref);
+ $upload_dir = $conf->fournisseur->facture->dir_output.'/'.$ref;
if (create_exdir($upload_dir) >= 0)
{
@@ -106,7 +107,8 @@ if ($action=='delete')
$facture = new FactureFournisseur($db);
if ($facture->fetch($facid))
{
- $upload_dir = $conf->fournisseur->dir_output.'/facture/'.get_exdir($facture->id,2).$facture->id;
+ $ref=dol_sanitizeFileName($facture->ref);
+ $upload_dir = $conf->fournisseur->facture->dir_output.'/'.$ref;
$file = $upload_dir . '/' . $_GET['urlfile']; // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
dol_delete_file($file);
@@ -130,7 +132,8 @@ if ($facid > 0)
{
$facture->fetch_thirdparty();
- $upload_dir = $conf->fournisseur->dir_output.'/facture/'.get_exdir($facture->id,2).$facture->id;
+ $ref=dol_sanitizeFileName($facture->ref);
+ $upload_dir = $conf->fournisseur->facture->dir_output.'/'.$ref;
$head = facturefourn_prepare_head($facture);
dol_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'), 0, 'bill');
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 69a92b7798c..663d3f8e58c 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -1828,8 +1828,8 @@ else
*/
$ref=dol_sanitizeFileName($fac->ref);
- $subdir = get_exdir($fac->id,2).$ref;
- $filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($fac->id,2).$ref;
+ $subdir = $ref;
+ $filedir = $conf->fournisseur->facture->dir_output.'/'.$ref;
$urlsource=$_SERVER['PHP_SELF'].'?facid='.$fac->id;
$genallowed=$user->rights->fournisseur->facture->creer;
$delallowed=$user->rights->fournisseur->facture->supprimer;
diff --git a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
index 1bbd6612ca7..80ed0647529 100755
--- a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -127,13 +127,13 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
// Definition de $dir et $file
if ($object->specimen)
{
- $dir = $conf->fournisseur->dir_output.'/facture';
+ $dir = $conf->fournisseur->facture->dir_output;
$file = $dir . "/SPECIMEN.pdf";
}
else
{
$objectref = dol_sanitizeFileName($object->ref);
- $dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2).$objectref;
+ $dir = $conf->fournisseur->facture->dir_output.'/'.$objectref;
$file = $dir . "/" . $objectref . ".pdf";
}
diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
index 656fd13be43..55b121078b5 100644
--- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -129,13 +129,13 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
// Definition de $dir et $file
if ($object->specimen)
{
- $dir = $conf->fournisseur->dir_output.'/commande';
+ $dir = $conf->fournisseur->commande->dir_output;
$file = $dir . "/SPECIMEN.pdf";
}
else
{
$objectref = dol_sanitizeFileName($object->ref);
- $dir = $conf->fournisseur->dir_output . "/commande/" . $objectref;
+ $dir = $conf->fournisseur->commande->dir_output . '/'. $objectref;
$file = $dir . "/" . $objectref . ".pdf";
}
--
GitLab