Evarisk#3425 [DU] fix: check ref and sanitized ref to send DU by mail

evarisk-micka · Oct 17, 2023 · ef4ee2d · ef4ee2d
1 parent 43e0de7
commit ef4ee2d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/view/digiriskstandard/digiriskstandard_riskassessmentdocument.php b/view/digiriskstandard/digiriskstandard_riskassessmentdocument.php
@@ -472,10 +472,12 @@
 
     if (!in_array($object->element, array('societe', 'user', 'member'))) {
         include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-        $fileparams = dol_dir_list($diroutput, 'files', 0, '', [], 'date', 'SORT_DESC');
-        $lastRef    = pathinfo($fileparams[0]['name']);
+        $fileparams       = dol_dir_list($diroutput, 'files', 0, '', [], 'date', 'SORT_DESC');
+        $lastRef          = pathinfo($fileparams[0]['name']);
+        $lastRefSanitized = dol_sanitizeFileName($lastRef['filename']);
+        $lastRefSanitized = str_replace(' ', '_', $lastRefSanitized);
         foreach ($fileparams as $fileparam) {
-            preg_match('/' . $lastRef['filename'] . '/', $fileparam['name']) ? $filevalue[] = $fileparam['fullname'] : 0;
+            preg_match('/' . $lastRef['filename'] . '/', $fileparam['name']) || preg_match('/' . $lastRefSanitized . '/', $fileparam['name']) ? $filevalue[] = $fileparam['fullname'] : 0;
         }
     }