Changeset 961328

Timestamp:

08/06/2014 08:49:49 PM (12 years ago)

Author:

zubaka

Message:

Fix links/file name problem. For utf8 strings previous fix works bad, so - added some tests.

Location:

zbplayer

Files:

• tags/2.1.9/zbPlayer.php (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)
• trunk/zbPlayer.admin.php (modified) (1 diff)
• trunk/zbPlayer.php (modified) (7 diffs)

zbplayer/tags/2.1.9/zbPlayer.php

@@ -208 +208 @@
 }
 
-
+/**
+ * Test if incoming parameter contain utf8 symbols
+ *
+ * @param mixed(string|array) $mixed
+ * @return boolean
+ */
 function zbp_is_utf8($mixed)
 {
+    if (!function_exists('mb_detect_encoding')) {
+        return true;
+    }
     if (is_array($mixed)) {
         foreach ($mixed as $name) {

zbplayer/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.5
 Tested up to: 3.9.2
-Stable tag: 2.1.8
+Stable tag: 2.1.9
 License: Dual Licensed under the MIT and GPLv2 or later
 
@@ -52 +52 @@
 == Changelog ==
 
-= 2.1.8 =
+= 2.1.8/9 =
 *    Fix links/file name problem. Sometime flash player did not understand correctly file names to play.
 

zbplayer/trunk/zbPlayer.admin.php

@@ -7 +7 @@
  *
  *  zbPlayer.admin.php
- *  Release 2.1.8 August 2014
+ *  Release 2.1.9 August 2014
  */
 // connect wordpress color picker

zbplayer/trunk/zbPlayer.php

@@ -4 +4 @@
 Plugin URI: http://gilevich.com/portfolio/zbplayer
 Description: Converts mp3 files links to a small flash player and a link to download file mp3 file. Also you can share your mp3 files with that plugin.
-Version: 2.1.8
+Version: 2.1.9
 Author: Vladimir Gilevich
 Author URI: http://gilevich.com/
@@ -10 +10 @@
 */
 
-define('ZBPLAYER_VERSION', "2.1.8");
+define('ZBPLAYER_VERSION', "2.1.9");
 define('ZBPLAYER_DEFAULT_WIDTH', "500");
 define('ZBPLAYER_DEFAULT_INITIALVOLUME', "60");
@@ -107 +107 @@
             }
             if (count($links)) {
+                // test on utf-8 in links
+                if (zbp_is_utf8($links)) {
+                    foreach ($links as $key => $link) {
+                        $links[$key] = zbp_urlencode($link);
+                    }
+                    $links = implode(',', $links);
+                    $encode = '';
+                } else {
+                    $links = zbp_encode_source(implode(',', $links));
+                    $encode = '&encode=yes';
+                }
                 $loop = get_option('zbp_loop') == 'true' ? 'yes' : 'no';
                 $autostart = get_option('zbp_autostart') == 'true' ? 'yes' : 'no';
@@ -117 +128 @@
                     . ' flashvars="loop='.$loop.'&animation='.$animation.'&playerID=zbPlayer&initialvolume='.$initialvolume . zbp_get_color_srt()
                     . $titles
-                    . '&encode=yes&soundFile='.zbp_encode_source(implode(',',$links))
+                    . $encode.'&soundFile='.$links
                     . '&amp;autostart='.$autostart.'" type="application/x-shockwave-flash" class="player" src="'.plugin_dir_url(__FILE__).'data/player.swf" id="zbPlayer"/></div>';
                 $content = str_replace(get_option('zbp_collect_field'), $player, $content);
@@ -185 +196 @@
     $songname .= !empty($songname) ? '<br/>' : '';
     $titles = (get_option('zbp_id3') == 'true') ? '' : '&amp;titles='.urlencode($titles);
-
+    $encode = zbp_is_utf8($link) ? '' : '&amp;encode=yes';
     $ret = '<div class="zbPlayer">' . $songname
         . $shareInline
         . '<embed width="'.$width.'" height="26" wmode="transparent" menu="false" quality="high"'
         . ' flashvars="loop='.$loop.'&animation='.$animation.'&amp;playerID=zbPlayer&amp;initialvolume='.$initialvolume . zbp_get_color_srt()
-        . $titles.'&amp;encode=yes&amp;soundFile='.zbp_encode_source($link)
+        . $titles.$encode.'&amp;soundFile='.zbp_encode_source($link)
         . '&amp;autostart='.$autostart.'" type="application/x-shockwave-flash" class="zbPlayerFlash" src="'.plugin_dir_url(__FILE__).'data/player.swf" id="zbPlayer"/>';
     $ret .= '<audio class="zbPlayerNative" src="'.$link.'" controls preload="none"></audio>';
@@ -198 +209 @@
 
 /**
+ * Test if incoming parameter contain utf8 symbols
+ *
+ * @param mixed(string|array) $mixed
+ * @return boolean
+ */
+function zbp_is_utf8($mixed)
+{
+    if (!function_exists('mb_detect_encoding')) {
+        return true;
+    }
+    if (is_array($mixed)) {
+        foreach ($mixed as $name) {
+            if (mb_detect_encoding($name) == 'UTF-8') {
+                return true;
+            }
+        }
+    } else {
+        if (mb_detect_encoding($mixed) == 'UTF-8') {
+            return true;
+        }
+    }
+    return false;
+}
+
+/**
  * Encodes the given string for flash player
  *
@@ -205 +241 @@
 function zbp_encode_source($string)
 {
+    if (zbp_is_utf8($string)) {
+        return zbp_urlencode($string);
+    }
     $source = utf8_decode($string);
     $ntexto = "";