fix bug when filename is composed of non-latin charaters #473

simogeo · Mar 17, 2016 · 4dc16b0 · 4dc16b0
1 parent 138aaf1
commit 4dc16b0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/connectors/php/filemanager.class.php b/connectors/php/filemanager.class.php
@@ -1319,6 +1319,13 @@ private function cleanString($string, $allowed = array()) {
  $cleaned = preg_replace('/[_]+/', '_', $clean); // remove double underscore
 
  }
+
+ // prevent bug https://github.com/simogeo/Filemanager/issues/474
+ $path_parts = pathinfo($cleaned);
+ if(empty($path_parts['filename'])) {
+ $path_parts['filename'] = "unsupportedCharsReplacement";
+ $cleaned = $path_parts['filename'] . '.' . $path_parts['extension'] ;
+ }
  return $cleaned;
 }
 

diff --git a/scripts/filemanager.js b/scripts/filemanager.js
@@ -269,6 +269,8 @@ var cleanString = function(str) {
  }
 
  cleaned = cleaned.replace(/[_]+/g, "_");
+ // prevent bug https://github.com/simogeo/Filemanager/issues/474
+ if(cleaned == "") cleaned = "unsupportedCharsReplacement";
 
  return cleaned;
 };

diff --git a/scripts/filemanager.min.js b/scripts/filemanager.min.js