modify upload

Author: streamtw

src/controllers/LfmController.php

@@ -36,6 +36,11 @@ public function __construct()
     }
 
 
+    /*****************************
+     ***   Private Functions   ***
+     *****************************/
+
+
     private function setFilePath()
     {
         if ((Session::has('lfm_type')) && (Session::get('lfm_type') == 'Files')) {
@@ -78,6 +83,24 @@ private function checkSharedFolderExists()
     }
 
 
+    /****************************
+     ***   Shared Functions   ***
+     ****************************/
+
+
+    public function getPath()
+    {
+        $working_dir = Input::get('working_dir');
+        $path = base_path() . '/' . $this->file_location;
+
+        if (strlen($working_dir) !== '/') {
+            $path .= $working_dir . '/';
+        }
+
+        return $path;
+    }
+
+
     public function getDirectories($path)
     {
         $thumb_folder_name = Config::get('lfm.thumb_folder_name');

src/controllers/UploadController.php

@@ -25,38 +25,41 @@ public function upload()
         // sanity check
         if ( ! Input::hasFile('upload')) {
             // there ws no uploded file
-            return "You must choose a file!";
-            exit;
+            return 'You must choose a file!';
         }
 
         $file = Input::file('upload');
-        $working_dir = Input::get('working_dir');
-        $destinationPath = base_path() . "/" . $this->file_location;
 
-        if (strlen($working_dir) !== '/') {
-            $destinationPath .= $working_dir . "/";
+        $new_filename = $this->getNewName($file);
+
+        $destinationPath = parent::getPath();
+
+        if (File::exists($destinationPath . $new_filename)) {
+            return 'A file with this name already exists!';
         }
 
-        $filename = $file->getClientOriginalName();
-        $extension = $file->getClientOriginalExtension();
-        $new_filename = $filename;
+        $file->move($destinationPath, $new_filename);
 
-        if (Config::get('lfm.rename_file') === true) {
-            $new_filename = uniqid() . "." . $extension;
+        if (Session::get('lfm_type') == 'Images') {
+            $this->makeThumb($destinationPath, $new_filename);
         }
 
-        if (File::exists($destinationPath . $new_filename)) {
-            return "A file with this name already exists!";
-            exit;
+        if (Input::get('uploadMode') === 'express') {
+            # code...
         }
 
-        Input::file('upload')->move($destinationPath, $new_filename);
+        return 'OK';
+    }
 
-        if (Session::get('lfm_type') == "Images") {
-            $this->makeThumb($destinationPath, $new_filename);
+    private function getNewName($file)
+    {
+        $new_filename = $file->getClientOriginalName();
+
+        if (Config::get('lfm.rename_file') === true) {
+            $new_filename = uniqid() . '.' . $file->getClientOriginalExtension();
         }
 
-        return "OK";
+        return $new_filename;
     }
 
     private function makeThumb($destinationPath, $new_filename)