diff --git a/htdocs/chargesociales.class.php b/htdocs/chargesociales.class.php index ef88a19375d..11cdb9a75b2 100644 --- a/htdocs/chargesociales.class.php +++ b/htdocs/chargesociales.class.php @@ -24,15 +24,20 @@ \version $Id$ */ +require_once(DOL_DOCUMENT_ROOT."/commonobject.class.php"); + /** \class ChargeSociales \brief Classe permettant la gestion des paiements des charges La tva collectée n'est calculée que sur les factures payées. */ -class ChargeSociales +class ChargeSociales extends CommonObject { var $db; - + var $error; + var $element='rowid'; + var $table_element='chargesociales'; + var $id; var $date_ech; var $lib; diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index 97a33cbe3b0..fe01698a43a 100755 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -71,7 +71,7 @@ if ( $_POST["sendit"] && $conf->upload ) /* * Creation répertoire si n'existe pas */ - $upload_dir = $conf->actions->dir_output.'/'.sanitize_string($objectid); + $upload_dir = $conf->actions->dir_output.'/'.sanitizeFileName($objectid); if (! is_dir($upload_dir)) create_exdir($upload_dir); if (is_dir($upload_dir)) @@ -95,7 +95,7 @@ if ( $_POST["sendit"] && $conf->upload ) */ if ($_GET["action"] == 'delete') { - $upload_dir = $conf->actions->dir_output.'/'.sanitize_string($objectid); + $upload_dir = $conf->actions->dir_output.'/'.sanitizeFileName($objectid); $file = $upload_dir . '/' . urldecode($_GET['urlfile']); dol_delete_file($file); } @@ -113,7 +113,7 @@ if ($objectid > 0) $act = new ActionComm($db); if ($act->fetch($objectid)) { - $upload_dir = $conf->actions->dir_output.'/'.sanitize_string($objectid); + $upload_dir = $conf->actions->dir_output.'/'.sanitizeFileName($objectid); $res=$act->societe->fetch($act->societe->id); $res=$act->author->fetch(); // Le paramètre est le login, hors seul l'id est chargé. diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 09fa18eaf60..d7d871ca750 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -457,8 +457,8 @@ if ($conf->propal->enabled && $user->rights->propale->lire) if ($obj->dp < (time() - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late")); print ''; print ''; - $filename=sanitize_string($obj->ref); - $filedir=$conf->propal->dir_output . '/' . sanitize_string($obj->ref); + $filename=sanitizeFileName($obj->ref); + $filedir=$conf->propal->dir_output . '/' . sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?propalid='.$obj->propalid; $formfile->show_documents('propal',$filename,$filedir,$urlsource,'','','','','',1); print ''; @@ -532,8 +532,8 @@ if ($conf->propal->enabled && $user->rights->propale->lire) print ' '; print ''; print ''; - $filename=sanitize_string($objp->ref); - $filedir=$conf->propal->dir_output . '/' . sanitize_string($objp->ref); + $filename=sanitizeFileName($objp->ref); + $filedir=$conf->propal->dir_output . '/' . sanitizeFileName($objp->ref); $urlsource=$_SERVER['PHP_SELF'].'?propalid='.$objp->propalid; $formfile->show_documents('propal',$filename,$filedir,$urlsource,'','','','','',1); print ''; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index b8718c5393b..ad6a89df976 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -359,7 +359,7 @@ if ($_POST['action'] == 'send' && ! $_POST['addfile'] && ! $_POST['cancel']) $propal= new Propal($db); if ( $propal->fetch($_POST['propalid']) ) { - $propalref = sanitize_string($propal->ref); + $propalref = sanitizeFileName($propal->ref); $file = $conf->propal->dir_output . '/' . $propalref . '/' . $propalref . '.pdf'; if (is_readable($file)) @@ -1687,7 +1687,7 @@ if ($_GET['propalid'] > 0) // Send if ($propal->statut == 1 && $user->rights->propale->envoyer) { - $propref = sanitize_string($propal->ref); + $propref = sanitizeFileName($propal->ref); $file = $conf->propal->dir_output . '/'.$propref.'/'.$propref.'.pdf'; if (file_exists($file)) { @@ -1745,8 +1745,8 @@ if ($_GET['propalid'] > 0) /* * Documents generes */ - $filename=sanitize_string($propal->ref); - $filedir=$conf->propal->dir_output . "/" . sanitize_string($propal->ref); + $filename=sanitizeFileName($propal->ref); + $filedir=$conf->propal->dir_output . "/" . sanitizeFileName($propal->ref); $urlsource=$_SERVER["PHP_SELF"]."?propalid=".$propal->id; $genallowed=$user->rights->propale->creer; $delallowed=$user->rights->propale->supprimer; @@ -1806,7 +1806,7 @@ if ($_GET['propalid'] > 0) */ if ($_GET['action'] == 'presend') { - $ref = sanitize_string($propal->ref); + $ref = sanitizeFileName($propal->ref); $file = $conf->propal->dir_output . '/' . $ref . '/' . $ref . '.pdf'; print '
'; @@ -2003,8 +2003,8 @@ else print ''; - $filename=sanitize_string($objp->ref); - $filedir=$conf->propal->dir_output . '/' . sanitize_string($objp->ref); + $filename=sanitizeFileName($objp->ref); + $filedir=$conf->propal->dir_output . '/' . sanitizeFileName($objp->ref); $urlsource=$_SERVER['PHP_SELF'].'?propalid='.$objp->propalid; $formfile->show_documents('propal',$filename,$filedir,$urlsource,'','','','','',1); diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php index 60cddea65dc..9c82a94a214 100644 --- a/htdocs/comm/propal/apercu.php +++ b/htdocs/comm/propal/apercu.php @@ -133,7 +133,7 @@ if ($_GET["propalid"] > 0) /* * Documents */ - $propalref = sanitize_string($propal->ref); + $propalref = sanitizeFileName($propal->ref); $dir_output = $conf->propal->dir_output . "/"; $filepath = $dir_output . $propalref . "/"; $file = $filepath . $propalref . ".pdf"; diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index 630cbedbf3b..68e157e2a72 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -72,7 +72,7 @@ if ($_POST["sendit"] && $conf->upload) if ($propal->fetch($propalid)) { - $upload_dir = $conf->propal->dir_output . "/" . sanitize_string($propal->ref); + $upload_dir = $conf->propal->dir_output . "/" . sanitizeFileName($propal->ref); if (! is_dir($upload_dir)) create_exdir($upload_dir); if (is_dir($upload_dir)) @@ -100,7 +100,7 @@ if ($action=='delete') $propalid=$_GET["id"]; if ($propal->fetch($propalid)) { - $upload_dir = $conf->propal->dir_output . "/" . sanitize_string($propal->ref); + $upload_dir = $conf->propal->dir_output . "/" . sanitizeFileName($propal->ref); $file = $upload_dir . '/' . urldecode($_GET['urlfile']); dol_delete_file($file); $mesg = '
'.$langs->trans("FileWasRemoved").'
'; @@ -119,7 +119,7 @@ if ($propalid > 0) $propal = new Propal($db); if ($propal->fetch($propalid)) { - $upload_dir = $conf->propal->dir_output.'/'.sanitize_string($propal->ref); + $upload_dir = $conf->propal->dir_output.'/'.sanitizeFileName($propal->ref); $societe = new Societe($db); $societe->fetch($propal->socid); diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php index 7f7f3eef677..c52764dff2c 100644 --- a/htdocs/commande/apercu.php +++ b/htdocs/commande/apercu.php @@ -135,7 +135,7 @@ if ($_GET["id"] > 0) { /* * Documents */ - $commanderef = sanitize_string($commande->ref); + $commanderef = sanitizeFileName($commande->ref); $dir_output = $conf->commande->dir_output . "/"; $filepath = $dir_output . $commanderef . "/"; $file = $filepath . $commanderef . ".pdf"; diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php index 7f24d369d43..e6885a5908d 100644 --- a/htdocs/commande/commande.class.php +++ b/htdocs/commande/commande.class.php @@ -248,7 +248,7 @@ class Commande extends CommonObject // On efface le repertoire de pdf provisoire if (eregi('^\(PROV', $this->ref)) { - $comref = sanitize_string($this->ref); + $comref = sanitizeFileName($this->ref); if ($conf->commande->dir_output) { $dir = $conf->commande->dir_output . "/" . $comref ; @@ -1752,7 +1752,7 @@ class Commande extends CommonObject } // On efface le repertoire de pdf provisoire - $comref = sanitize_string($this->ref); + $comref = sanitizeFileName($this->ref); if ($conf->commande->dir_output) { $dir = $conf->commande->dir_output . "/" . $comref ; diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php index 03e099dfec9..9f17ddbc5bf 100644 --- a/htdocs/commande/document.php +++ b/htdocs/commande/document.php @@ -74,7 +74,7 @@ if (!$commande->fetch($id)) { // Envoi fichier if ($_POST["sendit"] && $conf->upload) { - $upload_dir = $conf->commande->dir_output . "/" . sanitize_string($commande->ref); + $upload_dir = $conf->commande->dir_output . "/" . sanitizeFileName($commande->ref); if (! is_dir($upload_dir)) create_exdir($upload_dir); if (is_dir($upload_dir)) @@ -96,7 +96,7 @@ if ($_POST["sendit"] && $conf->upload) // Delete if ($action=='delete') { - $upload_dir = $conf->commande->dir_output . "/" . sanitize_string($commande->ref); + $upload_dir = $conf->commande->dir_output . "/" . sanitizeFileName($commande->ref); $file = $upload_dir . '/' . urldecode($_GET['urlfile']); dol_delete_file($file); $mesg = '
'.$langs->trans("FileWasRemoved").'
'; @@ -110,7 +110,7 @@ if ($id > 0) { llxHeader(); - $upload_dir = $conf->commande->dir_output.'/'.sanitize_string($commande->ref); + $upload_dir = $conf->commande->dir_output.'/'.sanitizeFileName($commande->ref); $societe = new Societe($db); $societe->fetch($commande->socid); diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index a60fce0f556..999a902033b 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -676,7 +676,7 @@ if ($_POST['action'] == 'send' && ! $_POST['addfile'] && ! $_POST['cancel']) $result=$commande->fetch($_POST['orderid']); if ($result) { - $ref = sanitize_string($commande->ref); + $ref = sanitizeFileName($commande->ref); $file = $conf->commande->dir_output . '/' . $ref . '/' . $ref . '.pdf'; if (is_readable($file)) @@ -1876,7 +1876,7 @@ else { if ($user->rights->commande->envoyer) { - $comref = sanitize_string($commande->ref); + $comref = sanitizeFileName($commande->ref); $file = $conf->commande->dir_output . '/'.$comref.'/'.$comref.'.pdf'; if (file_exists($file)) { @@ -1979,7 +1979,7 @@ else * Documents generes * */ - $comref = sanitize_string($commande->ref); + $comref = sanitizeFileName($commande->ref); $file = $conf->commande->dir_output . '/' . $comref . '/' . $comref . '.pdf'; $relativepath = $comref.'/'.$comref.'.pdf'; $filedir = $conf->commande->dir_output . '/' . $comref; @@ -2046,7 +2046,7 @@ else */ if ($_GET['action'] == 'presend') { - $ref = sanitize_string($commande->ref); + $ref = sanitizeFileName($commande->ref); $file = $conf->commande->dir_output . '/' . $ref . '/' . $ref . '.pdf'; print '
'; diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index 064b338d9e7..c6fb0d1697e 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -147,8 +147,8 @@ if ( $db->query($sql) ) print ''; print ''; - $filename=sanitize_string($obj->ref); - $filedir=$conf->commande->dir_output . '/' . sanitize_string($obj->ref); + $filename=sanitizeFileName($obj->ref); + $filedir=$conf->commande->dir_output . '/' . sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; $formfile->show_documents('commande',$filename,$filedir,$urlsource,'','','','','',1); print ''; @@ -210,8 +210,8 @@ if ( $db->query($sql) ) print ''; print ''; - $filename=sanitize_string($obj->ref); - $filedir=$conf->commande->dir_output . '/' . sanitize_string($obj->ref); + $filename=sanitizeFileName($obj->ref); + $filedir=$conf->commande->dir_output . '/' . sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; $formfile->show_documents('commande',$filename,$filedir,$urlsource,'','','','','',1); print ''; @@ -276,8 +276,8 @@ if ($resql) print ''; print ''; - $filename=sanitize_string($obj->ref); - $filedir=$conf->commande->dir_output . '/' . sanitize_string($obj->ref); + $filename=sanitizeFileName($obj->ref); + $filedir=$conf->commande->dir_output . '/' . sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; $formfile->show_documents('commande',$filename,$filedir,$urlsource,'','','','','',1); print ''; diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index aa8a5c5af53..a15d2ed004c 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -208,8 +208,8 @@ if ($resql) print ''; print ''; - $filename=sanitize_string($objp->ref); - $filedir=$conf->commande->dir_output . '/' . sanitize_string($objp->ref); + $filename=sanitizeFileName($objp->ref); + $filedir=$conf->commande->dir_output . '/' . sanitizeFileName($objp->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$objp->rowid; $formfile->show_documents('commande',$filename,$filedir,$urlsource,'','','','','',1); print ''; diff --git a/htdocs/commonobject.class.php b/htdocs/commonobject.class.php index a03c098b02d..da543a8486b 100644 --- a/htdocs/commonobject.class.php +++ b/htdocs/commonobject.class.php @@ -507,7 +507,7 @@ class CommonObject { if (! $this->table_element) { - dolibarr_syslog("CommonObject::load_previous_next was called on objet with property table_element not defined",LOG_ERR); + dolibarr_syslog("CommonObject::load_previous_next was called on objet with property table_element not defined", LOG_ERR); return -1; } diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index d01bfe62a5b..d35041faa3d 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -42,7 +42,7 @@ if ($_POST["action"] == 'add') // Creation compte $account = new Account($db,0); - $account->ref = sanitize_string(trim($_POST["ref"])); + $account->ref = sanitizeFileName(trim($_POST["ref"])); $account->label = trim($_POST["label"]); $account->courant = $_POST["type"]; $account->clos = $_POST["clos"]; diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php index c0cb2bee667..0f014beb869 100644 --- a/htdocs/compta/commande/fiche.php +++ b/htdocs/compta/commande/fiche.php @@ -503,7 +503,7 @@ if ($_GET["id"] > 0) * Documents générés * */ - $comref = sanitize_string($commande->ref); + $comref = sanitizeFileName($commande->ref); $file = $conf->commande->dir_output . '/' . $comref . '/' . $comref . '.pdf'; $relativepath = $comref.'/'.$comref.'.pdf'; $filedir = $conf->commande->dir_output . '/' . $comref; diff --git a/htdocs/compta/commande/liste.php b/htdocs/compta/commande/liste.php index 54538879241..d2cabdc2216 100644 --- a/htdocs/compta/commande/liste.php +++ b/htdocs/compta/commande/liste.php @@ -146,8 +146,8 @@ if ($resql) print ''; print ''; - $filename=sanitize_string($objp->ref); - $filedir=$conf->commande->dir_output . '/' . sanitize_string($objp->ref); + $filename=sanitizeFileName($objp->ref); + $filedir=$conf->commande->dir_output . '/' . sanitizeFileName($objp->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$objp->rowid; $formfile->show_documents('commande',$filename,$filedir,$urlsource,'','','','','',1); print ''; diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index 6072af5a291..1369c814f25 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -422,7 +422,7 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit') /* * Documents générés */ - $filename=sanitize_string($don->id); + $filename=sanitizeFileName($don->id); $filedir=$conf->don->dir_output . '/' . get_exdir($filename,2); $urlsource=$_SERVER['PHP_SELF'].'?rowid='.$don->id; // $genallowed=($fac->statut == 1 && ($fac->paye == 0 || $user->admin) && $user->rights->facture->creer); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index ed951a56b50..fd3808159ef 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1069,7 +1069,7 @@ if (($_POST['action'] == 'send' || $_POST['action'] == 'relance') && ! $_POST['a $result=$fac->fetch($_POST['facid']); if ($result) { - $ref = sanitize_string($fac->ref); + $ref = sanitizeFileName($fac->ref); $file = $conf->facture->dir_output . '/' . $ref . '/' . $ref . '.pdf'; if (is_readable($file)) @@ -2996,8 +2996,8 @@ else /* * Documents générés */ - $filename=sanitize_string($fac->ref); - $filedir=$conf->facture->dir_output . '/' . sanitize_string($fac->ref); + $filename=sanitizeFileName($fac->ref); + $filedir=$conf->facture->dir_output . '/' . sanitizeFileName($fac->ref); $urlsource=$_SERVER['PHP_SELF'].'?facid='.$fac->id; $genallowed=$user->rights->facture->creer; $delallowed=$user->rights->facture->supprimer; @@ -3132,7 +3132,7 @@ else */ if ($_GET['action'] == 'presend') { - $ref = sanitize_string($fac->ref); + $ref = sanitizeFileName($fac->ref); $file = $conf->facture->dir_output . '/' . $ref . '/' . $ref . '.pdf'; // Construit PDF si non existant @@ -3198,7 +3198,7 @@ else if ($_GET['action'] == 'prerelance') { - $ref = sanitize_string($fac->ref); + $ref = sanitizeFileName($fac->ref); $file = $conf->facture->dir_output . '/' . $ref . '/' . $ref . '.pdf'; // Construit PDF si non existant @@ -3442,8 +3442,8 @@ else print ''; } print ''; - $filename=sanitize_string($objp->facnumber); - $filedir=$conf->facture->dir_output . '/' . sanitize_string($objp->facnumber); + $filename=sanitizeFileName($objp->facnumber); + $filedir=$conf->facture->dir_output . '/' . sanitizeFileName($objp->facnumber); $urlsource=$_SERVER['PHP_SELF'].'?facid='.$objp->facid; $formfile->show_documents('facture',$filename,$filedir,$urlsource,'','','','','',1); print ''; diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index 75752a4551a..3992e5cbda9 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -129,7 +129,7 @@ if ($_GET["facid"] > 0) /* * Documents */ - $facref = sanitize_string($fac->ref); + $facref = sanitizeFileName($fac->ref); $dir_output = $conf->facture->dir_output . "/"; $filepath = $dir_output . $facref . "/"; $file = $filepath . $facref . ".pdf"; diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php index f1efe458bbc..53e157d7ec9 100644 --- a/htdocs/compta/facture/document.php +++ b/htdocs/compta/facture/document.php @@ -73,7 +73,7 @@ if ($_POST["sendit"] && $conf->upload) $facture = new Facture($db); if ($facture->fetch($facid)) { - $upload_dir = $conf->facture->dir_output . "/" . sanitize_string($facture->ref); + $upload_dir = $conf->facture->dir_output . "/" . sanitizeFileName($facture->ref); if (! is_dir($upload_dir)) create_exdir($upload_dir); if (is_dir($upload_dir)) @@ -101,7 +101,7 @@ if ($action=='delete') $facid=$_GET["id"]; if ($facture->fetch($facid)) { - $upload_dir = $conf->facture->dir_output . "/" . sanitize_string($facture->ref); + $upload_dir = $conf->facture->dir_output . "/" . sanitizeFileName($facture->ref); $file = $upload_dir . '/' . urldecode($_GET['urlfile']); dol_delete_file($file); $mesg = '
'.$langs->trans("FileWasRemoved").'
'; @@ -119,7 +119,7 @@ if ($facid > 0) $facture = new Facture($db); if ($facture->fetch($facid)) { - $upload_dir = $conf->facture->dir_output.'/'.sanitize_string($facture->ref); + $upload_dir = $conf->facture->dir_output.'/'.sanitizeFileName($facture->ref); $societe = new Societe($db); $societe->fetch($facture->socid); diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index 3cfa6a0768b..6f52987b7dd 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -92,8 +92,8 @@ if ($_POST["action"] == "builddoc" && $user->rights->facture->lire) create_exdir($diroutputpdf); // enregistre le fichier pdf concatene - $filename=sanitize_string(strtolower($langs->transnoentities("Unpayed"))); - if ($option=='late') $filename.='_'.sanitize_string(strtolower($langs->transnoentities("Late"))); + $filename=sanitizeFileName(strtolower($langs->transnoentities("Unpayed"))); + if ($option=='late') $filename.='_'.sanitizeFileName(strtolower($langs->transnoentities("Late"))); if ($pagecount) { $file=$diroutputpdf.'/'.$filename.'_'.dolibarr_print_date(mktime(),'dayhourlog').'.pdf'; @@ -316,8 +316,8 @@ if ($result) print ''; - $filename=sanitize_string($objp->facnumber); - $filedir=$conf->facture->dir_output . '/' . sanitize_string($objp->facnumber); + $filename=sanitizeFileName($objp->facnumber); + $filedir=$conf->facture->dir_output . '/' . sanitizeFileName($objp->facnumber); $urlsource=$_SERVER['PHP_SELF'].'?facid='.$objp->facid; $formfile->show_documents('facture',$filename,$filedir,$urlsource,'','','','','',1); diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 34d61f6540a..e69d2956355 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -519,8 +519,8 @@ if ($conf->facture->enabled && $conf->commande->enabled && $user->rights->comman print ' '; print ''; print ''; - $filename=sanitize_string($obj->ref); - $filedir=$conf->commande->dir_output . '/' . sanitize_string($obj->ref); + $filename=sanitizeFileName($obj->ref); + $filedir=$conf->commande->dir_output . '/' . sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; $formfile->show_documents('commande',$filename,$filedir,$urlsource,'','','','','',1); print ''; @@ -614,8 +614,8 @@ if ($conf->facture->enabled && $user->rights->facture->lire) if ($obj->datelimite < (time() - $conf->facture->client->warning_delay)) print img_warning($langs->trans("Late")); print ''; print ''; - $filename=sanitize_string($obj->facnumber); - $filedir=$conf->facture->dir_output . '/' . sanitize_string($obj->facnumber); + $filename=sanitizeFileName($obj->facnumber); + $filedir=$conf->facture->dir_output . '/' . sanitizeFileName($obj->facnumber); $urlsource=$_SERVER['PHP_SELF'].'?facid='.$obj->rowid; $formfile->show_documents('facture',$filename,$filedir,$urlsource,'','','','','',1); print ''; diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index f81843e8c56..2b2e87a2d58 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -488,8 +488,8 @@ if ($_GET["propalid"] > 0) /* * Documents g�n�r�s */ - $filename=sanitize_string($propal->ref); - $filedir=$conf->propal->dir_output . "/" . sanitize_string($propal->ref); + $filename=sanitizeFileName($propal->ref); + $filedir=$conf->propal->dir_output . "/" . sanitizeFileName($propal->ref); $urlsource=$_SERVER["PHP_SELF"]."?propalid=".$propal->id; $genallowed=0; $delallowed=0; @@ -758,8 +758,8 @@ else print ''; - $filename=sanitize_string($objp->ref); - $filedir=$conf->propal->dir_output . '/' . sanitize_string($objp->ref); + $filename=sanitizeFileName($objp->ref); + $filedir=$conf->propal->dir_output . '/' . sanitizeFileName($objp->ref); $urlsource=$_SERVER['PHP_SELF'].'?propalid='.$objp->propalid; $formfile->show_documents('propal',$filename,$filedir,$urlsource,'','','','','',1); diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php index eb22652243e..38bcc1f9ab2 100644 --- a/htdocs/contact/vcard.php +++ b/htdocs/contact/vcard.php @@ -85,8 +85,8 @@ $db->close(); $output = $v->getVCard(); $filename =trim(urldecode($v->getFileName())); // "Nom prenom.vcf" -$filenameurlencoded = sanitize_string(urlencode($filename)); -//$filename = sanitize_string($filename); +$filenameurlencoded = sanitizeFileName(urlencode($filename)); +//$filename = sanitizeFileName($filename); Header("Content-Disposition: attachment; filename=\"$filename\""); Header("Content-Length: ".strlen($output)); diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php index f22999ab408..22be54aa553 100644 --- a/htdocs/contrat/document.php +++ b/htdocs/contrat/document.php @@ -63,7 +63,7 @@ $pagenext = $page + 1; $contrat = new Contrat($db); $contrat->fetch($_GET["id"]); -$upload_dir = $conf->contrat->dir_output.'/'.sanitize_string($contrat->ref); +$upload_dir = $conf->contrat->dir_output.'/'.sanitizeFileName($contrat->ref); $modulepart='contract'; diff --git a/htdocs/ecm/ecmdirectory.class.php b/htdocs/ecm/ecmdirectory.class.php index 204241a085a..13f5f4f5995 100644 --- a/htdocs/ecm/ecmdirectory.class.php +++ b/htdocs/ecm/ecmdirectory.class.php @@ -75,7 +75,7 @@ class EcmDirectory // extends CommonObject $now=time(); // Clean parameters - $this->label=sanitize_string($this->label); + $this->label=sanitizeFileName($this->label); $this->fk_parent=trim($this->fk_parent); $this->description=trim($this->description); if (! $this->cachenbofdoc) $this->cachenbofdoc=0; @@ -422,7 +422,7 @@ class EcmDirectory // extends CommonObject if ($cursorindex >= 0) { // Path is label sanitized (no space and no special char) and concatenated - $ret=sanitize_string($this->cats[$cursorindex]['label']).'/'.$ret; + $ret=sanitizeFileName($this->cats[$cursorindex]['label']).'/'.$ret; $idtosearch=$this->cats[$cursorindex]['id_mere']; $i++; diff --git a/htdocs/expedition/expedition.class.php b/htdocs/expedition/expedition.class.php index 8de3a00e3e8..a23ffe3c5a7 100644 --- a/htdocs/expedition/expedition.class.php +++ b/htdocs/expedition/expedition.class.php @@ -84,8 +84,8 @@ class Expedition extends CommonObject $this->user = $user; - $this->expedition_method = sanitize_string($this->expedition_method); - $this->tracking_number = sanitize_string($this->tracking_number); + $this->expedition_method = sanitizeFileName($this->expedition_method); + $this->tracking_number = sanitizeFileName($this->tracking_number); $this->db->begin(); @@ -359,9 +359,9 @@ class Expedition extends CommonObject while($i < $num) { dolibarr_syslog("Expedition::valid movment nb ".$i); - + $obj = $this->db->fetch_object($resql); - + $mouvS = new MouvementStock($this->db); $result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty); if ($result < 0) @@ -371,7 +371,7 @@ class Expedition extends CommonObject dolibarr_syslog("Expedition::valid ".$this->error); return -3; } - + $i++; } @@ -386,7 +386,7 @@ class Expedition extends CommonObject } // On efface le répertoire de pdf provisoire - $expeditionref = sanitize_string($provref); + $expeditionref = sanitizeFileName($provref); if ($conf->expedition->dir_output) { $dir = $conf->expedition->dir_output . "/" . $expeditionref; @@ -513,11 +513,11 @@ class Expedition extends CommonObject { $sql = "DELETE FROM ".MAIN_DB_PREFIX."expedition WHERE rowid = ".$this->id; if ( $this->db->query($sql) ) - { - $this->db->commit(); - + { + $this->db->commit(); + // On efface le répertoire de pdf provisoire - $expref = sanitize_string($this->ref); + $expref = sanitizeFileName($this->ref); if ($conf->expedition->dir_output) { $dir = $conf->expedition->dir_output . "/" . $expref ; @@ -740,7 +740,7 @@ class Expedition extends CommonObject } /* Fetch deliveries method and return an array - */ + */ function fetch_delivery_methods() { $meths = array(); @@ -760,7 +760,7 @@ class Expedition extends CommonObject } /* Get tracking url status - */ + */ function GetUrlTrackingStatus() { $sql = "SELECT em.code"; diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 0adc64a2101..9f1d5956a55 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -736,7 +736,7 @@ else */ if ($conf->expedition_bon->enabled) { - $expeditionref = sanitize_string($expedition->ref); + $expeditionref = sanitizeFileName($expedition->ref); $filedir = $conf->expedition_bon->dir_output . "/" .$expeditionref; $urlsource = $_SERVER["PHP_SELF"]."?id=".$expedition->id; diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php index 780b63c50d4..3cd1ced27cf 100644 --- a/htdocs/facture.class.php +++ b/htdocs/facture.class.php @@ -1114,8 +1114,8 @@ class Facture extends CommonObject { // On renomme repertoire facture ($this->ref = ancienne ref, $numfa = nouvelle ref) // afin de ne pas perdre les fichiers attachés - $facref = sanitize_string($this->ref); - $snumfa = sanitize_string($numfa); + $facref = sanitizeFileName($this->ref); + $snumfa = sanitizeFileName($numfa); $dirsource = $conf->facture->dir_output.'/'.$facref; $dirdest = $conf->facture->dir_output.'/'.$snumfa; if (file_exists($dirsource)) diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php index 7a6958dddf6..a39e8daddfe 100644 --- a/htdocs/fichinter/apercu.php +++ b/htdocs/fichinter/apercu.php @@ -109,7 +109,7 @@ if ($_GET["id"] > 0) { /* * Documents */ - $fichinterref = sanitize_string($fichinter->ref); + $fichinterref = sanitizeFileName($fichinter->ref); $dir_output = $conf->fichinter->dir_output . "/"; $filepath = $dir_output . $fichinterref . "/"; $file = $filepath . $fichinterref . ".pdf"; diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index f432002491e..7170f69213e 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -888,9 +888,9 @@ elseif ($_GET["id"] > 0) print '
'; /* - * Documents g�n�r�s + * Built documents */ - $filename=sanitize_string($fichinter->ref); + $filename=sanitizeFileName($fichinter->ref); $filedir=$conf->fichinter->dir_output . "/".$fichinter->ref; $urlsource=$_SERVER["PHP_SELF"]."?id=".$fichinter->id; $genallowed=$user->rights->ficheinter->creer; diff --git a/htdocs/fichinter/fichinter.class.php b/htdocs/fichinter/fichinter.class.php index b1627828dda..d28ed6d3da6 100644 --- a/htdocs/fichinter/fichinter.class.php +++ b/htdocs/fichinter/fichinter.class.php @@ -461,7 +461,7 @@ class Fichinter extends CommonObject { // Remove directory with files - $fichinterref = sanitize_string($this->ref); + $fichinterref = sanitizeFileName($this->ref); if ($conf->fichinter->dir_output) { $dir = $conf->fichinter->dir_output . "/" . $fichinterref ; diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 54c8d09031e..a6e0e7da84f 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -973,7 +973,7 @@ if ($id > 0) * Documents generes * */ - $comfournref = sanitize_string($commande->ref); + $comfournref = sanitizeFileName($commande->ref); $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/modules_commandefournisseur.php b/htdocs/fourn/commande/modules/modules_commandefournisseur.php index b5a62ca9131..14dc1ea0f0a 100644 --- a/htdocs/fourn/commande/modules/modules_commandefournisseur.php +++ b/htdocs/fourn/commande/modules/modules_commandefournisseur.php @@ -212,7 +212,7 @@ function supplier_order_delete_preview($db, $propalid) if ($conf->fournisseur->commande->dir_output) { - $comfournref = sanitize_string($comfourn->ref); + $comfournref = sanitizeFileName($comfourn->ref); $dir = $conf->commande->dir_output . "/" . $comfournref ; $file = $dir . "/" . $comfournref . ".pdf.png"; diff --git a/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php b/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php index c1c528c9263..5c6a894290b 100644 --- a/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php +++ b/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php @@ -142,7 +142,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders } else { - $comref = sanitize_string($com->ref); + $comref = sanitizeFileName($com->ref); $dir = $conf->fournisseur->commande->dir_output . "/" . $comref; $file = $dir . "/" . $comref . ".pdf"; } diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index d89c913af53..197912eae16 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -2991,8 +2991,9 @@ class Form * \param paramid Nom du parametre a utiliser pour nommer id dans liens URL * \param morehtml Code html supplementaire a afficher avant barre nav * \param shownav Show Condition - * \param fieldid Nom du champ a utiliser pour select next et previous - * \return string Portion HTML avec ref + boutons nav + * \param fieldid Nom du champ id a utiliser pour select next et previous + * \param fieldref Nom du champ ref a utiliser pour select next et previous + * \return string Portion HTML avec ref + boutons nav */ function showrefnav($object,$paramid,$morehtml='',$shownav=1,$fieldid='rowid',$fieldref='ref') { diff --git a/htdocs/html.formfile.class.php b/htdocs/html.formfile.class.php index 4c395b5d738..40073fc6cc8 100644 --- a/htdocs/html.formfile.class.php +++ b/htdocs/html.formfile.class.php @@ -142,7 +142,7 @@ class FormFile $forcenomultilang=0; } - $filename = sanitize_string($filename); + $filename = sanitizeFileName($filename); $headershown=0; $i=0; @@ -418,7 +418,7 @@ class FormFile // Define relative path used to store the file if (! $relativepath) { - $relativepath=sanitize_string($object->ref).'/'; + $relativepath=sanitizeFileName($object->ref).'/'; if ($modulepart == 'facture_fournisseur') $relativepath=get_exdir($object->id,2).$relativepath; } diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/includes/modules/commande/modules_commande.php index 734c73fec10..4b2031749d8 100644 --- a/htdocs/includes/modules/commande/modules_commande.php +++ b/htdocs/includes/modules/commande/modules_commande.php @@ -249,7 +249,7 @@ function commande_delete_preview($db, $commandeid, $commanderef='') if ($conf->commande->dir_output) { - $comref = sanitize_string($commanderef); + $comref = sanitizeFileName($commanderef); $dir = $conf->commande->dir_output . "/" . $comref ; $file = $dir . "/" . $comref . ".pdf.png"; $multiple = $file . "."; diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php index b5b3970cfc4..0802f23c140 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/includes/modules/commande/pdf_edison.modules.php @@ -117,7 +117,7 @@ class pdf_edison extends ModelePDFCommandes } else { - $comref = sanitize_string($com->ref); + $comref = sanitizeFileName($com->ref); $dir = $conf->commande->dir_output . "/" . $comref; $file = $dir . "/" . $comref . ".pdf"; } diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index 916545043d1..52115ee08e1 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -140,7 +140,7 @@ class pdf_einstein extends ModelePDFCommandes } else { - $comref = sanitize_string($com->ref); + $comref = sanitizeFileName($com->ref); $dir = $conf->commande->dir_output . "/" . $comref; $file = $dir . "/" . $comref . ".pdf"; } diff --git a/htdocs/includes/modules/dons/html_cerfafr.modules.php b/htdocs/includes/modules/dons/html_cerfafr.modules.php index 380c5f7326f..f1262349d3b 100644 --- a/htdocs/includes/modules/dons/html_cerfafr.modules.php +++ b/htdocs/includes/modules/dons/html_cerfafr.modules.php @@ -89,7 +89,7 @@ class html_cerfafr extends ModeleDon } else { - $donref = sanitize_string($don->ref); + $donref = sanitizeFileName($don->ref); $dir = $conf->don->dir_output . "/" . get_exdir($donref,2); $file = $dir . "/" . $donref . ".html"; } 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 503cf88f859..e5315309228 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -124,7 +124,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition } else { - $expref = sanitize_string($this->expe->ref); + $expref = sanitizeFileName($this->expe->ref); $dir = $conf->expedition_bon->dir_output . "/" . $expref; $file = $dir . "/" . $expref . ".pdf"; } 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 b681f53bd0f..565e4284d24 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php @@ -144,7 +144,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition } else { - $expref = sanitize_string($this->expe->ref); + $expref = sanitizeFileName($this->expe->ref); $dir = $conf->expedition_bon->dir_output . "/" . $expref; $file = $dir . "/" . $expref . ".pdf"; } diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/includes/modules/facture/modules_facture.php index d9ea1413cea..0d906bc656b 100644 --- a/htdocs/includes/modules/facture/modules_facture.php +++ b/htdocs/includes/modules/facture/modules_facture.php @@ -237,7 +237,7 @@ function facture_meta_create($db, $facid, $message="") if ($conf->facture->dir_output) { - $facref = sanitize_string($fac->ref); + $facref = sanitizeFileName($fac->ref); $dir = $conf->facture->dir_output . "/" . $facref ; $file = $dir . "/" . $facref . ".meta"; @@ -291,7 +291,7 @@ function facture_delete_preview($db, $facid) if ($conf->facture->dir_output) { - $facref = sanitize_string($fac->ref); + $facref = sanitizeFileName($fac->ref); $dir = $conf->facture->dir_output . "/" . $facref ; $file = $dir . "/" . $facref . ".pdf.png"; diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index 7aaf64aa3bf..88453639ac2 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -142,7 +142,7 @@ class pdf_crabe extends ModelePDFFactures } else { - $facref = sanitize_string($fac->ref); + $facref = sanitizeFileName($fac->ref); $dir = $conf->facture->dir_output . "/" . $facref; $file = $dir . "/" . $facref . ".pdf"; } diff --git a/htdocs/includes/modules/facture/pdf_huitre.modules.php b/htdocs/includes/modules/facture/pdf_huitre.modules.php index 0048a7df02c..a1a41068a5d 100644 --- a/htdocs/includes/modules/facture/pdf_huitre.modules.php +++ b/htdocs/includes/modules/facture/pdf_huitre.modules.php @@ -122,7 +122,7 @@ class pdf_huitre extends ModelePDFFactures } else { - $facref = sanitize_string($fac->ref); + $facref = sanitizeFileName($fac->ref); $dir = $conf->facture->dir_output . "/" . $facref; $file = $dir . "/" . $facref . ".pdf"; } diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php index 30e90368e17..159ccdff005 100644 --- a/htdocs/includes/modules/facture/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php @@ -130,7 +130,7 @@ class pdf_oursin extends ModelePDFFactures } else { - $facref = sanitize_string($fac->ref); + $facref = sanitizeFileName($fac->ref); $dir = $conf->facture->dir_output . "/" . $facref; $file = $dir . "/" . $facref . ".pdf"; } diff --git a/htdocs/includes/modules/fichinter/modules_fichinter.php b/htdocs/includes/modules/fichinter/modules_fichinter.php index c31f58deaea..52a062ff3ce 100644 --- a/htdocs/includes/modules/fichinter/modules_fichinter.php +++ b/htdocs/includes/modules/fichinter/modules_fichinter.php @@ -234,7 +234,7 @@ function fichinter_delete_preview($db, $fichinterid, $fichinterref='') if ($conf->fichinter->dir_output) { - $fichinterref = sanitize_string($fichinterref); + $fichinterref = sanitizeFileName($fichinterref); $dir = $conf->fichinter->dir_output . "/" . $fichinterref ; $file = $dir . "/" . $fichinterref . ".pdf.png"; $multiple = $file . "."; diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php index abeb4e66178..8b65218bf16 100644 --- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php +++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php @@ -107,7 +107,7 @@ class pdf_soleil extends ModelePDFFicheinter } } - $fichref = sanitize_string($fichinter->ref); + $fichref = sanitizeFileName($fichinter->ref); $dir = $conf->fichinter->dir_output; if (! eregi('specimen',$fichref)) $dir.= "/" . $fichref; $file = $dir . "/" . $fichref . ".pdf"; diff --git a/htdocs/includes/modules/livraison/modules_livraison.php b/htdocs/includes/modules/livraison/modules_livraison.php index a825f0f88b4..b271284e16f 100644 --- a/htdocs/includes/modules/livraison/modules_livraison.php +++ b/htdocs/includes/modules/livraison/modules_livraison.php @@ -217,7 +217,7 @@ function delivery_order_delete_preview($db, $deliveryid) if ($conf->livraison->dir_output) { - $deliveryref = sanitize_string($delivery->ref); + $deliveryref = sanitizeFileName($delivery->ref); $dir = $conf->livraison->dir_output . "/" . $deliveryref ; $file = $dir . "/" . $deliveryref . ".pdf.png"; diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php index 5ed929c883c..c7eed14cd2d 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php @@ -115,7 +115,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder } } - $deliveryref = sanitize_string($delivery->ref); + $deliveryref = sanitizeFileName($delivery->ref); $dir = $conf->livraison_bon->dir_output; 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 165386fbe12..9a36269732a 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php @@ -142,7 +142,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $nblignes = sizeof($delivery->lignes); - $deliveryref = sanitize_string($delivery->ref); + $deliveryref = sanitizeFileName($delivery->ref); $dir = $conf->livraison_bon->dir_output; if (! eregi('specimen',$deliveryref)) $dir.= "/" . $deliveryref; $file = $dir . "/" . $deliveryref . ".pdf"; diff --git a/htdocs/includes/modules/propale/modules_propale.php b/htdocs/includes/modules/propale/modules_propale.php index c84ab2fd2d7..3fc026ba8aa 100644 --- a/htdocs/includes/modules/propale/modules_propale.php +++ b/htdocs/includes/modules/propale/modules_propale.php @@ -246,7 +246,7 @@ function propale_delete_preview($db, $propalid, $propalref='') if ($conf->propal->dir_output) { - $propalref = sanitize_string($propalref); + $propalref = sanitizeFileName($propalref); $dir = $conf->propal->dir_output . "/" . $propalref ; $file = $dir . "/" . $propalref . ".pdf.png"; $multiple = $file . "."; diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index 87afdeb1ce1..cf47312de9f 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -140,7 +140,7 @@ class pdf_propale_azur extends ModelePDFPropales } else { - $propref = sanitize_string($propale->ref); + $propref = sanitizeFileName($propale->ref); $dir = $conf->propal->dir_output . "/" . $propref; $file = $dir . "/" . $propref . ".pdf"; } diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php index cff6ece6c10..01d1a07095e 100644 --- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php @@ -124,7 +124,7 @@ class pdf_propale_jaune extends ModelePDFPropales } else { - $propref = sanitize_string($propale->ref); + $propref = sanitizeFileName($propale->ref); $dir = $conf->propal->dir_output . "/" . $propref; $file = $dir . "/" . $propref . ".pdf"; } diff --git a/htdocs/includes/triggers/interface_modNotification_Notification.class.php b/htdocs/includes/triggers/interface_modNotification_Notification.class.php index 865f434ca1f..cf5a843b7a0 100644 --- a/htdocs/includes/triggers/interface_modNotification_Notification.class.php +++ b/htdocs/includes/triggers/interface_modNotification_Notification.class.php @@ -106,7 +106,7 @@ class InterfaceNotification dolibarr_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); $action_notify = 2; - $ref = sanitize_string($object->ref); + $ref = sanitizeFileName($object->ref); $filepdf = $conf->facture->dir_output . '/' . $ref . '/' . $ref . '.pdf'; $mesg = 'La facture '.$object->ref." a été validée.\n"; @@ -119,7 +119,7 @@ class InterfaceNotification dolibarr_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); $action_notify = 1; - $ref = sanitize_string($object->ref); + $ref = sanitizeFileName($object->ref); $filepdf = $conf->facture->dir_output . '/' . $ref . '/' . $ref . '.pdf'; $mesg = 'La fiche intervention '.$object->ref." a été validée.\n"; @@ -132,7 +132,7 @@ class InterfaceNotification dolibarr_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); $action_notify = 3; - $ref = sanitize_string($object->ref); + $ref = sanitizeFileName($object->ref); $filepdf = $conf->fournisseur->commande->dir_output . '/' . $ref . '/' . $ref . '.pdf'; $mesg = 'La commande fournisseur '.$object->ref." a été validée.\n"; diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 81d210be37d..dd3579d7c16 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -75,29 +75,26 @@ function check_mail ($mail) } /** - \brief Nettoie chaine de caractere iso des accents + \brief Nettoie chaine de caractere des accents \param str Chaine a nettoyer \return string Chaine nettoyee */ function unaccent_isostring($str) { - $translation = array( - "\xE0" => "a", - "\xE1" => "a", - "\xE2" => "a", - "\xE8" => "e", - "\xE9" => "e", - "\xEA" => "e", - "\xEB" => "e", - "\xEE" => "i", - "\xEF" => "i", - "\xF4" => "o", - "\xF6" => "o", - "\xFB" => "u", - "\xFC" => "u" - ); - - return str_replace(array_keys($translation), array_values($translation), $str); + if (utf8_check($str)) + { + // TODO add utf8 convertion + $translationutf=array( ); + return str_replace(array_keys($translationutf), array_values($translationutf), $str); + } + else + { + $translationiso=array( "\xE0" => "a", "\xE1" => "a", "\xE2" => "a", + "\xE8" => "e", "\xE9" => "e", "\xEA" => "e", "\xEB" => "e", + "\xEE" => "i", "\xEF" => "i", + "\xF4" => "o", "\xF6" => "o", "\xFB" => "u", "\xFC" => "u"); + return str_replace(array_keys($translationiso), array_values($translationiso), $str); + } } /** @@ -116,6 +113,17 @@ function sanitize_string($str,$newstr='_') return str_replace($forbidden_chars_to_underscore,$newstr,str_replace($forbidden_chars_to_remove,"",$str)); } +/** + * \brief Nettoie chaine de caractere de ces caracteres speciaux + * \remarks Fonction appelee par exemple pour definir un nom de fichier depuis un identifiant chaine libre + * \param str String to clean + * \param newstr String to replace bad chars by + * \return string String cleaned (a-zA-Z_) + */ +function sanitizeFileName($str,$newstr='_') +{ + return sanitize_string(unaccent_isostring($str,$newstr)); +} /** * \brief Returns text escaped for inclusion in javascript code diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php index e0a19876b6b..5f493b4a287 100644 --- a/htdocs/livraison/fiche.php +++ b/htdocs/livraison/fiche.php @@ -565,7 +565,7 @@ else * Documents generated */ - $livraisonref = sanitize_string($livraison->ref); + $livraisonref = sanitizeFileName($livraison->ref); $filedir = $conf->livraison_bon->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 126b2660a98..73bf220665f 100644 --- a/htdocs/livraison/livraison.class.php +++ b/htdocs/livraison/livraison.class.php @@ -422,7 +422,7 @@ class Livraison extends CommonObject } // On efface le repertoire de pdf provisoire - $livraisonref = sanitize_string($this->ref); + $livraisonref = sanitizeFileName($this->ref); if ($conf->expedition->dir_output) { $dir = $conf->livraison->dir_output . "/" . $livraisonref ; @@ -561,7 +561,7 @@ class Livraison extends CommonObject $this->db->commit(); // On efface le repertoire de pdf provisoire - $livref = sanitize_string($this->ref); + $livref = sanitizeFileName($this->ref); if ($conf->livraison->dir_output) { $dir = $conf->livraison->dir_output . "/" . $livref ; diff --git a/htdocs/product.class.php b/htdocs/product.class.php index e0e0e8439c1..861c2d15f66 100644 --- a/htdocs/product.class.php +++ b/htdocs/product.class.php @@ -131,7 +131,7 @@ class Product extends CommonObject */ function check() { - $this->ref = sanitize_string(stripslashes($this->ref)); + $this->ref = sanitizeFileName(stripslashes($this->ref)); $err = 0; if (strlen(trim($this->ref)) == 0) diff --git a/htdocs/product/document.php b/htdocs/product/document.php index fc2e8376f0a..6ea89935e00 100755 --- a/htdocs/product/document.php +++ b/htdocs/product/document.php @@ -68,7 +68,7 @@ if ($_GET['id'] || $_GET["ref"]) if ($_GET["ref"]) $result = $product->fetch('',$_GET["ref"]); if ($_GET["id"]) $result = $product->fetch($_GET["id"]); - $upload_dir = $conf->produit->dir_output.'/'.sanitize_string($product->ref); + $upload_dir = $conf->produit->dir_output.'/'.sanitizeFileName($product->ref); } $modulepart='produit'; diff --git a/htdocs/propal.class.php b/htdocs/propal.class.php index 7f19b740210..7a8bdfd80a2 100644 --- a/htdocs/propal.class.php +++ b/htdocs/propal.class.php @@ -1418,7 +1418,7 @@ class Propal extends CommonObject { // On efface le r�pertoire du pdf - $propalref = sanitize_string($this->ref); + $propalref = sanitizeFileName($this->ref); if ($conf->propal->dir_output) { $dir = $conf->propal->dir_output . "/" . $propalref ; diff --git a/htdocs/societe.class.php b/htdocs/societe.class.php index cd9b2429cce..ad72a5c904a 100644 --- a/htdocs/societe.class.php +++ b/htdocs/societe.class.php @@ -23,18 +23,18 @@ */ /** - \file htdocs/societe.class.php - \ingroup societe - \brief Fichier de la classe des societes - \version $Id$ + * \file htdocs/societe.class.php + * \ingroup societe + * \brief Fichier de la classe des societes + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT."/commonobject.class.php"); /** - \class Societe - \brief Classe permettant la gestion des societes + * \class Societe + * \brief Classe permettant la gestion des societes */ class Societe extends CommonObject { @@ -336,7 +336,7 @@ class Societe extends CommonObject $this->prefix_comm=trim($this->prefix_comm); $this->tva_assuj=trim($this->tva_assuj); - $this->tva_intra=sanitize_string($this->tva_intra,''); + $this->tva_intra=sanitizeFileName($this->tva_intra,''); $this->capital=trim($this->capital); if (strlen($this->capital) == 0) $this->capital = 0; diff --git a/htdocs/telephonie/client/facture.php b/htdocs/telephonie/client/facture.php index ad109f64e7e..7cf5d379025 100644 --- a/htdocs/telephonie/client/facture.php +++ b/htdocs/telephonie/client/facture.php @@ -62,7 +62,7 @@ if ($_POST["action"] == 'send' || $_POST["action"] == 'relance') $fac = new Facture($db,"",$_POST["facid"]); if ( $fac->fetch($_POST["facid"]) ) { - $facref = sanitize_string($fac->ref); + $facref = sanitizeFileName($fac->ref); $file = $conf->facture->dir_output . "/" . $facref . "/" . $facref . ".pdf"; if (is_readable($file)) @@ -497,7 +497,7 @@ if ($_GET["facid"] > 0) * REFFACTURE-XXXXXX-detail.pdf ou XXXXX est une forme diverse */ - $facref = sanitize_string($fac->ref); + $facref = sanitizeFileName($fac->ref); $file = $conf->facture->dir_output . "/" . $facref . "/" . $facref . ".pdf"; $relativepath = "${facref}/${facref}.pdf";