ensure that uploaded file is UTF-8 encoded

2013-04-30 15:00:31 -04:00 · 2013-04-30 15:00:31 -04:00 · de4934a317
parent 623a67d6aa
commit de4934a317
1 changed files with 3 additions and 0 deletions
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@ -1017,6 +1017,9 @@ SQL;
            Logging::info("Successfully written identification file for
                uploaded '$audio_stor'");
        }
+        //if the uploaded file is not UTF-8 encoded, let's encode it. Assuming source
+        //encoding is ISO-8859-1
+        $audio_stor = mb_detect_encoding($audio_stor, "UTF-8") == "UTF-8" ? $audio_stor : utf8_encode($audio_stor);
        Logging::info("copyFileToStor: moving file $audio_file to $audio_stor");
        // Martin K.: changed to rename: Much less load + quicker since this is
        // an atomic operation