nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-05-15 09:45:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

- added model events for generate uuid

Browse Source
This commit is contained in:
Peter Papp
2021-02-26 17:19:57 +01:00
parent fd02fbfe08
commit 920ee19651
25 changed files with 175 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/DashboardController.php
+2 -2
View File
@@ -2,7 +2,7 @@
namespace App\Http\Controllers\Admin;
use App\FileManagerFile;
use App\File;
use App\Http\Controllers\Controller;
use App\Http\Resources\UsersCollection;
use App\Services\StripeService;
@@ -33,7 +33,7 @@ class DashboardController extends Controller
$total_users = User::all()->count();
// Get total used space
$total_used_space = FileManagerFile::all()->map(function ($item) {
$total_used_space = File::all()->map(function ($item) {
return (int)$item->getRawOriginal('filesize');
})->sum();
app/Http/Controllers/Admin/UserController.php
+4 -4
View File
@@ -2,8 +2,8 @@
namespace App\Http\Controllers\Admin;
use App\FileManagerFile;
use App\FileManagerFolder;
use App\File;
use App\Folder;
use App\Http\Controllers\Controller;
use App\Http\Requests\Admin\ChangeRoleRequest;
use App\Http\Requests\Admin\ChangeStorageCapacityRequest;
@@ -231,10 +231,10 @@ class UserController extends Controller
$shares = Share::where('user_id', $user->id)->get();
$files = FileManagerFile::withTrashed()
$files = File::withTrashed()
->where('user_id', $user->id)
->get();
$folders = FileManagerFolder::withTrashed()
$folders = Folder::withTrashed()
->where('user_id', $user->id)
->get();
app/Http/Controllers/AppFunctionsController.php
+4 -4
View File
@@ -3,8 +3,8 @@
namespace App\Http\Controllers;
use App\Content;
use App\FileManagerFile;
use App\FileManagerFolder;
use App\File;
use App\Folder;
use App\Http\Requests\PublicPages\SendMessageRequest;
use App\Http\Resources\PageResource;
use App\Http\Tools\Demo;
@@ -120,7 +120,7 @@ class AppFunctionsController extends Controller
if ($shared->type === 'file') {
// Get file record
$file = FileManagerFile::where('user_id', $shared->user_id)
$file = File::where('user_id', $shared->user_id)
->where('unique_id', $shared->item_id)
->first();
@@ -142,7 +142,7 @@ class AppFunctionsController extends Controller
if ($shared->type === 'folder') {
// Get file record
$folder = FileManagerFolder::where('user_id', $shared->user_id)
$folder = Folder::where('user_id', $shared->user_id)
->where('unique_id', $shared->item_id)
->first();
app/Http/Controllers/FileAccessController.php
+6 -6
View File
@@ -2,7 +2,7 @@
namespace App\Http\Controllers;
use App\FileManagerFolder;
use App\Folder;
use App\Http\Tools\Editor;
use App\Http\Tools\Guardian;
use App\Share;
@@ -13,7 +13,7 @@ use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\File;
use Illuminate\Http\Request;
use App\FileManagerFile;
use App\File;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
use Illuminate\Http\Exceptions\HttpResponseException;
@@ -76,7 +76,7 @@ class FileAccessController extends Controller
$user_id = Auth::id();
// Get file record
$file = FileManagerFile::withTrashed()
$file = File::withTrashed()
->where('user_id', $user_id)
->where('basename', $filename)
->firstOrFail();
@@ -167,7 +167,7 @@ class FileAccessController extends Controller
}
// Get file record
$file = FileManagerFile::where('user_id', $shared->user_id)
$file = File::where('user_id', $shared->user_id)
->where('basename', $filename)
->firstOrFail();
@@ -191,7 +191,7 @@ class FileAccessController extends Controller
public function get_thumbnail(Request $request, $filename)
{
// Get file record
$file = FileManagerFile::withTrashed()
$file = File::withTrashed()
->where('user_id', $request->user()->id)
->where('thumbnail', $filename)
->firstOrFail();
@@ -223,7 +223,7 @@ class FileAccessController extends Controller
}
// Get file record
$file = FileManagerFile::where('user_id', $shared->user_id)
$file = File::where('user_id', $shared->user_id)
->where('thumbnail', $filename)
->firstOrFail();
app/Http/Controllers/FileBrowser/BrowseController.php
+15 -15
View File
@@ -9,8 +9,8 @@ use Illuminate\Support\Facades\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Support\Collection;
use Illuminate\Http\Request;
use App\FileManagerFolder;
use App\FileManagerFile;
use App\Folder;
use App\File;
use App\Share;
class BrowseController extends Controller
@@ -27,12 +27,12 @@ class BrowseController extends Controller
$user_id = Auth::id();
// Get folders and files
$folders_trashed = FileManagerFolder::onlyTrashed()
$folders_trashed = Folder::onlyTrashed()
->with(['trashed_folders', 'parent'])
->where('user_id', $user_id)
->get(['parent_id', 'unique_id', 'name']);
$folders = FileManagerFolder::onlyTrashed()
$folders = Folder::onlyTrashed()
->with(['parent'])
->where('user_id', $user_id)
->whereIn('unique_id', filter_folders_ids($folders_trashed))
@@ -40,7 +40,7 @@ class BrowseController extends Controller
->get();
// Get files trashed
$files_trashed = FileManagerFile::onlyTrashed()
$files_trashed = File::onlyTrashed()
->with(['parent'])
->where('user_id', $user_id)
->whereNotIn('folder_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'unique_id'))))
@@ -71,13 +71,13 @@ class BrowseController extends Controller
->pluck('item_id');
// Get folders and files
$folders = FileManagerFolder::with(['parent', 'shared:token,id,item_id,permission,protected,expire_in'])
$folders = Folder::with(['parent', 'shared:token,id,item_id,permission,protected,expire_in'])
->where('user_id', $user_id)
->whereIn('unique_id', $folder_ids)
->sortable()
->get();
$files = FileManagerFile::with(['parent', 'shared:token,id,item_id,permission,protected,expire_in'])
$files = File::with(['parent', 'shared:token,id,item_id,permission,protected,expire_in'])
->where('user_id', $user_id)
->whereIn('unique_id', $file_ids)
->sortable()
@@ -112,7 +112,7 @@ class BrowseController extends Controller
public function participant_uploads() {
// Get User
$uploads = FileManagerFile::with(['parent'])
$uploads = File::with(['parent'])
->where('user_id', Auth::id())
->whereUserScope('editor')
->sortable()
@@ -137,14 +137,14 @@ class BrowseController extends Controller
if ($request->query('trash')) {
// Get folders and files
$folders = FileManagerFolder::onlyTrashed()
$folders = Folder::onlyTrashed()
->with('parent')
->where('user_id', $user_id)
->where('parent_id', $unique_id)
->sortable()
->get();
$files = FileManagerFile::onlyTrashed()
$files = File::onlyTrashed()
->with('parent')
->where('user_id', $user_id)
->where('folder_id', $unique_id)
@@ -156,13 +156,13 @@ class BrowseController extends Controller
}
// Get folders and files
$folders = FileManagerFolder::with(['parent', 'shared:token,id,item_id,permission,protected,expire_in'])
$folders = Folder::with(['parent', 'shared:token,id,item_id,permission,protected,expire_in'])
->where('user_id', $user_id)
->where('parent_id', $unique_id)
->sortable()
->get();
$files = FileManagerFile::with(['parent', 'shared:token,id,item_id,permission,protected,expire_in'])
$files = File::with(['parent', 'shared:token,id,item_id,permission,protected,expire_in'])
->where('user_id', $user_id)
->where('folder_id', $unique_id)
->sortable()
@@ -179,7 +179,7 @@ class BrowseController extends Controller
*/
public function navigation_tree() {
$folders = FileManagerFolder::with('folders:id,parent_id,unique_id,name')
$folders = Folder::with('folders:id,parent_id,unique_id,name')
->where('parent_id', 0)
->where('user_id', Auth::id())
->sortable()
@@ -208,10 +208,10 @@ class BrowseController extends Controller
$query = remove_accents($request->input('query'));
// Search files id db
$searched_files = FileManagerFile::search($query)
$searched_files = File::search($query)
->where('user_id', $user_id)
->get();
$searched_folders = FileManagerFolder::search($query)
$searched_folders = Folder::search($query)
->where('user_id', $user_id)
->get();
app/Http/Controllers/FileFunctions/EditItemsController.php
+11 -11
View File
@@ -15,8 +15,8 @@ use Illuminate\Support\Facades\Auth;
use App\Http\Controllers\Controller;
use App\Http\Tools\Guardian;
use App\Http\Tools\Editor;
use App\FileManagerFolder;
use App\FileManagerFile;
use App\Folder;
use App\File;
use Exception;
@@ -268,7 +268,7 @@ class EditItemsController extends Controller
* Upload file for authenticated master|editor user
*
* @param UploadRequest $request
* @return FileManagerFile|Model
* @return File|Model
* @throws Exception
*/
public function user_upload(UploadRequest $request)
@@ -300,7 +300,7 @@ class EditItemsController extends Controller
*
* @param UploadRequest $request
* @param $token
* @return FileManagerFile|Model
* @return File|Model
* @throws Exception
*/
public function guest_upload(UploadRequest $request, $token)
@@ -354,7 +354,7 @@ class EditItemsController extends Controller
}
// Get folder
$folder = FileManagerFolder::whereUserId($user_id)
$folder = Folder::whereUserId($user_id)
->where('unique_id', $unique_id);
if (! $folder->exists()) {
@@ -387,7 +387,7 @@ class EditItemsController extends Controller
Guardian::check_item_access($unique_id, $shared);
// Get folder
$folder = FileManagerFolder::whereUserId($shared->user_id)
$folder = Folder::whereUserId($shared->user_id)
->where('unique_id', $unique_id);
@@ -424,7 +424,7 @@ class EditItemsController extends Controller
// Get shared token
$shared = get_shared($request->cookie('shared_token'));
$file_parent_folders = FileManagerFile::whereUserId(Auth::id())
$file_parent_folders = File::whereUserId(Auth::id())
->whereIn('unique_id', $request->input('files'))
->get()
->pluck('folder_id')
@@ -435,7 +435,7 @@ class EditItemsController extends Controller
}
// Get requested files
$files = FileManagerFile::whereUserId(Auth::id())
$files = File::whereUserId(Auth::id())
->whereIn('unique_id', $request->input('files'))
->get();
@@ -460,7 +460,7 @@ class EditItemsController extends Controller
// Get shared record
$shared = get_shared($token);
$file_parent_folders = FileManagerFile::whereUserId($shared->user_id)
$file_parent_folders = File::whereUserId($shared->user_id)
->whereIn('unique_id', $request->input('files'))
->get()
->pluck('folder_id')
@@ -470,7 +470,7 @@ class EditItemsController extends Controller
Guardian::check_item_access($file_parent_folders, $shared);
// Get requested files
$files = FileManagerFile::whereUserId($shared->user_id)
$files = File::whereUserId($shared->user_id)
->whereIn('unique_id', $request->input('files'))
->get();
@@ -551,7 +551,7 @@ class EditItemsController extends Controller
if ($item['type'] !== 'folder') {
$file = FileManagerFile::where('unique_id', $unique_id)
$file = File::where('unique_id', $unique_id)
->where('user_id', $shared->user_id)
->firstOrFail();
app/Http/Controllers/FileFunctions/FavouriteController.php
+2 -2
View File
@@ -2,7 +2,7 @@
namespace App\Http\Controllers\FileFunctions;
use App\FileManagerFolder;
use App\Folder;
use App\Http\Tools\Demo;
use Illuminate\Support\Facades\Validator;
use App\Http\Controllers\Controller;
@@ -31,7 +31,7 @@ class FavouriteController extends Controller
// Get user & folder
$user = Auth::user();
$folder = FileManagerFolder::where('unique_id', $item['unique_id'])->first();
$folder = Folder::where('unique_id', $item['unique_id'])->first();
if (is_demo($user->id)) {
return Demo::favourites($user);
app/Http/Controllers/FileFunctions/TrashController.php
+6 -6
View File
@@ -9,8 +9,8 @@ use Illuminate\Support\Facades\Storage;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
use App\FileManagerFolder;
use App\FileManagerFile;
use App\Folder;
use App\File;
class TrashController extends Controller
{
@@ -29,8 +29,8 @@ class TrashController extends Controller
}
// Get files and folders
$folders = FileManagerFolder::onlyTrashed()->where('user_id', $user_id)->get();
$files = FileManagerFile::onlyTrashed()->where('user_id', $user_id)->get();
$folders = Folder::onlyTrashed()->where('user_id', $user_id)->get();
$files = File::onlyTrashed()->where('user_id', $user_id)->get();
// Force delete folder
$folders->each->forceDelete();
@@ -83,7 +83,7 @@ class TrashController extends Controller
if ($restore_item['type'] === 'folder') {
// Get folder
$item = FileManagerFolder::onlyTrashed()
$item = Folder::onlyTrashed()
->where('user_id', $user_id)
->where('unique_id', $restore_item['unique_id'])
->first();
@@ -96,7 +96,7 @@ class TrashController extends Controller
} else {
// Get item
$item = FileManagerFile::onlyTrashed()
$item = File::onlyTrashed()
->where('user_id', $user_id)
->where('unique_id', $restore_item['unique_id'])
->first();
app/Http/Controllers/Sharing/FileSharingController.php
+15 -15
View File
@@ -15,8 +15,8 @@ use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Collection;
use Illuminate\Http\Request;
use Illuminate\Support\Arr;
use App\FileManagerFolder;
use App\FileManagerFile;
use App\Folder;
use App\File;
use App\User;
use App\Share;
use Illuminate\Support\Facades\Storage;
@@ -52,7 +52,7 @@ class FileSharingController extends Controller
// Check if shared is image file and then show it
if ($shared->type === 'file' && ! (int) $shared->protected) {
$image = FileManagerFile::where('user_id', $shared->user_id)
$image = File::where('user_id', $shared->user_id)
->where('type', 'image')
->where('unique_id', $shared->item_id)
->first();
@@ -205,7 +205,7 @@ class FileSharingController extends Controller
}
// Get file
$file = FileManagerFile::where('user_id', $shared->user_id)
$file = File::where('user_id', $shared->user_id)
->where('unique_id', $shared->item_id)
->firstOrFail(['name', 'basename', 'thumbnail', 'type', 'filesize', 'mimetype']);
@@ -228,7 +228,7 @@ class FileSharingController extends Controller
$shared = Share::where('token', $request->cookie('shared_token'))->firstOrFail();
// Return record
return FileManagerFile::where('user_id', $shared->user_id)
return File::where('user_id', $shared->user_id)
->where('unique_id', $shared->item_id)
->firstOrFail(['name', 'basename', 'thumbnail', 'type', 'filesize', 'mimetype']);
}
@@ -248,7 +248,7 @@ class FileSharingController extends Controller
Guardian::check_item_access($shared->item_id, $shared);
// Get folders
$folders = FileManagerFolder::with('folders:id,parent_id,unique_id,name')
$folders = Folder::with('folders:id,parent_id,unique_id,name')
->where('parent_id', $shared->item_id)
->where('user_id', $shared->user_id)
->sortable()
@@ -279,7 +279,7 @@ class FileSharingController extends Controller
Guardian::check_item_access($shared->item_id, $shared);
// Get folders
$folders = FileManagerFolder::with('folders:id,parent_id,unique_id,name')
$folders = Folder::with('folders:id,parent_id,unique_id,name')
->where('parent_id', $shared->item_id)
->where('user_id', $shared->user_id)
->sortable()
@@ -309,15 +309,15 @@ class FileSharingController extends Controller
$shared = get_shared($request->cookie('shared_token'));
// Search files id db
$searched_files = FileManagerFile::search($request->input('query'))
$searched_files = File::search($request->input('query'))
->where('user_id', $shared->user_id)
->get();
$searched_folders = FileManagerFolder::search($request->input('query'))
$searched_folders = Folder::search($request->input('query'))
->where('user_id', $shared->user_id)
->get();
// Get all children content
$foldersIds = FileManagerFolder::with('folders:id,parent_id,unique_id,name')
$foldersIds = Folder::with('folders:id,parent_id,unique_id,name')
->where('user_id', $shared->user_id)
->where('parent_id', $shared->item_id)
->get();
@@ -357,15 +357,15 @@ class FileSharingController extends Controller
}
// Search files id db
$searched_files = FileManagerFile::search($request->input('query'))
$searched_files = File::search($request->input('query'))
->where('user_id', $shared->user_id)
->get();
$searched_folders = FileManagerFolder::search($request->input('query'))
$searched_folders = Folder::search($request->input('query'))
->where('user_id', $shared->user_id)
->get();
// Get all children content
$foldersIds = FileManagerFolder::with('folders:id,parent_id,unique_id,name')
$foldersIds = Folder::with('folders:id,parent_id,unique_id,name')
->where('user_id', $shared->user_id)
->where('parent_id', $shared->item_id)
->get();
@@ -403,12 +403,12 @@ class FileSharingController extends Controller
*/
private function get_items($unique_id, $shared): array
{
$folders = FileManagerFolder::where('user_id', $shared->user_id)
$folders = Folder::where('user_id', $shared->user_id)
->where('parent_id', $unique_id)
->sortable()
->get();
$files = FileManagerFile::where('user_id', $shared->user_id)
$files = File::where('user_id', $shared->user_id)
->where('folder_id', $unique_id)
->sortable()
->get();
app/Http/Controllers/User/AccountController.php
+2 -2
View File
@@ -2,8 +2,8 @@
namespace App\Http\Controllers\User;
use App\FileManagerFile;
use App\FileManagerFolder;
use App\File;
use App\Folder;
use App\Http\Resources\InvoiceCollection;
use App\Http\Resources\StorageDetailResource;
use App\Http\Resources\UserResource;
app/Http/Helpers/helpers.php
+6 -6
View File
@@ -1,7 +1,7 @@
<?php
use App\FileManagerFile;
use App\FileManagerFolder;
use App\File;
use App\Folder;
use App\User;
use App\Setting;
use App\Share;
@@ -201,13 +201,13 @@ function get_item($type, $unique_id, $user_id)
if ($type === 'folder') {
// Return folder item
return FileManagerFolder::where('unique_id', $unique_id)
return Folder::where('unique_id', $unique_id)
->where('user_id', $user_id)
->firstOrFail();
}
// Return file item
return FileManagerFile::where('unique_id', $unique_id)
return File::where('unique_id', $unique_id)
->where('user_id', $user_id)
->firstOrFail();
}
@@ -245,8 +245,8 @@ function is_editor($shared)
function get_unique_id(): int
{
// Get files and folders
$folders = FileManagerFolder::withTrashed()->get();
$files = FileManagerFile::withTrashed()->get();
$folders = Folder::withTrashed()->get();
$files = File::withTrashed()->get();
// Get last ids
$folders_unique = $folders->isEmpty() ? 0 : $folders->last()->unique_id;
app/Http/Resources/UserStorageResource.php
+6 -6
View File
@@ -2,7 +2,7 @@
namespace App\Http\Resources;
use App\FileManagerFile;
use App\File;
use ByteUnits\Metric;
use Illuminate\Http\Resources\Json\JsonResource;
@@ -21,31 +21,31 @@ class UserStorageResource extends JsonResource
];
// Get all images
$images = FileManagerFile::where('user_id', $this->id)
$images = File::where('user_id', $this->id)
->where('type', 'image')->get()->map(function ($item) {
return (int)$item->getRawOriginal('filesize');
})->sum();
// Get all audios
$audios = FileManagerFile::where('user_id', $this->id)
$audios = File::where('user_id', $this->id)
->where('type', 'audio')->get()->map(function ($item) {
return (int)$item->getRawOriginal('filesize');
})->sum();
// Get all videos
$videos = FileManagerFile::where('user_id', $this->id)
$videos = File::where('user_id', $this->id)
->where('type', 'video')->get()->map(function ($item) {
return (int)$item->getRawOriginal('filesize');
})->sum();
// Get all documents
$documents = FileManagerFile::where('user_id', $this->id)
$documents = File::where('user_id', $this->id)
->whereIn('mimetype', $document_mimetypes)->get()->map(function ($item) {
return (int)$item->getRawOriginal('filesize');
})->sum();
// Get all other files
$others = FileManagerFile::where('user_id', $this->id)
$others = File::where('user_id', $this->id)
->whereNotIn('mimetype', $document_mimetypes)
->whereNotIn('type', ['audio', 'video', 'image'])
->get()->map(function ($item) {
app/Http/Tools/Demo.php
+4 -4
View File
@@ -4,8 +4,8 @@ namespace App\Http\Tools;
use App;
use App\Share;
use App\FileManagerFile;
use App\FileManagerFolder;
use App\File;
use App\Folder;
use App\Http\Requests\FileFunctions\RenameItemRequest;
use App\User;
use ByteUnits\Metric;
@@ -59,13 +59,13 @@ class Demo
// Get item
if ($request->type === 'folder') {
$item = FileManagerFolder::where('unique_id', $unique_id)
$item = Folder::where('unique_id', $unique_id)
->where('user_id', 1)
->first();
} else {
$item = FileManagerFile::where('unique_id', $unique_id)
$item = File::where('unique_id', $unique_id)
->where('user_id', 1)
->first();
}
app/Http/Tools/Editor.php
+13 -13
View File
@@ -4,8 +4,8 @@ namespace App\Http\Tools;
use App;
use App\Share;
use App\FileManagerFile;
use App\FileManagerFolder;
use App\File;
use App\Folder;
use App\Http\Requests\FileFunctions\RenameItemRequest;
use App\User;
use App\Zip;
@@ -38,7 +38,7 @@ class Editor
$user_id = is_null($shared) ? Auth::id() : $shared->user_id;
// Get folder
$folder = FileManagerFolder::where('user_id', $user_id)
$folder = Folder::where('user_id', $user_id)
->where('unique_id', $unique_id)
->first();
@@ -76,7 +76,7 @@ class Editor
public static function zip_folder($unique_id, $shared = null)
{
// Get folder
$requested_folder = FileManagerFolder::with(['folders.files', 'files'])
$requested_folder = Folder::with(['folders.files', 'files'])
->where('unique_id', $unique_id)
->where('user_id', Auth::id() ?? $shared->user_id)
->with('folders')
@@ -217,7 +217,7 @@ class Editor
*
* @param $request
* @param null $shared
* @return FileManagerFolder|\Illuminate\Database\Eloquent\Model
* @return Folder|\Illuminate\Database\Eloquent\Model
*/
public static function create_folder($request, $shared = null)
{
@@ -228,7 +228,7 @@ class Editor
$unique_id = get_unique_id();
// Create folder
$folder = FileManagerFolder::create([
$folder = Folder::create([
'parent_id' => $request->parent_id,
'unique_id' => $unique_id,
'user_scope' => $user_scope,
@@ -284,7 +284,7 @@ class Editor
if ($file['type'] === 'folder') {
// Get folder
$folder = FileManagerFolder::withTrashed()
$folder = Folder::withTrashed()
->with(['folders'])
->where('user_id', $user->id)
->where('unique_id', $unique_id)
@@ -308,7 +308,7 @@ class Editor
$child_folders = filter_folders_ids($folder->trashed_folders, 'unique_id');
// Get children files
$files = FileManagerFile::onlyTrashed()
$files = File::onlyTrashed()
->where('user_id', $user->id)
->whereIn('folder_id', Arr::flatten([$unique_id, $child_folders]))
->get();
@@ -345,7 +345,7 @@ class Editor
if ($file['type'] !== 'folder') {
// Get file
$item = FileManagerFile::withTrashed()
$item = File::withTrashed()
->where('user_id', $user->id)
->where('unique_id', $unique_id)
->first();
@@ -401,7 +401,7 @@ class Editor
if ($item['type'] === 'folder') {
// Move folder
$item = FileManagerFolder::where('user_id', $user_id)
$item = Folder::where('user_id', $user_id)
->where('unique_id', $unique_id)
->firstOrFail();
@@ -412,7 +412,7 @@ class Editor
} else {
// Move file under new folder
$item = FileManagerFile::where('user_id', $user_id)
$item = File::where('user_id', $user_id)
->where('unique_id', $unique_id)
->firstOrFail();
@@ -428,7 +428,7 @@ class Editor
*
* @param $request
* @param null $shared
* @return FileManagerFile|\Illuminate\Database\Eloquent\Model
* @return File|\Illuminate\Database\Eloquent\Model
* @throws \Exception
*/
public static function upload($request, $shared = null)
@@ -523,7 +523,7 @@ class Editor
}
// Return new file
return FileManagerFile::create($options);
return File::create($options);
}
}
app/Http/Tools/Guardian.php
+2 -2
View File
@@ -3,7 +3,7 @@
namespace App\Http\Tools;
use App;
use App\FileManagerFolder;
use App\Folder;
use Illuminate\Support\Arr;
@@ -18,7 +18,7 @@ class Guardian
public static function check_item_access($requested_id, $shared)
{
// Get all children folders
$foldersIds = FileManagerFolder::with('folders:id,parent_id,unique_id,name')
$foldersIds = Folder::with('folders:id,parent_id,unique_id,name')
->where('user_id', $shared->user_id)
->where('parent_id', $shared->item_id)
->get();