Classes refactored

app/Http/Controllers/FileManager/BrowseController.php

@@ -14,113 +14,6 @@ use App\Models\Share;
 
 class BrowseController extends Controller
 {
-
-    /**
-     * Get trashed files
-     *
-     * @return Collection
-     */
-    public function trash()
-    {
-        // Get user id
-        $user_id = Auth::id();
-
-        // Get folders and files
-        $folders_trashed = Folder::onlyTrashed()
-            ->with(['trashed_folders', 'parent'])
-            ->where('user_id', $user_id)
-            ->get(['parent_id', 'id', 'name']);
-
-        $folders = Folder::onlyTrashed()
-            ->with(['parent'])
-            ->where('user_id', $user_id)
-            ->whereIn('id', filter_folders_ids($folders_trashed))
-            ->sortable()
-            ->get();
-
-        // Get files trashed
-        $files_trashed = File::onlyTrashed()
-            ->with(['parent'])
-            ->where('user_id', $user_id)
-            ->whereNull('folder_id')
-            ->orWhereNotIn('folder_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'id'))))
-            ->sortable()
-            ->get();
-
-        // Collect folders and files to single array
-        return collect([$folders, $files_trashed])->collapse();
-    }
-
-    /**
-     * Get user shared items
-     *
-     * @return Collection
-     */
-    public function shared()
-    {
-        // Get user
-        $user_id = Auth::id();
-
-        // Get shared folders and files
-        $folder_ids = Share::where('user_id', $user_id)
-            ->where('type', 'folder')
-            ->pluck('item_id');
-
-        $file_ids = Share::where('user_id', $user_id)
-            ->where('type', '!=', 'folder')
-            ->pluck('item_id');
-
-        // Get folders and files
-        $folders = Folder::with(['parent', 'shared:token,id,item_id,permission,is_protected,expire_in'])
-            ->where('user_id', $user_id)
-            ->whereIn('id', $folder_ids)
-            ->sortable()
-            ->get();
-
-        $files = File::with(['parent', 'shared:token,id,item_id,permission,is_protected,expire_in'])
-            ->where('user_id', $user_id)
-            ->whereIn('id', $file_ids)
-            ->sortable()
-            ->get();
-
-        // Collect folders and files to single array
-        return collect([$folders, $files])->collapse();
-    }
-
-    /**
-     * Get latest user uploads
-     *
-     * @return mixed
-     */
-    public function latest()
-    {
-        $user = User::with(['latest_uploads' => function ($query) {
-            $query->sortable(['created_at' => 'desc']);
-        }])
-            ->where('id', Auth::id())
-            ->first();
-
-        return $user->latest_uploads;
-    }
-
-    /**
-     * Get participant uploads
-     *
-     * @return mixed
-     */
-    public function participant_uploads()
-    {
-
-        // Get User
-        $uploads = File::with(['parent'])
-            ->where('user_id', Auth::id())
-            ->whereUserScope('editor')
-            ->sortable()
-            ->get();
-
-        return $uploads;
-    }
-
     /**
      * Get directory with files
      *
@@ -166,6 +59,108 @@ class BrowseController extends Controller
             ->collapse();
     }
 
+    /**
+     * Get latest user uploads
+     *
+     * @return mixed
+     */
+    public function latest()
+    {
+        $user = User::with(['latest_uploads' => function ($query) {
+            $query->sortable(['created_at' => 'desc']);
+        }])
+            ->where('id', Auth::id())
+            ->first();
+
+        return $user->latest_uploads;
+    }
+
+    /**
+     * Get trashed files
+     *
+     * @return Collection
+     */
+    public function trash()
+    {
+        $user_id = Auth::id();
+
+        // Get folders and files
+        $folders_trashed = Folder::onlyTrashed()
+            ->with(['trashed_folders', 'parent'])
+            ->where('user_id', $user_id)
+            ->get(['parent_id', 'id', 'name']);
+
+        $folders = Folder::onlyTrashed()
+            ->with(['parent'])
+            ->where('user_id', $user_id)
+            ->whereIn('id', filter_folders_ids($folders_trashed))
+            ->sortable()
+            ->get();
+
+        // Get files trashed
+        $files_trashed = File::onlyTrashed()
+            ->with(['parent'])
+            ->where('user_id', $user_id)
+            ->whereNull('folder_id')
+            ->orWhereNotIn('folder_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'id'))))
+            ->sortable()
+            ->get();
+
+        // Collect folders and files to single array
+        return collect([$folders, $files_trashed])
+            ->collapse();
+    }
+
+    /**
+     * Get user shared items
+     *
+     * @return Collection
+     */
+    public function shared()
+    {
+        $user_id = Auth::id();
+
+        // Get shared folders and files
+        $folder_ids = Share::where('user_id', $user_id)
+            ->where('type', 'folder')
+            ->pluck('item_id');
+
+        $file_ids = Share::where('user_id', $user_id)
+            ->where('type', '!=', 'folder')
+            ->pluck('item_id');
+
+        // Get folders and files
+        $folders = Folder::with(['parent', 'shared:token,id,item_id,permission,is_protected,expire_in'])
+            ->where('user_id', $user_id)
+            ->whereIn('id', $folder_ids)
+            ->sortable()
+            ->get();
+
+        $files = File::with(['parent', 'shared:token,id,item_id,permission,is_protected,expire_in'])
+            ->where('user_id', $user_id)
+            ->whereIn('id', $file_ids)
+            ->sortable()
+            ->get();
+
+        // Collect folders and files to single array
+        return collect([$folders, $files])
+            ->collapse();
+    }
+
+    /**
+     * Get participant uploads
+     *
+     * @return mixed
+     */
+    public function participant_uploads()
+    {
+        return File::with(['parent'])
+            ->where('user_id', Auth::id())
+            ->whereUserScope('editor')
+            ->sortable()
+            ->get();
+    }
+
     /**
      * Get user folder tree
      *
@@ -190,24 +185,26 @@ class BrowseController extends Controller
     /**
      * Search files
      *
-     * @param Request $request
-     * @return \Illuminate\Database\Eloquent\Collection
+     * @param SearchRequest $request
+     * @return Collection
      */
     public function search(SearchRequest $request)
     {
-        // Get user
         $user_id = Auth::id();
+
         $query = remove_accents($request->input('query'));
 
         // Search files id db
         $searched_files = File::search($query)
             ->where('user_id', $user_id)
             ->get();
+
         $searched_folders = Folder::search($query)
             ->where('user_id', $user_id)
             ->get();
 
         // Collect folders and files to single array
-        return collect([$searched_folders, $searched_files])->collapse();
+        return collect([$searched_folders, $searched_files])
+            ->collapse();
     }
 }

app/Http/Controllers/Sharing/BrowseShareController.php

@@ -19,6 +19,37 @@ class BrowseShareController extends Controller
         $this->helper = resolve(HelperService::class);
     }
 
+    /**
+     * Browse public folders
+     *
+     * @param $id
+     * @param $token
+     * @return Collection
+     */
+    public function get_public_folders($id, $token)
+    {
+        $shared = get_shared($token);
+
+        // Abort if folder is protected
+        if ((int)$shared->is_protected) {
+            abort(403, "Sorry, you don't have permission");
+        }
+
+        // Check if user can get directory
+        $this->helper->check_item_access($id, $shared);
+
+        // Get files and folders
+        list($folders, $files) = $this->helper->get_items_under_shared_by_folder_id($id, $shared);
+
+        // Set thumbnail links for public files
+        $files->map(function ($file) use ($token) {
+            $file->setPublicUrl($token);
+        });
+
+        // Collect folders and files to single array
+        return collect([$folders, $files])->collapse();
+    }
+
     /**
      * Search public files
      *
@@ -77,11 +108,11 @@ class BrowseShareController extends Controller
     /**
      * Get navigation tree
      *
+     * @param $token
      * @return array
      */
     public function get_public_navigation_tree($token)
     {
-        // Get sharing record
         $shared = get_shared($token);
 
         // Check if user can get directory
@@ -103,35 +134,4 @@ class BrowseShareController extends Controller
             ]
         ];
     }
-
-    /**
-     * Browse public folders
-     *
-     * @param $id
-     * @param $token
-     * @return Collection
-     */
-    public function get_public_folders($id, $token)
-    {
-        $shared = get_shared($token);
-
-        // Abort if folder is protected
-        if ((int)$shared->is_protected) {
-            abort(403, "Sorry, you don't have permission");
-        }
-
-        // Check if user can get directory
-        $this->helper->check_item_access($id, $shared);
-
-        // Get files and folders
-        list($folders, $files) = $this->helper->get_items_under_shared_by_folder_id($id, $shared);
-
-        // Set thumbnail links for public files
-        $files->map(function ($file) use ($token) {
-            $file->setPublicUrl($token);
-        });
-
-        // Collect folders and files to single array
-        return collect([$folders, $files])->collapse();
-    }
 }

app/Http/Controllers/Sharing/FileSharedAccessController.php

@@ -9,7 +9,7 @@ use App\Services\HelperService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 
-class SharedFileAccessContentController extends Controller
+class FileSharedAccessController extends Controller
 {
     private $helper;
 

app/Http/Controllers/Sharing/ServeSharedController.php

@@ -9,7 +9,6 @@ use App\Models\Share;
 use App\Models\Setting;
 use App\Services\HelperService;
 use Illuminate\Support\Facades\Cookie;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Collection;
 use Illuminate\Http\Request;
@@ -19,7 +18,7 @@ use App\Models\File;
 use App\Models\User;
 use Illuminate\Support\Facades\Storage;
 
-class FileSharingController extends Controller
+class ServeSharedController extends Controller
 {
     private $helper;