Refactoring

Author: tsawler

src/controllers/LfmController.php

@@ -6,9 +6,7 @@
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\View;
-use Illuminate\Support\Str;
 use Intervention\Image\Facades\Image;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Class LfmController

src/controllers/RenameController.php

@@ -4,6 +4,7 @@
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Str;
 
 /**
@@ -12,6 +13,16 @@
  */
 class RenameController extends Controller {
 
+    protected $file_location;
+
+    function __construct()
+    {
+        if (Session::get('lfm_type') == "Images")
+            $this->file_location = Config::get('lfm.images_dir');
+        else
+            $this->file_location = Config::get('lfm.files_dir');
+    }
+
     /**
      * @return string
      */
@@ -23,49 +34,53 @@ function getRename(){
 
         if ($dir == "/")
         {
-            if (File::exists(base_path() . "/". Config::get('lfm.images_dir') . $new_name))
+            if (File::exists(base_path() . "/". $this->file_location . $new_name))
             {
                 return "File name already in use!";
             } else
             {
-                if (File::isDirectory(base_path() . "/" . Config::get('lfm.images_dir') . $file_to_rename))
+                if (File::isDirectory(base_path() . "/" . $this->file_location . $file_to_rename))
                 {
-                    File::move(base_path() . "/" . Config::get('lfm.images_dir') . $file_to_rename,
-                        base_path() . "/" . Config::get('lfm.images_dir') . $new_name);
+                    File::move(base_path() . "/" . $this->file_location . $file_to_rename,
+                        base_path() . "/" . $this->file_location . $new_name);
 
                     return "OK";
                 } else
                 {
-                    File::move(base_path() . "/" . Config::get('lfm.images_dir') . $file_to_rename,
-                        base_path() . "/" . Config::get('lfm.images_dir') . $new_name);
-                    // rename thumbnail
-                    File::move(base_path() . "/" . Config::get('lfm.images_dir') . "thumbs/" . $file_to_rename,
-                        base_path() . "/" . Config::get('lfm.images_dir') . "thumbs/" . $new_name);
+                    File::move(base_path() . "/" . $this->file_location . $file_to_rename,
+                        base_path() . "/" . $this->file_location . $new_name);
+
+                    if (Session::get('lfm_type') == "Images")
+                    {
+                        // rename thumbnail
+                        File::move(base_path() . "/" . $this->file_location . "thumbs/" . $file_to_rename,
+                            base_path() . "/" . $this->file_location . "thumbs/" . $new_name);
+                    }
 
                     return "OK";
                 }
             }
         } else
         {
-            if (File::exists(base_path() . "/" . Config::get('lfm.images_dir') . $dir . "/" . $new_name))
+            if (File::exists(base_path() . "/" . $this->file_location . $dir . "/" . $new_name))
             {
                 return "File name already in use!";
             } else
             {
-                //return base_path() . "/" . Config::get('lfm.images_dir') . $dir . "/" . $file_to_rename;
-
-                if (File::isDirectory(base_path() . "/" . Config::get('lfm.images_dir') . $dir . "/" . $file_to_rename))
+                if (File::isDirectory(base_path() . "/" . $this->file_location . $dir . "/" . $file_to_rename))
                 {
-                    File::move(base_path() . "/" . Config::get('lfm.images_dir') . $dir . "/" . $file_to_rename,
-                        base_path() . "/" . Config::get('lfm.images_dir') . $dir . "/" . $new_name);
+                    File::move(base_path() . "/" . $this->file_location . $dir . "/" . $file_to_rename,
+                        base_path() . "/" . $this->file_location . $dir . "/" . $new_name);
                 } else
                 {
-                    File::move(base_path() . "/" . Config::get('lfm.images_dir') . $dir . "/" . $file_to_rename,
-                        base_path() . "/" . Config::get('lfm.images_dir') . $dir . "/" . $new_name);
-                    // rename thumbnail
-                    File::move(base_path() . "/" . Config::get('lfm.images_dir') . $dir . "/thumbs/" . $file_to_rename,
-                        base_path() . "/" . Config::get('lfm.images_dir') . $dir . "/thumbs/" . $new_name);
+                    File::move(base_path() . "/" . $this->file_location . $dir . "/" . $file_to_rename,
+                        base_path() . "/" . $this->file_location . $dir . "/" . $new_name);
 
+                    if (Session::get('lfm_type') == "Images")
+                    {
+                        File::move(base_path() . "/" . $this->file_location . $dir . "/thumbs/" . $file_to_rename,
+                            base_path() . "/" . $this->file_location . $dir . "/thumbs/" . $new_name);
+                    }
                     return "OK";
                 }
             }