fixed directory separator

Author: amin101

src/controllers/LfmController.php

@@ -91,14 +91,19 @@ private function formatLocation($location, $type = null, $get_thumb = false)
             $working_dir = substr($working_dir, 1);
         }
 
+
         $location .= $working_dir;
 
         if ($type === 'directory' || $type === 'thumb') {
-            $location .= '/';
+            $location .= DIRECTORY_SEPARATOR;
         }
 
-        if ($type === 'thumb') {
-            $location .= Config::get('lfm.thumb_folder_name') . '/';
+        //if user is inside thumbs folder there is no need
+        // to add thumbs substring to the end of $location
+        $in_thumb_folder = preg_match('/'.Config::get('lfm.thumb_folder_name').'$/i',$working_dir);
+
+        if ($type === 'thumb' && !$in_thumb_folder) {
+            $location .= Config::get('lfm.thumb_folder_name') . DIRECTORY_SEPARATOR;
         }
 
         return $location;
@@ -126,6 +131,8 @@ public function getUrl($type = null)
 
         $url = $this->formatLocation($url, $type);
 
+        $url = str_replace('\\','/',$url);
+
         return $url;
     }
 

src/views/index.blade.php

@@ -422,7 +422,7 @@ function download(file_name) {
 
     function useFile(file) {
       var path = $('#working_dir').val();
-alert(path);
+
       var item_url = image_url;
 
       @if ("Images" !== $file_type)
@@ -445,6 +445,7 @@ function getUrlParam(paramName) {
 
       var field_name = getUrlParam('field_name');
       var url = item_url + file;
+          url = url.replace(/\\/g,"/");
 
       if (window.opener || window.tinyMCEPopup || field_name || getUrlParam('CKEditorCleanUpFuncNum') || getUrlParam('CKEditor')) {
         if (window.tinyMCEPopup) {