Changeset 773 for trunk

Timestamp:

Jul 21, 2022 1:07:50 AM (22 months ago)

Author:

anonymous

Message:

Accept separator argument for cleanFileName()

File:

• trunk/lib/Utilities.inc.php (modified) (1 diff)

trunk/lib/Utilities.inc.php

@@ -761 +761 @@
  * @access  public
  * @param   string  $file_name  A name of a file.
+ * @param   string  $separator  The_separator_used_to_delimit_filename_parts.
  * @return  string              The same name, but cleaned.
  */
-function cleanFileName($file_name)
-{
-    $app =& App::getInstance();
-
-    $file_name = preg_replace(['/[^a-zA-Z0-9()@._=+-]+/' . $app->getParam('preg_u'), '/^_+|_+$/' . $app->getParam('preg_u')], ['_', ''], simplifyAccents($file_name));
+function cleanFileName($file_name, $separator='_')
+{
+    $app =& App::getInstance();
+
+    $file_name = preg_replace([
+        sprintf('/[^a-zA-Z0-9()@._=+-]+/%s', $app->getParam('preg_u')),
+        sprintf('/^%1$s+|%1$s+$/%2$s', $separator, $app->getParam('preg_u')),
+    ], [
+        $separator,
+        ''
+    ], simplifyAccents($file_name));
     return mb_substr($file_name, 0, 250);
 }