nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-25 02:10:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

get_items_under_shared_by_folder_id moved to HelperService.php

Browse Source
This commit is contained in:
Peter Papp
2021-03-14 17:20:30 +01:00
parent 07cc977684
commit 732fc48aa4
5 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Sharing/BrowseShareController.php
+3 -25
View File
@@ -19,28 +19,6 @@ class BrowseShareController extends Controller
$this->helper = resolve(HelperService::class);
}
/**
* Get folders and files
*
* @param $id
* @param $shared
* @return array
*/
private function get_items($id, $shared): array
{
$folders = Folder::where('user_id', $shared->user_id)
->where('parent_id', $id)
->sortable()
->get();
$files = File::where('user_id', $shared->user_id)
->where('folder_id', $id)
->sortable()
->get();
return [$folders, $files];
}
/**
* Search public files
*
@@ -146,11 +124,11 @@ class BrowseShareController extends Controller
$this->helper->check_item_access($id, $shared);
// Get files and folders
list($folders, $files) = $this->get_items($id, $shared);
list($folders, $files) = $this->helper->get_items_under_shared_by_folder_id($id, $shared);
// Set thumbnail links for public files
$files->map(function ($item) use ($token) {
$item->setPublicUrl($token);
$files->map(function ($file) use ($token) {
$file->setPublicUrl($token);
});
// Collect folders and files to single array
app/Http/Controllers/Sharing/FileSharingController.php
+3 -4
View File
@@ -158,11 +158,10 @@ class FileSharingController extends Controller
// Check if user can get directory
$this->helper->check_item_access($id, $shared);
// Get files and folders
list($folders, $files) = $this->get_items($id, $shared);
// Collect folders and files to single array
return collect([$folders, $files])->collapse();
return collect(
$this->helper->get_items_under_shared_by_folder_id($id, $shared)
)->collapse();
}
/**
app/Http/Controllers/Sharing/SharedFileAccessContentController.php
+2 -2
View File
@@ -73,7 +73,7 @@ class SharedFileAccessContentController extends Controller
->firstOrFail();
// Check file access
$this->helper->check_file_access($shared, $file);
$this->helper->check_guest_access_to_shared_items($shared, $file);
// Store user download size
$shared
@@ -109,7 +109,7 @@ class SharedFileAccessContentController extends Controller
->firstOrFail();
// Check file access
$this->helper->check_file_access($shared, $file);
$this->helper->check_guest_access_to_shared_items($shared, $file);
// Store user download size
$shared