From e5ea53f8ac523c73db7b957e23d1648f905f8dea Mon Sep 17 00:00:00 2001
From: paul <paul@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Tue, 13 Feb 2007 16:42:20 +0000
Subject: [PATCH] Fix for #2186 - funky characters in file names cause import
 script to crash.

---
 .../modules/storageServer/var/StoredFile.php    | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/campcaster/src/modules/storageServer/var/StoredFile.php b/campcaster/src/modules/storageServer/var/StoredFile.php
index ec3587694..457bb1201 100644
--- a/campcaster/src/modules/storageServer/var/StoredFile.php
+++ b/campcaster/src/modules/storageServer/var/StoredFile.php
@@ -54,11 +54,14 @@ function camp_add_metadata(&$p_mdata, $p_key, $p_val, $p_inputEncoding='iso-8859
     if (!is_null($p_val)) {
         $data = $p_val;
         $outputEncoding = 'UTF-8';
-        if (function_exists('iconv') && ($p_inputEncoding != $outputEncoding) ) {
-            $data = @iconv($p_inputEncoding, $outputEncoding, $data);
-            if ($data === FALSE) {
+        //if (function_exists('iconv') && ($p_inputEncoding != $outputEncoding) ) {
+        if (function_exists('iconv') && is_string($p_val)) {
+            $newData = @iconv($p_inputEncoding, $outputEncoding, $data);
+            if ($newData === FALSE) {
                 echo "Warning: convert $key data to unicode failed\n";
-                $data = $p_val;  // fallback
+            } elseif ($newData != $data) {
+                echo "Converted string: '$data' (".gettype($data).") -> '$newData' (".gettype($newData).").\n";
+                $data = $newData;
             }
         }
         $p_mdata[$p_key] = trim($data);
@@ -214,7 +217,8 @@ function camp_get_audio_metadata($p_filename, $p_testonly = false)
     foreach ($flds as $key => $getid3keys) {
         foreach ($getid3keys as $getid3key) {
             $path = $getid3key["path"];
-            $ignoreEnc = isset($getid3key["ignoreEnc"])?$getid3key["ignoreEnc"]:FALSE;
+            $ignoreEnc = isset($getid3key["ignoreEnc"])?
+                $getid3key["ignoreEnc"]:FALSE;
             $dataPath = isset($getid3key["dataPath"])?$getid3key["dataPath"]:"";
             $encPath = isset($getid3key["encPath"])?$getid3key["encPath"]:"";
             $enc = "UTF-8";
@@ -222,6 +226,9 @@ function camp_get_audio_metadata($p_filename, $p_testonly = false)
             $tagElement = "\$infoFromFile$path$dataPath";
             eval("\$tagExists = isset($tagElement);");
             if ($tagExists) {
+                //echo "ignore encoding: ".($ignoreEnc?"yes":"no")."\n";
+                //echo "tag exists\n";
+                //echo "encode path: $encPath\n";
                 eval("\$data = $tagElement;");
                 if (!$ignoreEnc && $encPath != "") {
                     $encodedElement = "\$infoFromFile$path$encPath";