Changeset 518 for trunk/lib/Utilities.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/Utilities.inc.php (modified) (2 diffs)

trunk/lib/Utilities.inc.php

@@ -82 +82 @@
     if (!empty($var)) {
         ?>
-        <script type="text/javascript" charset="utf-8">
+        <script type="text/javascript">
         /* <![CDATA[ */
-        window.console && console.log('<?php printf('%s: %s (on line %s of %s)', $prefix, str_replace("'", "\\'", getDump($var, true)), $line, $file); ?>');
+        console.log('<?php printf('%s: %s (on line %s of %s)', $prefix, str_replace("'", "\\'", getDump($var, true)), $line, $file); ?>');
         /* ]]> */
         </script>
@@ -536 +536 @@
 }
 
+/**
+ * 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.
+ */
+function cleanFileName($file_name)
+{
+    $app =& App::getInstance();
+
+    $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, $app->getParam('character_set')));
+    return mb_substr($file_name, 0, 250);
+}
+
 /*
 * Convert a php.ini value (8M, 512K, etc), into integer value of bytes.