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

Timestamp:

09/11/2014 07:06:33 PM (10 years ago)

Author:

wonderboymusic

Message:

Update getID3 library to 1.9.8.

Changes:
​https://github.com/JamesHeinrich/getID3/compare/1.9.7...v1.9.8

Fixes #29627.

File:

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

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

@@ -4 +4 @@
 //  available at http://getid3.sourceforge.net                 //
 //            or http://www.getid3.org                         //
+//          also https://github.com/JamesHeinrich/getID3       //
 /////////////////////////////////////////////////////////////////
 //                                                             //
@@ -283 +284 @@
             } else {
                 throw new Exception('ERROR: Cannot have signed integers larger than '.(8 * PHP_INT_SIZE).'-bits ('.strlen($byteword).') in self::BigEndian2Int()');
-                break;
             }
         }
@@ -636 +636 @@
         if (is_readable($filename_source) && is_file($filename_source) && ($fp_src = fopen($filename_source, 'rb'))) {
             if (($fp_dest = fopen($filename_dest, 'wb'))) {
-                if (fseek($fp_src, $offset, SEEK_SET) == 0) {
+                if (fseek($fp_src, $offset) == 0) {
                     $byteslefttowrite = $length;
                     while (($byteslefttowrite > 0) && ($buffer = fread($fp_src, min($byteslefttowrite, getID3::FREAD_BUFFER_SIZE)))) {
@@ -987 +987 @@
     }
 
+    public static function recursiveMultiByteCharString2HTML($data, $charset='ISO-8859-1') {
+        if (is_string($data)) {
+            return self::MultiByteCharString2HTML($data, $charset);
+        } elseif (is_array($data)) {
+            $return_data = array();
+            foreach ($data as $key => $value) {
+                $return_data[$key] = self::recursiveMultiByteCharString2HTML($value, $charset);
+            }
+            return $return_data;
+        }
+        // integer, float, objects, resources, etc
+        return $data;
+    }
 
     public static function MultiByteCharString2HTML($string, $charset='ISO-8859-1') {
@@ -1211 +1224 @@
                                 foreach ($ThisFileInfo['comments'][$tagname] as $existingkey => $existingvalue) {
                                     $oldvaluelength = strlen(trim($existingvalue));
-                                    if (($newvaluelength > $oldvaluelength) && (substr(trim($value), 0, strlen($existingvalue)) == $existingvalue)) {
+                                    if ((strlen($existingvalue) > 10) && ($newvaluelength > $oldvaluelength) && (substr(trim($value), 0, strlen($existingvalue)) == $existingvalue)) {
                                         $ThisFileInfo['comments'][$tagname][$existingkey] = trim($value);
-                                        break 2;
+                                        //break 2;
+                                        break;
                                     }
                                 }
@@ -1220 +1234 @@
                             if (is_array($value) || empty($ThisFileInfo['comments'][$tagname]) || !in_array(trim($value), $ThisFileInfo['comments'][$tagname])) {
                                 $value = (is_string($value) ? trim($value) : $value);
-                                $ThisFileInfo['comments'][$tagname][] = $value;
+                                if (!is_numeric($key)) {
+                                    $ThisFileInfo['comments'][$tagname][$key] = $value;
+                                } else {
+                                    $ThisFileInfo['comments'][$tagname][]     = $value;
+                                }
                             }
                         }
@@ -1228 +1246 @@
 
             // Copy to ['comments_html']
-            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('�', '', self::MultiByteCharString2HTML($value, $ThisFileInfo['encoding']));
+            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('�', '', self::MultiByteCharString2HTML($value, $ThisFileInfo['encoding']));
+                        }
                     }
                 }
             }
+
         }
         return true;
@@ -1340 +1361 @@
         return $filesize;
     }
+
+
+    /**
+    * Workaround for Bug #37268 (https://bugs.php.net/bug.php?id=37268)
+    * @param string $path A path.
+    * @param string $suffix If the name component ends in suffix this will also be cut off.
+    * @return string
+    */
+    public static function mb_basename($path, $suffix = null) {
+        $splited = preg_split('#/#', rtrim($path, '/ '));
+        return substr(basename('X'.$splited[count($splited) - 1], $suffix), 1);
+    }
+
 }