Merge pull request #350 from khjay/fix-utf8filename

Fix utf8filename

Author: streamtw

src/controllers/RedirectController.php

@@ -16,7 +16,7 @@ class RedirectController extends LfmController
     public function __construct()
     {
         $delimiter = config('lfm.prefix') . '/';
-        $url = request()->url();
+        $url = urldecode(request()->url());
         // dd($delimiter);
         $external_path = substr($url, strpos($url, $delimiter) + strlen($delimiter));
 

src/controllers/UploadController.php

@@ -61,7 +61,8 @@ private function proceedSingleUpload($file)
                     ->save($new_file_path, 90);
 
                 $this->makeThumb($new_filename);
-            } else {
+            }
+            {
                 chmod($file->getRealPath(), 0644); // TODO configurable
                 File::move($file->getRealPath(), $new_file_path);
             }
@@ -122,7 +123,7 @@ private function uploadValidator($file)
 
     private function getNewName($file)
     {
-        $new_filename = parent::translateFromUtf8(trim(pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME)));
+        $new_filename = parent::translateFromUtf8(trim($this->_pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME)));
 
         if (config('lfm.rename_file') === true) {
             $new_filename = uniqid();
@@ -166,4 +167,19 @@ function getUrlParam(paramName) {
         if (o !== false) o.CKEDITOR.tools.callFunction(funcNum, '$file');
         </script>";
     }
+
+    private function _pathinfo($path, $options = null)
+    {
+        $path = urlencode($path);
+        $parts = is_null($options) ? pathinfo($path) : pathinfo($path, $options);
+        if (is_array($parts)) {
+            foreach ($parts as $field => $value) {
+                $parts[$field] = urldecode($value);
+            }
+        } else {
+            $parts = urldecode($parts);
+        }
+
+        return $parts;
+    }
 }