Add some safeties around the charset-detection and transliteration

app/Http/Controllers/Api/ImportController.php

@@ -66,11 +66,18 @@ class ImportController extends Controller
                 if (! ini_get('auto_detect_line_endings')) {
                     ini_set('auto_detect_line_endings', '1');
                 }
+                if (function_exists('iconv')) {
                     $file_contents = $file->getContent(); //TODO - this *does* load the whole file in RAM, but we need that to be able to 'iconv' it?
                     $encoding = $detector->getEncoding($file_contents);
                     $reader = null;
                     if (strcasecmp($encoding, 'UTF-8') != 0) {
-                    $transliterated = iconv($encoding, 'UTF-8', $file_contents);
+                        $transliterated = false;
+                        try {
+                            $transliterated = iconv(strtoupper($encoding), 'UTF-8', $file_contents);
+                        } catch (\Exception $e) {
+                            $transliterated = false;
+                            \Log::info("Unable to transliterate from $encoding to UTF-8");
+                        }
                         if ($transliterated !== false) {
                             $tmpname = tempnam(sys_get_temp_dir(), '');
                             $tmpresults = file_put_contents($tmpname, $transliterated);
@@ -83,8 +90,9 @@ class ImportController extends Controller
                             }
                         }
                     }
-                $reader = Reader::createFromFileObject($file->openFile('r')); //file pointer leak?
                     $file_contents = null; //try to save on memory, I guess?
+                }
+                $reader = Reader::createFromFileObject($file->openFile('r')); //file pointer leak?
 
                 try {
                     $import->header_row = $reader->fetchOne(0);