From 250886fd24fedf570122bcaa069a6e5b77f20423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20David?= Date: Mon, 19 Sep 2022 09:48:43 +0200 Subject: [PATCH] #2342 [DigiriskDocuments] fix: remove non-ascii characters from document name --- .../groupmentdocument/modules_groupmentdocument.php | 1 + .../listingrisksaction/modules_listingrisksaction.php | 1 + .../listingrisksphoto/modules_listingrisksphoto.php | 1 + .../riskassessmentdocument/modules_riskassessmentdocument.php | 1 + .../workunitdocument/modules_workunitdocument.php | 1 + 5 files changed, 5 insertions(+) diff --git a/core/modules/digiriskdolibarr/digiriskdocuments/groupmentdocument/modules_groupmentdocument.php b/core/modules/digiriskdolibarr/digiriskdocuments/groupmentdocument/modules_groupmentdocument.php index aa4ea19d4..12fd33f9d 100644 --- a/core/modules/digiriskdolibarr/digiriskdocuments/groupmentdocument/modules_groupmentdocument.php +++ b/core/modules/digiriskdolibarr/digiriskdocuments/groupmentdocument/modules_groupmentdocument.php @@ -109,6 +109,7 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails $filename = $date . '_' . $digiriskelement->ref . '_' . $objectref . '_' . $digiriskelement->label . '.odt'; $filename = str_replace(' ', '_', $filename); $filename = dol_sanitizeFileName($filename); + $filename = preg_replace('/[’‘‹›‚]/u', '', $filename); $object->last_main_doc = $filename; diff --git a/core/modules/digiriskdolibarr/digiriskdocuments/listingrisksaction/modules_listingrisksaction.php b/core/modules/digiriskdolibarr/digiriskdocuments/listingrisksaction/modules_listingrisksaction.php index ca134476e..70d53d7d3 100644 --- a/core/modules/digiriskdolibarr/digiriskdocuments/listingrisksaction/modules_listingrisksaction.php +++ b/core/modules/digiriskdolibarr/digiriskdocuments/listingrisksaction/modules_listingrisksaction.php @@ -117,6 +117,7 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails } $filename = str_replace(' ', '_', $filename); $filename = dol_sanitizeFileName($filename); + $filename = preg_replace('/[’‘‹›‚]/u', '', $filename); $object->last_main_doc = $filename; diff --git a/core/modules/digiriskdolibarr/digiriskdocuments/listingrisksphoto/modules_listingrisksphoto.php b/core/modules/digiriskdolibarr/digiriskdocuments/listingrisksphoto/modules_listingrisksphoto.php index 9d410dc35..2298f5145 100644 --- a/core/modules/digiriskdolibarr/digiriskdocuments/listingrisksphoto/modules_listingrisksphoto.php +++ b/core/modules/digiriskdolibarr/digiriskdocuments/listingrisksphoto/modules_listingrisksphoto.php @@ -116,6 +116,7 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails } $filename = str_replace(' ', '_', $filename); $filename = dol_sanitizeFileName($filename); + $filename = preg_replace('/[’‘‹›‚]/u', '', $filename); $object->last_main_doc = $filename; diff --git a/core/modules/digiriskdolibarr/digiriskdocuments/riskassessmentdocument/modules_riskassessmentdocument.php b/core/modules/digiriskdolibarr/digiriskdocuments/riskassessmentdocument/modules_riskassessmentdocument.php index 8f5558e57..6294d87be 100644 --- a/core/modules/digiriskdolibarr/digiriskdocuments/riskassessmentdocument/modules_riskassessmentdocument.php +++ b/core/modules/digiriskdolibarr/digiriskdocuments/riskassessmentdocument/modules_riskassessmentdocument.php @@ -108,6 +108,7 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails $filename = $date . '_' . $objectref . '_' . $conf->global->MAIN_INFO_SOCIETE_NOM . '.odt'; $filename = str_replace(' ', '_', $filename); $filename = dol_sanitizeFileName($filename); + $filename = preg_replace('/[’‘‹›‚]/u', '', $filename); $object->last_main_doc = $filename; diff --git a/core/modules/digiriskdolibarr/digiriskdocuments/workunitdocument/modules_workunitdocument.php b/core/modules/digiriskdolibarr/digiriskdocuments/workunitdocument/modules_workunitdocument.php index 9f5382b01..c2ad52908 100644 --- a/core/modules/digiriskdolibarr/digiriskdocuments/workunitdocument/modules_workunitdocument.php +++ b/core/modules/digiriskdolibarr/digiriskdocuments/workunitdocument/modules_workunitdocument.php @@ -108,6 +108,7 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails $filename = $date . '_' . $digiriskelement->ref . '_' . $objectref . '_' . $conf->global->MAIN_INFO_SOCIETE_NOM . '.odt'; $filename = str_replace(' ', '_', $filename); $filename = dol_sanitizeFileName($filename); + $filename = preg_replace('/[’‘‹›‚]/u', '', $filename); $object->last_main_doc = $filename;