From b5bdf7ce8cb2afc715cabe156da77f9985549c9c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 31 May 2006 21:39:54 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20Uniformisation=20du=20code.=20Sur=20le?= =?UTF-8?q?=20noms=20de=20fichiers=20PDF=20g=E9n=E9r=E9s,=20on=20garde=20l?= =?UTF-8?q?es=20parenth=E8ses=20partout.=20Ceci=20afin=20d'eviter=20confli?= =?UTF-8?q?t=20entre=20un=20nom=20temporaire=20et=20un=20nom=20du=20module?= =?UTF-8?q?=20de=20num=E9rotation.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/commande/commande.class.php | 2 -- htdocs/commande/fiche.php | 2 -- htdocs/expedition/expedition.class.php | 2 -- htdocs/expedition/fiche.php | 2 -- htdocs/expedition/mods/pdf/ModelePdfExpedition.class.php | 2 -- htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php | 2 -- htdocs/fourn/commande/fiche.php | 2 -- htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php | 2 -- htdocs/includes/modules/commande/pdf_edison.modules.php | 2 -- htdocs/includes/modules/commande/pdf_einstein.modules.php | 2 -- htdocs/install/upgrade.php | 1 + htdocs/lib/functions.inc.php | 6 ++++-- htdocs/livraison/fiche.php | 2 -- htdocs/livraison/livraison.class.php | 2 -- htdocs/livraison/mods/pdf/pdf_sirocco.modules.php | 2 -- htdocs/livraison/mods/pdf/pdf_typhon.modules.php | 2 -- 16 files changed, 5 insertions(+), 30 deletions(-) diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php index 766179fe3a9..352e06b6924 100644 --- a/htdocs/commande/commande.class.php +++ b/htdocs/commande/commande.class.php @@ -174,8 +174,6 @@ class Commande { // On efface le répertoire de pdf provisoire $comref = sanitize_string($this->ref); - $comref = str_replace("(","",$comref); - $comref = str_replace(")","",$comref); if ($conf->commande->dir_output) { $dir = $conf->commande->dir_output . "/" . $comref ; diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index a5ce9e8131b..90565c7bda8 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1439,8 +1439,6 @@ else * */ $comref = sanitize_string($commande->ref); - $comref = str_replace("(","",$comref); - $comref = str_replace(")","",$comref); $file = $conf->commande->dir_output . '/' . $comref . '/' . $comref . '.pdf'; $relativepath = $comref.'/'.$comref.'.pdf'; $filedir = $conf->commande->dir_output . '/' . $comref; diff --git a/htdocs/expedition/expedition.class.php b/htdocs/expedition/expedition.class.php index 5fc2f9aa3e7..96aea7ee1b7 100644 --- a/htdocs/expedition/expedition.class.php +++ b/htdocs/expedition/expedition.class.php @@ -353,8 +353,6 @@ class Expedition // On efface le répertoire de pdf provisoire $expeditionref = sanitize_string($provref); - $expeditionref = str_replace("(","",$expeditionref); - $expeditionref = str_replace(")","",$expeditionref); if ($conf->expedition->dir_output) { $dir = $conf->expedition->dir_output . "/" . $expeditionref; diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 1625e83f10b..63dd1262ccc 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -532,8 +532,6 @@ else */ $expeditionref = sanitize_string($expedition->ref); - $expeditionref = str_replace("(","",$expeditionref); - $expeditionref = str_replace(")","",$expeditionref); $filedir = $conf->expedition->dir_output . "/" .$expeditionref; $urlsource = $_SERVER["PHP_SELF"]."?id=".$expedition->id; diff --git a/htdocs/expedition/mods/pdf/ModelePdfExpedition.class.php b/htdocs/expedition/mods/pdf/ModelePdfExpedition.class.php index 30a2d6f37f8..f94f7d7d900 100644 --- a/htdocs/expedition/mods/pdf/ModelePdfExpedition.class.php +++ b/htdocs/expedition/mods/pdf/ModelePdfExpedition.class.php @@ -124,8 +124,6 @@ function expedition_pdf_create($db, $id, $modele='', $outputlangs='') $result=$expedition->fetch($id); $expeditionref = sanitize_string($expedition->ref); - $expeditionref = str_replace("(","",$expeditionref); - $expeditionref = str_replace(")","",$expeditionref); $dir = $conf->expedition->dir_output . "/" . $expeditionref; $file = $dir . "/" . $expeditionref . ".pdf"; if ($obj->generate($expedition, $file)) diff --git a/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php b/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php index ab6dc8d6e5c..08bf8bfaca9 100644 --- a/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php @@ -83,8 +83,6 @@ Class pdf_expedition_merou extends ModelePdfExpedition if ($conf->expedition->dir_output) { $expeditionref = sanitize_string($this->expe->ref); - $expeditionref = str_replace("(","",$expeditionref); - $expeditionref = str_replace(")","",$expeditionref); $dir = $conf->expedition->dir_output . "/" . $expeditionref; $file = $dir . "/" . $expeditionref . ".pdf"; //Si le dossier n existe pas diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 8cd39e06a97..1f6b06fc0f7 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -583,8 +583,6 @@ if ($_GET["id"] > 0) * */ $comfournref = sanitize_string($commande->ref); - $comfournref = str_replace("(","",$comfournref); - $comfournref = str_replace(")","",$comfournref); $file = $conf->fournisseur->commande->dir_output . '/' . $comfournref . '/' . $comfournref . '.pdf'; $relativepath = $comfournref.'/'.$comfournref.'.pdf'; $filedir = $conf->fournisseur->commande->dir_output . '/' . $comfournref; diff --git a/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php b/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php index f00e6f9ef0a..f0c2b68193a 100644 --- a/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php +++ b/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php @@ -144,8 +144,6 @@ class pdf_muscadet extends ModelePDFCommandesSuppliers $nblignes = sizeof($com->lignes); $comref = sanitize_string($com->ref); - $comref = str_replace("(","",$comref); - $comref = str_replace(")","",$comref); $dir = $conf->fournisseur->commande->dir_output . "/" . $comref; $file = $dir . "/" . $comref . ".pdf"; diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php index 0e553db1b2c..3e74e29572f 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/includes/modules/commande/pdf_edison.modules.php @@ -80,8 +80,6 @@ class pdf_edison extends ModelePDFCommandes if ($com->fetch($id)) { $comref = sanitize_string($com->ref); - $comref = str_replace("(","",$comref); - $comref = str_replace(")","",$comref); if ($conf->commande->dir_output) { diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index ad18150c28f..1000fdf5d28 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -142,8 +142,6 @@ class pdf_einstein extends ModelePDFCommandes $nblignes = sizeof($com->lignes); $comref = sanitize_string($com->ref); - $comref = str_replace("(","",$comref); - $comref = str_replace(")","",$comref); $dir = $conf->commande->dir_output . "/" . $comref; $file = $dir . "/" . $comref . ".pdf"; diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index dbe43f91e22..7ee31676d0f 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -178,6 +178,7 @@ if (! isset($_GET["action"]) || $_GET["action"] == "upgrade") 'DB_ERROR_RECORD_ALREADY_EXISTS', 'DB_ERROR_NOSUCHTABLE', 'DB_ERROR_NOSUCHFIELD', + 'DB_ERROR_NO_FOREIGN_KEY_TO_DROP', 'DB_ERROR_CANNOT_CREATE' // Qd contrainte deja existante ); if (in_array($errno,$okerror)) diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index 0da8d2d1917..69fe4ebeb0a 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -143,8 +143,10 @@ function unaccent($str) */ function sanitize_string($str) { - $forbidden_chars=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",",",";","="); - return str_replace($forbidden_chars,"_",$str); + $forbidden_chars_to_underscore=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",",",";","="); + //$forbidden_chars_to_remove=array("(",")"); + $forbidden_chars_to_remove=array(); + return str_replace($forbidden_chars_to_underscore,"_",str_replace($forbidden_chars_to_remove,"",$str)); } diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php index d091a6add6c..9deaf798d81 100644 --- a/htdocs/livraison/fiche.php +++ b/htdocs/livraison/fiche.php @@ -550,8 +550,6 @@ else */ $livraisonref = sanitize_string($livraison->ref); - $livraisonref = str_replace("(","",$livraisonref); - $livraisonref = str_replace(")","",$livraisonref); $filedir = $conf->livraison->dir_output . '/' . $livraisonref; $urlsource = $_SERVER["PHP_SELF"]."?id=".$livraison->id; diff --git a/htdocs/livraison/livraison.class.php b/htdocs/livraison/livraison.class.php index b81d6b22830..4e4b93767df 100644 --- a/htdocs/livraison/livraison.class.php +++ b/htdocs/livraison/livraison.class.php @@ -345,8 +345,6 @@ class Livraison // On efface le répertoire de pdf provisoire $livraisonref = sanitize_string($this->ref); - $livraisonref = str_replace("(","",$livraisonref); - $livraisonref = str_replace(")","",$livraisonref); if ($conf->expedition->dir_output) { $dir = $conf->livraison->dir_output . "/" . $livraisonref ; diff --git a/htdocs/livraison/mods/pdf/pdf_sirocco.modules.php b/htdocs/livraison/mods/pdf/pdf_sirocco.modules.php index fc96a54e8ad..495b562cfdf 100644 --- a/htdocs/livraison/mods/pdf/pdf_sirocco.modules.php +++ b/htdocs/livraison/mods/pdf/pdf_sirocco.modules.php @@ -81,8 +81,6 @@ class pdf_sirocco extends ModelePDFDeliveryOrder if ($delivery->fetch($id)) { $deliveryref = sanitize_string($delivery->ref); - $deliveryref = str_replace("(","",$deliveryref); - $deliveryref = str_replace(")","",$deliveryref); if ($conf->livraison->dir_output) { diff --git a/htdocs/livraison/mods/pdf/pdf_typhon.modules.php b/htdocs/livraison/mods/pdf/pdf_typhon.modules.php index 09bc0146805..5bc69932e23 100644 --- a/htdocs/livraison/mods/pdf/pdf_typhon.modules.php +++ b/htdocs/livraison/mods/pdf/pdf_typhon.modules.php @@ -145,8 +145,6 @@ class pdf_typhon extends ModelePDFDeliveryOrder $nblignes = sizeof($lignesdelivery); $deliveryref = sanitize_string($delivery->ref); - $deliveryref = str_replace("(","",$deliveryref); - $deliveryref = str_replace(")","",$deliveryref); $dir = $conf->livraison->dir_output . "/" . $deliveryref; $file = $dir . "/" . $deliveryref . ".pdf";