From 2356abb5c4e3f3a49a1d36375ae6283ab9f372c3 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 28 Apr 2009 18:38:10 +0000 Subject: [PATCH] =?UTF-8?q?New:=20parametre=20de=20config=20des=20repertoi?= =?UTF-8?q?res=20dans=20les=20proprietes=20de=20la=20classe=20du=20module?= =?UTF-8?q?=20=20avec=20un=20r=E9pertoire=20parent=20en=20fonction=20de=20?= =?UTF-8?q?l'entit=E9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/core/conf.class.php | 5 +---- htdocs/document.php | 4 ++-- htdocs/expedition/fiche.php | 2 +- .../expedition/pdf/pdf_expedition_merou.modules.php | 8 ++++---- .../pdf/pdf_expedition_rouget.modules.php | 6 +++--- .../modules/livraison/pdf/pdf_sirocco.modules.php | 4 ++-- .../modules/livraison/pdf/pdf_typhon.modules.php | 4 ++-- htdocs/includes/modules/modExpedition.class.php | 13 ++++++++++++- htdocs/livraison/fiche.php | 2 +- 9 files changed, 28 insertions(+), 20 deletions(-) diff --git a/htdocs/core/conf.class.php b/htdocs/core/conf.class.php index fdf4b0a5b21..81d4b8db9ad 100644 --- a/htdocs/core/conf.class.php +++ b/htdocs/core/conf.class.php @@ -160,12 +160,9 @@ class Conf // Sous module bons d'expedition $this->expedition_bon->enabled=defined("MAIN_SUBMODULE_EXPEDITION")?MAIN_SUBMODULE_EXPEDITION:0; - $this->expedition_bon->dir_output=DOL_DATA_ROOT."/expedition/sending"; - $this->expedition_bon->dir_temp =DOL_DATA_ROOT."/expedition/sending/temp"; + // Sous module bons de livraison $this->livraison_bon->enabled=defined("MAIN_SUBMODULE_LIVRAISON")?MAIN_SUBMODULE_LIVRAISON:0; - $this->livraison_bon->dir_output=DOL_DATA_ROOT."/expedition/receipt"; - $this->livraison_bon->dir_temp =DOL_DATA_ROOT."/expedition/receipt/temp"; // Module societe if (defined('SOCIETE_OUTPUTDIR') && SOCIETE_OUTPUTDIR) { $this->societe->dir_output=SOCIETE_OUTPUTDIR; } # Pour passer outre le rep par defaut diff --git a/htdocs/document.php b/htdocs/document.php index 5ee21c2a57d..bfdecba170b 100644 --- a/htdocs/document.php +++ b/htdocs/document.php @@ -240,7 +240,7 @@ if ($modulepart) { $accessallowed=1; } - $original_file=$conf->expedition_bon->dir_output.'/'.$original_file; + $original_file=$conf->expedition->dir_bon_expedition.'/'.$original_file; //$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'"; } @@ -252,7 +252,7 @@ if ($modulepart) { $accessallowed=1; } - $original_file=$conf->livraison_bon->dir_output.'/'.$original_file; + $original_file=$conf->expedition->dir_bon_livraison.'/'.$original_file; //$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'"; } diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index c91f5ccc990..c98a158d18d 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -848,7 +848,7 @@ else if ($conf->expedition_bon->enabled) { $expeditionref = sanitizeFileName($expedition->ref); - $filedir = $conf->expedition_bon->dir_output . "/" .$expeditionref; + $filedir = $conf->expedition->dir_bon_expedition . "/" .$expeditionref; $urlsource = $_SERVER["PHP_SELF"]."?id=".$expedition->id; diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php index f0d435cbab1..21162e2a63d 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -96,7 +96,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition $this->expe = $obj; //Verification de la configuration - if ($conf->expedition_bon->dir_output) + if ($conf->expedition->dir_bon_expedition) { //Creation du Client $soc = new Societe($this->db); @@ -121,13 +121,13 @@ Class pdf_expedition_merou extends ModelePdfExpedition // Definition de $dir et $file if ($this->expe->specimen) { - $dir = $conf->expedition_bon->dir_output; + $dir = $conf->expedition->dir_bon_expedition; $file = $dir . "/SPECIMEN.pdf"; } else { $expref = sanitizeFileName($this->expe->ref); - $dir = $conf->expedition_bon->dir_output . "/" . $expref; + $dir = $conf->expedition->dir_bon_expedition . "/" . $expref; $file = $dir . "/" . $expref . ".pdf"; } @@ -151,7 +151,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition { $pdfrights = array('print'); // Ne permet que l'impression du document $pdfuserpass = ''; // Mot de passe pour l'utilisateur final - $pdfownerpass = NULL; // Mot de passe du propri�taire, cr�� al�atoirement si pas d�fini + $pdfownerpass = NULL; // Mot de passe du proprietaire, cree aleatoirement si pas defini $pdf->SetProtection($pdfrights,$pdfuserpass,$pdfownerpass); } diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php index b7ab0739d2a..8ab9288b8e0 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php @@ -140,20 +140,20 @@ Class pdf_expedition_rouget extends ModelePdfExpedition $outputlangs->setPhpLang(); - if ($conf->expedition_bon->dir_output) + if ($conf->expedition->dir_bon_expedition) { $this->expe = $obj; // D�finition de $dir et $file if ($this->expe->specimen) { - $dir = $conf->expedition_bon->dir_output; + $dir = $conf->expedition->dir_bon_expedition; $file = $dir . "/SPECIMEN.pdf"; } else { $expref = sanitizeFileName($this->expe->ref); - $dir = $conf->expedition_bon->dir_output . "/" . $expref; + $dir = $conf->expedition->dir_bon_expedition . "/" . $expref; $file = $dir . "/" . $expref . ".pdf"; } diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php index 1add4b3946f..4f40d1c7efd 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php @@ -106,7 +106,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder $outputlangs->setPhpLang(); - if ($conf->livraison_bon->dir_output) + if ($conf->expedition->dir_bon_livraison) { // If $delivery is id instead of object if (! is_object($delivery)) @@ -124,7 +124,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder $nblignes = sizeof($delivery->lignes); $deliveryref = sanitizeFileName($delivery->ref); - $dir = $conf->livraison_bon->dir_output; + $dir = $conf->expedition->dir_bon_livraison; if (! eregi('specimen',$deliveryref)) $dir.= "/" . $deliveryref; $file = $dir . "/" . $deliveryref . ".pdf"; diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php index 0001133f44e..1cf3a4ca318 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php @@ -127,7 +127,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $outputlangs->setPhpLang(); - if ($conf->livraison_bon->dir_output) + if ($conf->expedition->dir_bon_livraison) { // If $delivery is id instead of object if (! is_object($delivery)) @@ -145,7 +145,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $nblignes = sizeof($delivery->lignes); $deliveryref = sanitizeFileName($delivery->ref); - $dir = $conf->livraison_bon->dir_output; + $dir = $conf->expedition->dir_bon_livraison; if (! eregi('specimen',$deliveryref)) $dir.= "/" . $deliveryref; $file = $dir . "/" . $deliveryref . ".pdf"; diff --git a/htdocs/includes/modules/modExpedition.class.php b/htdocs/includes/modules/modExpedition.class.php index 6ea83321494..4363efa78f1 100644 --- a/htdocs/includes/modules/modExpedition.class.php +++ b/htdocs/includes/modules/modExpedition.class.php @@ -64,10 +64,21 @@ class modExpedition extends DolibarrModules $this->dirs[$r][0] = "output"; $this->dirs[$r][1] = "/expedition"; - $r++; $this->dirs[$r][0] = "temp"; $this->dirs[$r][1] = "/expedition/temp"; + $r++ + $this->dirs[$r][0] = "bon_expedition"; + $this->dirs[$r][1] = "/expedition/sending"; + $r++; + $this->dirs[$r][0] = "bon_expedition_temp"; + $this->dirs[$r][1] = "/expedition/sending/temp"; + $r++ + $this->dirs[$r][0] = "bon_livraison"; + $this->dirs[$r][1] = "/expedition/receipt"; + $r++; + $this->dirs[$r][0] = "bon_livraison_temp"; + $this->dirs[$r][1] = "/expedition/receipt/temp"; // Config pages $this->config_page_url = array("confexped.php"); diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php index 7430f1a7a22..f976e052868 100644 --- a/htdocs/livraison/fiche.php +++ b/htdocs/livraison/fiche.php @@ -582,7 +582,7 @@ else */ $livraisonref = sanitizeFileName($livraison->ref); - $filedir = $conf->livraison_bon->dir_output . '/' . $livraisonref; + $filedir = $conf->expedition->dir_bon_livraison . '/' . $livraisonref; $urlsource = $_SERVER["PHP_SELF"]."?id=".$livraison->id; $genallowed=$user->rights->expedition->livraison->creer;