Fix: rename function sanitizeFileName into dol_sanitizeFileName to avoir conflict with fckeditor

This commit is contained in:
Laurent Destailleur
2009-04-29 18:02:50 +00:00
parent 407d4e7d0b
commit 7322cd136e
63 changed files with 347 additions and 347 deletions

View File

@@ -75,7 +75,7 @@ if (! $commande->fetch($_GET['id'],$_GET['ref']) > 0)
// Envoi fichier
if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
$upload_dir = $conf->commande->dir_output . "/" . sanitizeFileName($commande->ref);
$upload_dir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($commande->ref);
if (! is_dir($upload_dir)) create_exdir($upload_dir);
if (is_dir($upload_dir))
@@ -97,7 +97,7 @@ if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
// Delete
if ($action=='delete')
{
$upload_dir = $conf->commande->dir_output . "/" . sanitizeFileName($commande->ref);
$upload_dir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($commande->ref);
$file = $upload_dir . '/' . urldecode($_GET['urlfile']);
dol_delete_file($file);
$mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>';
@@ -114,7 +114,7 @@ $html = new Form($db);
if ($id > 0 || ! empty($ref))
{
$upload_dir = $conf->commande->dir_output.'/'.sanitizeFileName($commande->ref);
$upload_dir = $conf->commande->dir_output.'/'.dol_sanitizeFileName($commande->ref);
$societe = new Societe($db);
$societe->fetch($commande->socid);