lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Uniformisation du code. Sur le noms de fichiers PDF gnrs, on garde les parenthses partout. Ceci afin d'eviter conflit entre un nom temporaire et un nom du module de numrotation.

Browse Source
This commit is contained in:
Laurent Destailleur 2006-05-31 21:39:54 +00:00
parent c42825f0f3
commit b5bdf7ce8c
16 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/commande/commande.class.php
View File

@ -174,8 +174,6 @@ class Commande
{ {
// On efface le répertoire de pdf provisoire // On efface le répertoire de pdf provisoire
$comref = sanitize_string($this->ref); $comref = sanitize_string($this->ref);
$comref = str_replace("(","",$comref);
$comref = str_replace(")","",$comref);
if ($conf->commande->dir_output) if ($conf->commande->dir_output)
{ {
$dir = $conf->commande->dir_output . "/" . $comref ; $dir = $conf->commande->dir_output . "/" . $comref ;

2
htdocs/commande/fiche.php
View File

@ -1439,8 +1439,6 @@ else
* *
*/ */
$comref = sanitize_string($commande->ref); $comref = sanitize_string($commande->ref);
$comref = str_replace("(","",$comref);
$comref = str_replace(")","",$comref);
$file = $conf->commande->dir_output . '/' . $comref . '/' . $comref . '.pdf'; $file = $conf->commande->dir_output . '/' . $comref . '/' . $comref . '.pdf';
$relativepath = $comref.'/'.$comref.'.pdf'; $relativepath = $comref.'/'.$comref.'.pdf';
$filedir = $conf->commande->dir_output . '/' . $comref; $filedir = $conf->commande->dir_output . '/' . $comref;

2
htdocs/expedition/expedition.class.php
View File

@ -353,8 +353,6 @@ class Expedition
// On efface le répertoire de pdf provisoire // On efface le répertoire de pdf provisoire
$expeditionref = sanitize_string($provref); $expeditionref = sanitize_string($provref);
$expeditionref = str_replace("(","",$expeditionref);
$expeditionref = str_replace(")","",$expeditionref);
if ($conf->expedition->dir_output) if ($conf->expedition->dir_output)
{ {
$dir = $conf->expedition->dir_output . "/" . $expeditionref; $dir = $conf->expedition->dir_output . "/" . $expeditionref;

2
htdocs/expedition/fiche.php
View File

@ -532,8 +532,6 @@ else
*/ */
$expeditionref = sanitize_string($expedition->ref); $expeditionref = sanitize_string($expedition->ref);
$expeditionref = str_replace("(","",$expeditionref);
$expeditionref = str_replace(")","",$expeditionref);
$filedir = $conf->expedition->dir_output . "/" .$expeditionref; $filedir = $conf->expedition->dir_output . "/" .$expeditionref;
$urlsource = $_SERVER["PHP_SELF"]."?id=".$expedition->id; $urlsource = $_SERVER["PHP_SELF"]."?id=".$expedition->id;

2
htdocs/expedition/mods/pdf/ModelePdfExpedition.class.php
View File

@ -124,8 +124,6 @@ function expedition_pdf_create($db, $id, $modele='', $outputlangs='')
$result=$expedition->fetch($id); $result=$expedition->fetch($id);
$expeditionref = sanitize_string($expedition->ref); $expeditionref = sanitize_string($expedition->ref);
$expeditionref = str_replace("(","",$expeditionref);
$expeditionref = str_replace(")","",$expeditionref);
$dir = $conf->expedition->dir_output . "/" . $expeditionref; $dir = $conf->expedition->dir_output . "/" . $expeditionref;
$file = $dir . "/" . $expeditionref . ".pdf"; $file = $dir . "/" . $expeditionref . ".pdf";
if ($obj->generate($expedition, $file)) if ($obj->generate($expedition, $file))

2
htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php
View File

@ -83,8 +83,6 @@ Class pdf_expedition_merou extends ModelePdfExpedition
if ($conf->expedition->dir_output) if ($conf->expedition->dir_output)
{ {
$expeditionref = sanitize_string($this->expe->ref); $expeditionref = sanitize_string($this->expe->ref);
$expeditionref = str_replace("(","",$expeditionref);
$expeditionref = str_replace(")","",$expeditionref);
$dir = $conf->expedition->dir_output . "/" . $expeditionref; $dir = $conf->expedition->dir_output . "/" . $expeditionref;
$file = $dir . "/" . $expeditionref . ".pdf"; $file = $dir . "/" . $expeditionref . ".pdf";
//Si le dossier n existe pas //Si le dossier n existe pas

2
htdocs/fourn/commande/fiche.php
View File

@ -583,8 +583,6 @@ if ($_GET["id"] > 0)
* *
*/ */
$comfournref = sanitize_string($commande->ref); $comfournref = sanitize_string($commande->ref);
$comfournref = str_replace("(","",$comfournref);
$comfournref = str_replace(")","",$comfournref);
$file = $conf->fournisseur->commande->dir_output . '/' . $comfournref . '/' . $comfournref . '.pdf'; $file = $conf->fournisseur->commande->dir_output . '/' . $comfournref . '/' . $comfournref . '.pdf';
$relativepath = $comfournref.'/'.$comfournref.'.pdf'; $relativepath = $comfournref.'/'.$comfournref.'.pdf';
$filedir = $conf->fournisseur->commande->dir_output . '/' . $comfournref; $filedir = $conf->fournisseur->commande->dir_output . '/' . $comfournref;

2
htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php
View File

@ -144,8 +144,6 @@ class pdf_muscadet extends ModelePDFCommandesSuppliers
$nblignes = sizeof($com->lignes); $nblignes = sizeof($com->lignes);
$comref = sanitize_string($com->ref); $comref = sanitize_string($com->ref);
$comref = str_replace("(","",$comref);
$comref = str_replace(")","",$comref);
$dir = $conf->fournisseur->commande->dir_output . "/" . $comref; $dir = $conf->fournisseur->commande->dir_output . "/" . $comref;
$file = $dir . "/" . $comref . ".pdf"; $file = $dir . "/" . $comref . ".pdf";

2
htdocs/includes/modules/commande/pdf_edison.modules.php
View File

@ -80,8 +80,6 @@ class pdf_edison extends ModelePDFCommandes
if ($com->fetch($id)) if ($com->fetch($id))
{ {
$comref = sanitize_string($com->ref); $comref = sanitize_string($com->ref);
$comref = str_replace("(","",$comref);
$comref = str_replace(")","",$comref);
if ($conf->commande->dir_output) if ($conf->commande->dir_output)
{ {

2
htdocs/includes/modules/commande/pdf_einstein.modules.php
View File

@ -142,8 +142,6 @@ class pdf_einstein extends ModelePDFCommandes
$nblignes = sizeof($com->lignes); $nblignes = sizeof($com->lignes);
$comref = sanitize_string($com->ref); $comref = sanitize_string($com->ref);
$comref = str_replace("(","",$comref);
$comref = str_replace(")","",$comref);
$dir = $conf->commande->dir_output . "/" . $comref; $dir = $conf->commande->dir_output . "/" . $comref;
$file = $dir . "/" . $comref . ".pdf"; $file = $dir . "/" . $comref . ".pdf";

1
htdocs/install/upgrade.php
View File

@ -178,6 +178,7 @@ if (! isset($_GET["action"]) || $_GET["action"] == "upgrade")
'DB_ERROR_RECORD_ALREADY_EXISTS', 'DB_ERROR_RECORD_ALREADY_EXISTS',
'DB_ERROR_NOSUCHTABLE', 'DB_ERROR_NOSUCHTABLE',
'DB_ERROR_NOSUCHFIELD', 'DB_ERROR_NOSUCHFIELD',
'DB_ERROR_NO_FOREIGN_KEY_TO_DROP',
'DB_ERROR_CANNOT_CREATE' // Qd contrainte deja existante 'DB_ERROR_CANNOT_CREATE' // Qd contrainte deja existante
); );
if (in_array($errno,$okerror)) if (in_array($errno,$okerror))

6
htdocs/lib/functions.inc.php
View File

@ -143,8 +143,10 @@ function unaccent($str)
*/ */
function sanitize_string($str) function sanitize_string($str)
{ {
$forbidden_chars=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",",",";","="); $forbidden_chars_to_underscore=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",",",";","=");
return str_replace($forbidden_chars,"_",$str); //$forbidden_chars_to_remove=array("(",")");
$forbidden_chars_to_remove=array();
return str_replace($forbidden_chars_to_underscore,"_",str_replace($forbidden_chars_to_remove,"",$str));
} }

2
htdocs/livraison/fiche.php
View File

@ -550,8 +550,6 @@ else
*/ */
$livraisonref = sanitize_string($livraison->ref); $livraisonref = sanitize_string($livraison->ref);
$livraisonref = str_replace("(","",$livraisonref);
$livraisonref = str_replace(")","",$livraisonref);
$filedir = $conf->livraison->dir_output . '/' . $livraisonref; $filedir = $conf->livraison->dir_output . '/' . $livraisonref;
$urlsource = $_SERVER["PHP_SELF"]."?id=".$livraison->id; $urlsource = $_SERVER["PHP_SELF"]."?id=".$livraison->id;

2
htdocs/livraison/livraison.class.php
View File

@ -345,8 +345,6 @@ class Livraison
// On efface le répertoire de pdf provisoire // On efface le répertoire de pdf provisoire
$livraisonref = sanitize_string($this->ref); $livraisonref = sanitize_string($this->ref);
$livraisonref = str_replace("(","",$livraisonref);
$livraisonref = str_replace(")","",$livraisonref);
if ($conf->expedition->dir_output) if ($conf->expedition->dir_output)
{ {
$dir = $conf->livraison->dir_output . "/" . $livraisonref ; $dir = $conf->livraison->dir_output . "/" . $livraisonref ;

2
htdocs/livraison/mods/pdf/pdf_sirocco.modules.php
View File

@ -81,8 +81,6 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
if ($delivery->fetch($id)) if ($delivery->fetch($id))
{ {
$deliveryref = sanitize_string($delivery->ref); $deliveryref = sanitize_string($delivery->ref);
$deliveryref = str_replace("(","",$deliveryref);
$deliveryref = str_replace(")","",$deliveryref);
if ($conf->livraison->dir_output) if ($conf->livraison->dir_output)
{ {

2
htdocs/livraison/mods/pdf/pdf_typhon.modules.php
View File

@ -145,8 +145,6 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$nblignes = sizeof($lignesdelivery); $nblignes = sizeof($lignesdelivery);
$deliveryref = sanitize_string($delivery->ref); $deliveryref = sanitize_string($delivery->ref);
$deliveryref = str_replace("(","",$deliveryref);
$deliveryref = str_replace(")","",$deliveryref);
$dir = $conf->livraison->dir_output . "/" . $deliveryref; $dir = $conf->livraison->dir_output . "/" . $deliveryref;
$file = $dir . "/" . $deliveryref . ".pdf"; $file = $dir . "/" . $deliveryref . ".pdf";