From 9c456d3d049a35628783a9ba325750271545c6cf Mon Sep 17 00:00:00 2001
From: amin <aminmazrouei@gmail.com>
Date: Sat, 19 Mar 2016 15:20:22 +0330
Subject: [PATCH 1/8] Update composer.json

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 4fabaace..aeada020 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,8 @@
     "tinymce",
     "upload",
     "file",
-    "manager"
+    "manager",
+    "image"
   ],
   "authors": [
     {

From 371e17c5eb9cb546cd605280eb73a520b2dbab0a Mon Sep 17 00:00:00 2001
From: Amin Mazrouei <aminmazrouei@gmail.com>
Date: Sat, 19 Mar 2016 15:53:49 +0330
Subject: [PATCH 2/8] fixed index view

---
 src/views/index.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/index.blade.php b/src/views/index.blade.php
index 27e2386d..a9a110b7 100644
--- a/src/views/index.blade.php
+++ b/src/views/index.blade.php
@@ -150,7 +150,7 @@
   <script src="/vendor/laravel-filemanager/js/cropper.min.js"></script>
   <script src="/vendor/laravel-filemanager/js/jquery.form.min.js"></script>
   <script>
-    var ds            = "{{ DIRECTORY_SEPARATOR }}";
+    var ds            = "{{ addslashes(DIRECTORY_SEPARATOR) }}";
     var home_dir      = ds + "{{ (Config::get('lfm.allow_multi_user')) ? Auth::user()->user_field : '' }}";
     var shared_folder = ds + "{{ Config::get('lfm.shared_folder_name') }}";
     var image_url     = "{{ Config::get('lfm.images_url') }}";

From f7c389e83d4bcc5906ceb61a87df5f06be206062 Mon Sep 17 00:00:00 2001
From: Amin Mazrouei <aminmazrouei@gmail.com>
Date: Sat, 19 Mar 2016 19:24:43 +0330
Subject: [PATCH 3/8] fixed some directory separator

---
 src/controllers/LfmController.php | 6 +++---
 src/views/index.blade.php         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/controllers/LfmController.php b/src/controllers/LfmController.php
index 4ad72992..a302febe 100644
--- a/src/controllers/LfmController.php
+++ b/src/controllers/LfmController.php
@@ -94,11 +94,11 @@ private function formatLocation($location, $type = null, $get_thumb = false)
         $location .= $working_dir;
 
         if ($type === 'directory' || $type === 'thumb') {
-            $location .= DIRECTORY_SEPARATOR;
+            $location .= '/';
         }
 
         if ($type === 'thumb') {
-            $location .= Config::get('lfm.thumb_folder_name') . DIRECTORY_SEPARATOR;
+            $location .= Config::get('lfm.thumb_folder_name') . '/';
         }
 
         return $location;
@@ -155,7 +155,7 @@ public function getFileName($file)
         $working_dir_start = $lfm_dir_start + strlen($this->file_location);
         $lfm_file_path = substr($file, $working_dir_start);
 
-        $arr_dir = explode(DIRECTORY_SEPARATOR, $lfm_file_path);
+        $arr_dir = explode('/', $lfm_file_path);
         $arr_filename['short'] = end($arr_dir);
         $arr_filename['long'] = DIRECTORY_SEPARATOR . $lfm_file_path;
 
diff --git a/src/views/index.blade.php b/src/views/index.blade.php
index a9a110b7..a08412d4 100644
--- a/src/views/index.blade.php
+++ b/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)

From e0aba51eb46f0af5f5fe3e2ed04df9c248aae8a1 Mon Sep 17 00:00:00 2001
From: Amin Mazrouei <aminmazrouei@gmail.com>
Date: Sun, 20 Mar 2016 02:41:43 +0430
Subject: [PATCH 4/8] fixed directory separator

---
 src/controllers/LfmController.php | 13 ++++++++++---
 src/views/index.blade.php         |  3 ++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/controllers/LfmController.php b/src/controllers/LfmController.php
index a302febe..23c08159 100644
--- a/src/controllers/LfmController.php
+++ b/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;
     }
 
diff --git a/src/views/index.blade.php b/src/views/index.blade.php
index a08412d4..a56fbfe8 100644
--- a/src/views/index.blade.php
+++ b/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) {

From a1b516a0660647306350b82f053b5144ca8e285a Mon Sep 17 00:00:00 2001
From: Amin Mazrouei <aminmazrouei@gmail.com>
Date: Sun, 20 Mar 2016 21:26:48 +0430
Subject: [PATCH 5/8] added independent filemanager usage capability

---
 README.md                 | 34 ++++++++++++++++++++++++++++++++++
 src/views/index.blade.php |  5 +++--
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 68a4d59f..c73f0995 100644
--- a/README.md
+++ b/README.md
@@ -135,6 +135,40 @@ PR is welcome!
 </script>
 ```
 
+### Option 3: Independent use
+
+If you are going to use filemanager independently,meaning set the value of an input to selected photo/file url,follow this structure:
+
+1. create a popup window or modal(whatever you like):
+
+```html
+    <a href="/laravel-filemanager" id="feature-img-container"><img src="no_photo.jpg"></a>
+```	
+
+```javascript
+    $('#feature-img-container').on('click', function(e)
+   {
+
+        window.open(this.href, 'Filemanager', 'width=900,height=600');
+
+        return false;
+   });
+```
+
+2. define a function named `SetUrl` :
+
+```javascript
+    function SetUrl(url){
+
+	  //set the value of the desired input to image url,often this is a hidden input
+      $('#thumbnail').val(url);
+	  
+	  //set or change the feature image src,recall wordpress feature image
+      $('#feature-img-container').find('img').attr('src',url);
+    }
+```
+
+
 ## Config
     
 In `config/lfm.php` :
diff --git a/src/views/index.blade.php b/src/views/index.blade.php
index a56fbfe8..99f76e07 100644
--- a/src/views/index.blade.php
+++ b/src/views/index.blade.php
@@ -487,9 +487,8 @@ function getUrlParam(paramName) {
             parent.CKEDITOR.tools.callFunction(getUrlParam('CKEditorCleanUpFuncNum'));
           }
         } else {
-
           // use FCKEditor 2.0 integration method
-          if (data['Properties']['Width'] != '') {
+          if (typeof data != 'undefined' && data['Properties']['Width'] != '') {
             var p = url;
             var w = data['Properties']['Width'];
             var h = data['Properties']['Height'];
@@ -508,6 +507,7 @@ function getUrlParam(paramName) {
 
       window.close();
     }
+    //end useFile
 
     function notImp() {
       bootbox.alert('Not yet implemented!');;
@@ -534,6 +534,7 @@ function makeRandom() {
       }
       return text;
     }
+
   </script>
 </body>
 </html>

From 031eb7abb0e1fe2045650c8db60c56ffa543d97f Mon Sep 17 00:00:00 2001
From: Amin Mazrouei <aminmazrouei@gmail.com>
Date: Sun, 20 Mar 2016 21:34:41 +0430
Subject: [PATCH 6/8] update readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c73f0995..032f0eaf 100644
--- a/README.md
+++ b/README.md
@@ -155,7 +155,7 @@ If you are going to use filemanager independently,meaning set the value of an in
    });
 ```
 
-2. define a function named `SetUrl` :
+2. define a function named `SetUrl`:
 
 ```javascript
     function SetUrl(url){

From a0df52bbe657fd6f8153550ba76b686c5f4b92a6 Mon Sep 17 00:00:00 2001
From: Amin Mazrouei <aminmazrouei@gmail.com>
Date: Sun, 20 Mar 2016 21:39:47 +0430
Subject: [PATCH 7/8] updated readme

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 032f0eaf..7bf2d736 100644
--- a/README.md
+++ b/README.md
@@ -143,6 +143,7 @@ If you are going to use filemanager independently,meaning set the value of an in
 
 ```html
     <a href="/laravel-filemanager" id="feature-img-container"><img src="no_photo.jpg"></a>
+	<input name="thumbnail" type="hidden" id="thumbnail">
 ```	
 
 ```javascript

From 5771f7ef47886a8fae54be1ed05728abf07b3c88 Mon Sep 17 00:00:00 2001
From: Amin Mazrouei <aminmazrouei@gmail.com>
Date: Sun, 20 Mar 2016 21:43:57 +0430
Subject: [PATCH 8/8] updated readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7bf2d736..2a7fbf4a 100644
--- a/README.md
+++ b/README.md
@@ -135,7 +135,7 @@ PR is welcome!
 </script>
 ```
 
-### Option 3: Independent use
+##Independent use
 
 If you are going to use filemanager independently,meaning set the value of an input to selected photo/file url,follow this structure: