Changeset 48278 for trunk/src/wp-includes/ID3/getid3.lib.php

Timestamp:

07/02/2020 03:46:17 PM (7 months ago)

Author:

desrosj

Message:

External Libraries: Update getID3 to version 1.9.20.

A full list of changes in this update can be found on GitHub: ​https://github.com/JamesHeinrich/getID3/compare/v1.9.19...v1.9.20.

Props hareesh-pillai, desrosj.
Previously [47601-47604].
Fixes #49945.

File:

• trunk/src/wp-includes/ID3/getid3.lib.php (modified) (6 diffs)

trunk/src/wp-includes/ID3/getid3.lib.php

@@ -682 +682 @@
     public static function array_max($arraydata, $returnkey=false) {
         $maxvalue = false;
-        $maxkey = false;
+        $maxkey   = false;
         foreach ($arraydata as $key => $value) {
             if (!is_array($value)) {
-                if ($value > $maxvalue) {
+                if (($maxvalue === false) || ($value > $maxvalue)) {
                     $maxvalue = $value;
                     $maxkey = $key;
@@ -702 +702 @@
     public static function array_min($arraydata, $returnkey=false) {
         $minvalue = false;
-        $minkey = false;
+        $minkey   = false;
         foreach ($arraydata as $key => $value) {
             if (!is_array($value)) {
-                if ($value > $minvalue) {
+                if (($minvalue === false) || ($value < $minvalue)) {
                     $minvalue = $value;
                     $minkey = $key;
@@ -1530 +1530 @@
     /**
      * @param array $ThisFileInfo
+     * @param bool  $option_tags_html default true (just as in the main getID3 class)
      *
      * @return bool
      */
-    public static function CopyTagsToComments(&$ThisFileInfo) {
-
+    public static function CopyTagsToComments(&$ThisFileInfo, $option_tags_html=true) {
         // Copy all entries from ['tags'] into common ['comments']
         if (!empty($ThisFileInfo['tags'])) {
+            if (isset($ThisFileInfo['tags']['id3v1'])) {
+                // bubble ID3v1 to the end, if present to aid in detecting bad ID3v1 encodings
+                $ID3v1 = $ThisFileInfo['tags']['id3v1'];
+                unset($ThisFileInfo['tags']['id3v1']);
+                $ThisFileInfo['tags']['id3v1'] = $ID3v1;
+                unset($ID3v1);
+            }
             foreach ($ThisFileInfo['tags'] as $tagtype => $tagarray) {
                 foreach ($tagarray as $tagname => $tagdata) {
@@ -1555 +1562 @@
                                     }
                                 }
+                                if (function_exists('mb_convert_encoding')) {
+                                    if (trim($value) == trim(substr(mb_convert_encoding($existingvalue, $ThisFileInfo['id3v1']['encoding'], $ThisFileInfo['encoding']), 0, 30))) {
+                                        // value stored in ID3v1 appears to be probably the multibyte value transliterated (badly) into ISO-8859-1 in ID3v1.
+                                        // As an example, Foobar2000 will do this if you tag a file with Chinese or Arabic or Cyrillic or something that doesn't fit into ISO-8859-1 the ID3v1 will consist of mostly "?" characters, one per multibyte unrepresentable character
+                                        break 2;
+                                    }
+                                }
 
                             } elseif (!is_array($value)) {
@@ -1563 +1577 @@
                                     if ((strlen($existingvalue) > 10) && ($newvaluelength > $oldvaluelength) && (substr(trim($value), 0, strlen($existingvalue)) == $existingvalue)) {
                                         $ThisFileInfo['comments'][$tagname][$existingkey] = trim($value);
-                                        //break 2;
                                         break;
                                     }
@@ -1598 +1611 @@
             }
 
-            // Copy to ['comments_html']
-            if (!empty($ThisFileInfo['comments'])) {
-                foreach ($ThisFileInfo['comments'] as $field => $values) {
-                    if ($field == 'picture') {
-                        // pictures can take up a lot of space, and we don't need multiple copies of them
-                        // let there be a single copy in [comments][picture], and not elsewhere
-                        continue;
-                    }
-                    foreach ($values as $index => $value) {
-                        if (is_array($value)) {
-                            $ThisFileInfo['comments_html'][$field][$index] = $value;
-                        } else {
-                            $ThisFileInfo['comments_html'][$field][$index] = str_replace('&#0;', '', self::MultiByteCharString2HTML($value, $ThisFileInfo['encoding']));
+            if ($option_tags_html) {
+                // Copy ['comments'] to ['comments_html']
+                if (!empty($ThisFileInfo['comments'])) {
+                    foreach ($ThisFileInfo['comments'] as $field => $values) {
+                        if ($field == 'picture') {
+                            // pictures can take up a lot of space, and we don't need multiple copies of them
+                            // let there be a single copy in [comments][picture], and not elsewhere
+                            continue;
+                        }
+                        foreach ($values as $index => $value) {
+                            if (is_array($value)) {
+                                $ThisFileInfo['comments_html'][$field][$index] = $value;
+                            } else {
+                                $ThisFileInfo['comments_html'][$field][$index] = str_replace('&#0;', '', self::MultiByteCharString2HTML($value, $ThisFileInfo['encoding']));
+                            }
                         }
                     }