Merge pull request #17 from tsawler/Development

Development

Author: tsawler

public/files/adobe.pdf

@@ -4,11 +4,9 @@
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Input;
-use Illuminate\Support\Facades\Redirect;
-use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\View;
-use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
 
 /**
  * Class FolderController
@@ -58,9 +56,8 @@ public function getFolders()
     public function getAddfolder()
     {
         $folder_name = Str::slug(Input::get('name'));
-        $working_dir = Input::get('dir');
 
-        $path = base_path($this->file_location . $working_dir);
+        $path = base_path($this->file_location);
 
         if (!File::exists($path . "/" . $folder_name))
         {

public/files/folder-1/sleeping-dog.jpg

@@ -94,6 +94,12 @@ public function upload()
 
             $new_filename = Str::slug(str_replace($extension, '', $filename)) . "." . $extension;
 
+            if (File::exists($destinationPath . $new_filename))
+            {
+                return "A file with this name already exists!";
+                exit;
+            }
+
             Input::file('file_to_upload')->move($destinationPath, $new_filename);
 
             return "OK";

public/files/word.docx

@@ -5,10 +5,11 @@
 
             @foreach($directories as $key => $dir)
                 <div class="col-sm-6 col-md-2">
-                    <div class="thumbnail text-center" data-id="{{ basename($dir) }}">
+                    <div class="thumbnail text-center";" data-id="{{ basename($dir) }}">
                         <a id="large_folder_{{ $key }}" data-id="{{ $dir }}"
                            onclick="clickFolder('large_folder_{{ $key }}',1)"
                            class="folder-icon pointer">
+                            {{--<i class="fa fa-folder-o fa-5x"></i>--}}
                             <img src="/vendor/laravel-filemanager/img/folder.jpg">
                         </a>
                     </div>