fix folder name in tree view

Author: streamtw

src/controllers/FolderController.php

@@ -21,23 +21,11 @@ class FolderController extends LfmController {
      */
     public function getFolders()
     {
-        $all_directories = File::directories(base_path($this->file_location . \Auth::user()->user_field));
-        $directories = [];
+        $dir_path = $this->file_location . \Auth::user()->user_field;
+        $directories = parent::getDirectories($dir_path);
 
-        foreach ($all_directories as $directory) {
-            if (basename($directory) != "thumbs") {
-                $directories[] = basename($directory);
-            }
-        }
-
-        $all_shares = File::directories(base_path($this->file_location . Config::get('lfm.shared_folder_name')));
-        $shared_folders = [];
-
-        foreach ($all_shares as $directory) {
-            if (basename($directory) != "thumbs") {
-                $shared_folders[] = basename($directory);
-            }
-        }
+        $share_path = $this->file_location . Config::get('lfm.shared_folder_name');
+        $shared_folders = parent::getDirectories($share_path);
 
         return View::make("laravel-filemanager::tree")
             ->with('dirs', $directories)

src/controllers/ItemsController.php

@@ -33,7 +33,7 @@ public function getFiles()
 
         $file_info = $this->getFileInfos($files, 'Files');
 
-        $directories = $this->getDirectories($path, 'Files');
+        $directories = parent::getDirectories($path);
 
         if (Input::get('show_list') == 1) {
             $view = 'laravel-filemanager::files-list';
@@ -67,7 +67,7 @@ public function getImages()
 
         $file_info = $this->getFileInfos($files, 'Images');
 
-        $directories = $this->getDirectories($path, 'Images');
+        $directories = parent::getDirectories($path);
 
         if (Input::get('show_list') == 1) {
             $view = 'laravel-filemanager::images-list';
@@ -82,25 +82,6 @@ public function getImages()
             ->with('base', Input::get('base'))
             ->with('dir_location', $this->dir_location);
     }
-
-
-    private function getDirectories($path, $type = 'Images')
-    {
-        $all_directories = File::directories(base_path($path));
-
-        $directories = [];
-
-        foreach ($all_directories as $directory) {
-            $path_parts = explode('/', $directory);
-            $dir_name = end($path_parts);
-
-            if ($type !== 'Files' && $dir_name !== 'thumbs') {
-                $directories[] = $dir_name;
-            }
-        }
-
-        return $directories;
-    }
 
 
     private function getFileInfos($files, $type = 'Images')

src/controllers/LfmController.php

@@ -78,6 +78,25 @@ private function checkSharedFolderExists()
     }
 
 
+    public function getDirectories($path)
+    {
+        $all_directories = File::directories(base_path($path));
+
+        $arr_dir = [];
+
+        foreach ($all_directories as $directory) {
+            $path_parts = explode('/', $directory);
+            $dir_name = end($path_parts);
+
+            if ($dir_name !== 'thumbs') {
+                $arr_dir[] = $dir_name;
+            }
+        }
+
+        return $arr_dir;
+    }
+
+
     /**
      * Show the filemanager
      *

src/views/tree.blade.php

@@ -5,10 +5,10 @@
             <i class="fa fa-folder-open" data-id="/"></i> {{ Lang::get('laravel-filemanager::lfm.title-root') }}
         </a>
     </li>
-    @foreach($dirs as $key => $dir)
+    @foreach($dirs as $key => $dir_name)
         <li>
-            <a class="pointer" id="folder_{{ $key }}" data-id="{{ $dir }}" onclick="clickFolder('folder_{{ $key }}', 0)">
-                <i class="fa fa-folder folder-item" data-id="{{ $dir }}" id="{{ $dir }}-folder"></i> {{ $dir }}
+            <a class="pointer" id="folder_{{ $key }}" data-id="{{ $dir_name }}" onclick="clickFolder('folder_{{ $key }}', 0)">
+                <i class="fa fa-folder folder-item" data-id="{{ $dir_name }}" id="{{ $dir_name }}-folder"></i> {{ $dir_name }}
             </a>
         </li>
     @endforeach
@@ -19,10 +19,10 @@
             <i class="fa fa-folder" data-id="/"></i> {{ Lang::get('laravel-filemanager::lfm.title-shares') }}
         </a>
     </li>
-    @foreach($shares as $key => $dir)
+    @foreach($shares as $key => $dir_name)
         <li>
-            <a class="pointer" id="shared_{{ $key }}" data-id="{{ $dir }}" onclick="clickSharedFolder('shared_{{ $key }}', 0)">
-                <i class="fa fa-folder folder-item" data-id="{{ $dir }}" id="{{ $dir }}-folder-shared"></i> {{ $dir }}
+            <a class="pointer" id="shared_{{ $key }}" data-id="{{ $dir_name }}" onclick="clickSharedFolder('shared_{{ $key }}', 0)">
+                <i class="fa fa-folder folder-item" data-id="{{ $dir_name }}" id="{{ $dir_name }}-folder-shared"></i> {{ $dir_name }}
             </a>
         </li>
     @endforeach