Changeset 518 for trunk/lib/Upload.inc.php

Timestamp:

May 1, 2015 1:15:16 AM (9 years ago)

Author:

anonymous

Message:

Non-breaking function changes to App and Utilities.

File:

• trunk/lib/Upload.inc.php (modified) (2 diffs)

trunk/lib/Upload.inc.php

@@ -304 +304 @@
 
             // Clean the file name of bad characters.
-            $file_name = $this->cleanFileName($file_name);
+            $file_name = cleanFileName($file_name);
 
             // FINAL path and file name, lowercase extension.
@@ -475 +475 @@
 
     /**
-     * Removes non-latin characters from file name, using htmlentities to convert known weirdos into regular squares.
-     *
-     * @access  public
-     * @param   string  $file_name  A name of a file.
-     * @return  string              The same name, but cleaned.
-     */
-    public function cleanFileName($file_name)
-    {
-        $file_name = preg_replace(array(
-            '/&([a-z]{1,2})(?:acute|cedil|circ|grave|lig|orn|ring|slash|th|tilde|uml|caron);/ui',
-            '/&(?:amp);/ui',
-            '/[&;]+/u',
-            '/[^a-zA-Z0-9()@._=+-]+/u',
-            '/^_+|_+$/u'
-        ), array(
-            '$1',
-            'and',
-            '',
-            '_',
-            ''
-        ), htmlentities($file_name, ENT_NOQUOTES | ENT_IGNORE, 'UTF-8'));
-        return mb_substr($file_name, 0, 250);
-    }
-
-
-    /**
      * Returns the extension of a file name, or an empty string if non exists.
      *