From d63c1acb9856b6e76c586546cc8ed70aa4959473 Mon Sep 17 00:00:00 2001 From: opensides Date: Sun, 24 Oct 2004 11:15:21 +0000 Subject: [PATCH] =?UTF-8?q?=E7a=20remplace=20le=20'/'=20par=20un=20'=5F'?= =?UTF-8?q?=20dans=20le=20nom=20de=20fichier.=20Comme=20dolibarr=20fonctio?= =?UTF-8?q?nne=20aussi=20sous=20windows,=20j'ai=20fait=20de=20m=EAme=20pou?= =?UTF-8?q?r=20tous=20les=20caract=E8res=20interdits=20par=20windows=20dan?= =?UTF-8?q?s=20les=20noms=20de=20fichiers.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/compta/facture.php | 10 +++++++--- htdocs/compta/facture/apercu.php | 6 ++++-- htdocs/compta/facture/facture-rec.class.php | 5 ++++- htdocs/facture.class.php | 8 ++++++-- htdocs/includes/modules/facture/pdf_adytek.modules.php | 6 ++++-- .../includes/modules/facture/pdf_bernique.modules.php | 6 ++++-- .../includes/modules/facture/pdf_bigorneau.modules.php | 6 ++++-- htdocs/includes/modules/facture/pdf_bulot.modules.php | 6 ++++-- htdocs/includes/modules/facture/pdf_crabe.modules.php | 6 ++++-- .../includes/modules/facture/pdf_tourteau.modules.php | 6 ++++-- mysql/data/data.sql | 2 +- mysql/tables/llx_actioncomm.sql | 2 +- 12 files changed, 47 insertions(+), 22 deletions(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index b66ec820814..3c45f8ce162 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -324,7 +324,9 @@ if ($_POST["action"] == 'send' || $_POST["action"] == 'relance') $fac = new Facture($db,"",$_POST["facid"]); if ( $fac->fetch($_POST["facid"]) ) { - $file = FAC_OUTPUTDIR . "/" . $fac->ref . "/" . $fac->ref . ".pdf"; + $forbidden_chars=array("/","\\",":","*","?","\"","<",">","|","[","]",",",";","="); + $facref = str_replace($forbidden_chars,"_",$fac->ref); + $file = FAC_OUTPUTDIR . "/" . $facref . "/" . $facref . ".pdf"; if (is_readable($file)) { @@ -1168,8 +1170,10 @@ else * Documents générés * */ - $file = FAC_OUTPUTDIR . "/" . $fac->ref . "/" . $fac->ref . ".pdf"; - $filedetail = FAC_OUTPUTDIR . "/" . $fac->ref . "/" . $fac->ref . "-detail.pdf"; + $forbidden_chars=array("/","\\",":","*","?","\"","<",">","|","[","]",",",";","="); + $facref = str_replace($forbidden_chars,"_",$fac->ref); + $file = FAC_OUTPUTDIR . "/" . $facref . "/" . $facref . ".pdf"; + $filedetail = FAC_OUTPUTDIR . "/" . $facref . "/" . $facref . "-detail.pdf"; print "
"; diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index 0f8421876e8..ba5bdd8aab5 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -130,8 +130,10 @@ if ($_GET["facid"] > 0) * * */ - $file = FAC_OUTPUTDIR . "/" . $fac->ref . "/" . $fac->ref . ".pdf"; - $filedetail = FAC_OUTPUTDIR . "/" . $fac->ref . "/" . $fac->ref . "-detail.pdf"; + $forbidden_chars=array("/","\\",":","*","?","\"","<",">","|","[","]",",",";","="); + $facref = str_replace($forbidden_chars,"_",$fac->ref); + $file = FAC_OUTPUTDIR . "/" . $facref . "/" . $facref . ".pdf"; + $filedetail = FAC_OUTPUTDIR . "/" . $facref . "/" . $facref . "-detail.pdf"; if (file_exists($file)) { diff --git a/htdocs/compta/facture/facture-rec.class.php b/htdocs/compta/facture/facture-rec.class.php index e0bc25fc1fa..2541dd6c7bf 100644 --- a/htdocs/compta/facture/facture-rec.class.php +++ b/htdocs/compta/facture/facture-rec.class.php @@ -312,7 +312,10 @@ class FactureRec * Notify * */ - $filepdf = FAC_OUTPUTDIR . "/" . $this->ref . "/" . $this->ref . ".pdf"; + $forbidden_chars=array("/","\\",":","*","?","\"","<",">","|","[","]",",",";","="); + $facref = str_replace($forbidden_chars,"_",$this->ref); + $filepdf = FAC_OUTPUTDIR . "/" . $facref . "/" . $facref . ".pdf"; + $mesg = "La facture ".$this->ref." a été validée.\n"; diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php index d2ed1f98913..336592bc794 100644 --- a/htdocs/facture.class.php +++ b/htdocs/facture.class.php @@ -521,7 +521,9 @@ class Facture * Notify * */ - $filepdf = FAC_OUTPUTDIR . "/" . $this->ref . "/" . $this->ref . ".pdf"; + $forbidden_chars=array("/","\\",":","*","?","\"","<",">","|","[","]",",",";","="); + $facref = str_replace($forbidden_chars,"_",$this->ref); + $filepdf = FAC_OUTPUTDIR . "/" . $facref . "/" . $facref . ".pdf"; $mesg = "La facture ".$this->ref." a été validée.\n"; @@ -866,7 +868,9 @@ class Facture { $soc = new Societe($this->db, $this->socidp); - $file = FAC_OUTPUTDIR . "/" . $this->ref . "/" . $this->ref . ".pdf"; + $forbidden_chars=array("/","\\",":","*","?","\"","<",">","|","[","]",",",";","="); + $facref = str_replace($forbidden_chars,"_",$this->ref); + $file = FAC_OUTPUTDIR . "/" . $facref . "/" . $facref . ".pdf"; if (file_exists($file)) { diff --git a/htdocs/includes/modules/facture/pdf_adytek.modules.php b/htdocs/includes/modules/facture/pdf_adytek.modules.php index 9b2c68b741d..4b075d65f2d 100644 --- a/htdocs/includes/modules/facture/pdf_adytek.modules.php +++ b/htdocs/includes/modules/facture/pdf_adytek.modules.php @@ -51,8 +51,10 @@ class pdf_adytek extends ModelePDFFactures { if (defined("FAC_OUTPUTDIR")) { - $dir = FAC_OUTPUTDIR . "/" . $fac->ref . "/" ; - $file = $dir . $fac->ref . ".pdf"; + $forbidden_chars=array("/","\\",":","*","?","\"","<",">","|","[","]",",",";","="); + $facref = str_replace($forbidden_chars,"_",$fac->ref); + $dir = FAC_OUTPUTDIR . "/" . $facref . "/" ; + $file = $dir . $facref . ".pdf"; if (! file_exists($dir)) { diff --git a/htdocs/includes/modules/facture/pdf_bernique.modules.php b/htdocs/includes/modules/facture/pdf_bernique.modules.php index 5638b999be1..574f99b3948 100644 --- a/htdocs/includes/modules/facture/pdf_bernique.modules.php +++ b/htdocs/includes/modules/facture/pdf_bernique.modules.php @@ -51,8 +51,10 @@ class pdf_bernique extends ModelePDFFactures { if (defined("FAC_OUTPUTDIR")) { - $dir = FAC_OUTPUTDIR . "/" . $fac->ref . "/" ; - $file = $dir . $fac->ref . ".pdf"; + $forbidden_chars=array("/","\\",":","*","?","\"","<",">","|","[","]",",",";","="); + $facref = str_replace($forbidden_chars,"_",$fac->ref); + $dir = FAC_OUTPUTDIR . "/" . $facref . "/" ; + $file = $dir . $facref . ".pdf"; if (! file_exists($dir)) { diff --git a/htdocs/includes/modules/facture/pdf_bigorneau.modules.php b/htdocs/includes/modules/facture/pdf_bigorneau.modules.php index 1ecf7f4ac55..540342c40b4 100644 --- a/htdocs/includes/modules/facture/pdf_bigorneau.modules.php +++ b/htdocs/includes/modules/facture/pdf_bigorneau.modules.php @@ -51,8 +51,10 @@ class pdf_bigorneau extends ModelePDFFactures { if (defined("FAC_OUTPUTDIR")) { - $dir = FAC_OUTPUTDIR . "/" . $fac->ref . "/" ; - $file = $dir . $fac->ref . ".pdf"; + $forbidden_chars=array("/","\\",":","*","?","\"","<",">","|","[","]",",",";","="); + $facref = str_replace($forbidden_chars,"_",$fac->ref); + $dir = FAC_OUTPUTDIR . "/" . $facref . "/" ; + $file = $dir . $facref . ".pdf"; if (! file_exists($dir)) { diff --git a/htdocs/includes/modules/facture/pdf_bulot.modules.php b/htdocs/includes/modules/facture/pdf_bulot.modules.php index a48a1f5dbbf..57fb3c3cd8c 100644 --- a/htdocs/includes/modules/facture/pdf_bulot.modules.php +++ b/htdocs/includes/modules/facture/pdf_bulot.modules.php @@ -52,8 +52,10 @@ class pdf_bulot extends ModelePDFFactures { if (defined("FAC_OUTPUTDIR")) { - $dir = FAC_OUTPUTDIR . "/" . $fac->ref . "/" ; - $file = $dir . $fac->ref . ".pdf"; + $forbidden_chars=array("/","\\",":","*","?","\"","<",">","|","[","]",",",";","="); + $facref = str_replace($forbidden_chars,"_",$fac->ref); + $dir = FAC_OUTPUTDIR . "/" . $facref . "/" ; + $file = $dir . $facref . ".pdf"; if (! file_exists($dir)) { diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index f6e223ea819..37e5376a159 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -86,8 +86,10 @@ class pdf_crabe extends ModelePDFFactures if (defined("FAC_OUTPUTDIR")) { - $dir = FAC_OUTPUTDIR . "/" . $fac->ref . "/" ; - $file = $dir . $fac->ref . ".pdf"; + $forbidden_chars=array("/","\\",":","*","?","\"","<",">","|","[","]",",",";","="); + $facref = str_replace($forbidden_chars,"_",$fac->ref); + $dir = FAC_OUTPUTDIR . "/" . $facref . "/" ; + $file = $dir . $facref . ".pdf"; if (! file_exists($dir)) { diff --git a/htdocs/includes/modules/facture/pdf_tourteau.modules.php b/htdocs/includes/modules/facture/pdf_tourteau.modules.php index 8e76462d059..eaa5910e721 100644 --- a/htdocs/includes/modules/facture/pdf_tourteau.modules.php +++ b/htdocs/includes/modules/facture/pdf_tourteau.modules.php @@ -51,8 +51,10 @@ class pdf_tourteau extends ModelePDFFactures { if (defined("FAC_OUTPUTDIR")) { - $dir = FAC_OUTPUTDIR . "/" . $fac->ref . "/" ; - $file = $dir . $fac->ref . ".pdf"; + $forbidden_chars=array("/","\\",":","*","?","\"","<",">","|","[","]",",",";","="); + $facref = str_replace($forbidden_chars,"_",$fac->ref); + $dir = FAC_OUTPUTDIR . "/" . $facref . "/" ; + $file = $dir . $facref . ".pdf"; if (! file_exists($dir)) { diff --git a/mysql/data/data.sql b/mysql/data/data.sql index 3d23d5c155b..f1d01c2bb0f 100644 --- a/mysql/data/data.sql +++ b/mysql/data/data.sql @@ -102,7 +102,7 @@ insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_ -- -- Mail Mailing -- -insert into llx_const (name, value, type, note) values ('MAILING_EMAIL','mailing@societe.com','chaine','Champ From du mail pour mailing clients/prospects',0); +insert into llx_const (name, value, type, note) values ('MAILING_EMAIL','mailing@societe.com','chaine','Champ From du mail pour mailing clients/prospects'); -- -- Mailman diff --git a/mysql/tables/llx_actioncomm.sql b/mysql/tables/llx_actioncomm.sql index c29b90d6454..433384556de 100644 --- a/mysql/tables/llx_actioncomm.sql +++ b/mysql/tables/llx_actioncomm.sql @@ -25,7 +25,7 @@ create table llx_actioncomm ( id integer AUTO_INCREMENT PRIMARY KEY, - datea timestamp without time zone, -- action date + datea timestamp, -- action date fk_action integer, label varchar(50), -- libelle de l'action fk_soc integer,