nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-30 19:45:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

code style fix

Browse Source
This commit is contained in:
Peter Papp
2021-04-25 09:02:00 +02:00
parent e103e61617
commit c47886fb8b
157 changed files with 2250 additions and 2583 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Sharing/BrowseShareController.php
+22 -26
View File
@@ -1,20 +1,19 @@
<?php
namespace App\Http\Controllers\Sharing;
use App\Http\Controllers\Controller;
use App\Http\Requests\Share\AuthenticateShareRequest;
use App\Http\Resources\FileResource;
use App\Http\Resources\ShareResource;
use App\Models\File;
use App\Models\Folder;
use App\Models\Share;
use App\Services\HelperService;
use Illuminate\Http\Request;
use App\Models\Folder;
use Illuminate\Support\Arr;
use Illuminate\Http\Request;
use App\Services\HelperService;
use Illuminate\Support\Collection;
use App\Http\Controllers\Controller;
use App\Http\Resources\FileResource;
use Illuminate\Support\Facades\Hash;
use App\Http\Resources\ShareResource;
use Illuminate\Support\Facades\Storage;
use App\Http\Requests\Share\AuthenticateShareRequest;
class BrowseShareController extends Controller
{
@@ -38,27 +37,25 @@ class BrowseShareController extends Controller
}
// Check if shared is image file and then show it
if ($shared->type === 'file' && !$shared->is_protected) {
if ($shared->type === 'file' && ! $shared->is_protected) {
$image = File::whereUserId($shared->user_id)
->whereType('image')
->whereId($shared->item_id)
->first();
if ($image) {
// Store user download size
$shared
->user
->record_download(
(int)$image->getRawOriginal('filesize')
(int) $image->getRawOriginal('filesize')
);
return $this->get_single_image($image, $shared->user_id);
}
}
return view("index")
return view('index')
->with('installation', 'setup-done')
->with('settings', get_settings_in_json() ?? null);
}
@@ -74,9 +71,8 @@ class BrowseShareController extends Controller
{
// Check password
if (Hash::check($request->password, $shared->password)) {
$cookie = json_encode([
'token' => $shared->token,
'token' => $shared->token,
'authenticated' => true,
]);
@@ -151,7 +147,6 @@ class BrowseShareController extends Controller
// Filter files
$files = $searched_files->filter(function ($file) use ($accessible_folder_ids, $shared) {
// Set public urls
$file->setPublicUrl($shared->token);
@@ -161,7 +156,6 @@ class BrowseShareController extends Controller
// Filter folders
$folders = $searched_folders->filter(function ($folder) use ($accessible_folder_ids) {
// check if item is in accessible folders
return in_array($folder->id, $accessible_folder_ids);
});
@@ -194,11 +188,11 @@ class BrowseShareController extends Controller
return [
[
'id' => $shared->item_id,
'name' => __t('home'),
'id' => $shared->item_id,
'name' => __t('home'),
'location' => 'public',
'folders' => $folders,
]
'folders' => $folders,
],
];
}
@@ -240,13 +234,15 @@ class BrowseShareController extends Controller
$path = "/files/$user_id/$file->basename";
// Check if file exist
if (!Storage::exists($path)) abort(404);
if (! Storage::exists($path)) {
abort(404);
}
return Storage::response($path, $file_pretty_name, [
"Content-Type" => Storage::mimeType($path),
"Content-Length" => Storage::size($path),
"Accept-Ranges" => "bytes",
"Content-Range" => "bytes 0-600/" . Storage::size($path),
'Content-Type' => Storage::mimeType($path),
'Content-Length' => Storage::size($path),
'Accept-Ranges' => 'bytes',
'Content-Range' => 'bytes 0-600/' . Storage::size($path),
]);
}
}
app/Http/Controllers/Sharing/FileSharedAccessController.php
+10 -12
View File
@@ -1,13 +1,11 @@
<?php
namespace App\Http\Controllers\Sharing;
use App\Http\Controllers\Controller;
use App\Models\File as UserFile;
use App\Models\Share;
use App\Models\Zip;
use App\Models\Share;
use App\Services\HelperService;
use Illuminate\Http\Request;
use App\Models\File as UserFile;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Storage;
class FileSharedAccessController extends Controller
@@ -42,11 +40,11 @@ class FileSharedAccessController extends Controller
return $disk
->download("zip/$zip->basename", $zip->basename, [
"Content-Type" => 'application/zip',
"Content-Length" => $disk->size("zip/$zip->basename"),
"Accept-Ranges" => "bytes",
"Content-Range" => "bytes 0-600/" . $disk->size("zip/$zip->basename"),
"Content-Disposition" => "attachment; filename=" . $zip->basename,
'Content-Type' => 'application/zip',
'Content-Length' => $disk->size("zip/$zip->basename"),
'Accept-Ranges' => 'bytes',
'Content-Range' => 'bytes 0-600/' . $disk->size("zip/$zip->basename"),
'Content-Disposition' => 'attachment; filename=' . $zip->basename,
]);
}
@@ -74,7 +72,7 @@ class FileSharedAccessController extends Controller
$shared
->user
->record_download(
(int)$file->getRawOriginal('filesize')
(int) $file->getRawOriginal('filesize')
);
return $this->helper->download_file($file, $shared->user_id);
@@ -104,7 +102,7 @@ class FileSharedAccessController extends Controller
$shared
->user
->record_download(
(int)$file->getRawOriginal('filesize')
(int) $file->getRawOriginal('filesize')
);
return $this->helper->download_thumbnail_file($file, $shared->user_id);
app/Http/Controllers/Sharing/ManipulateShareItemsController.php
+19 -26
View File
@@ -1,23 +1,21 @@
<?php
namespace App\Http\Controllers\Sharing;
use App\Http\Controllers\Controller;
use App\Http\Requests\FileFunctions\CreateFolderRequest;
use App\Http\Requests\FileFunctions\DeleteItemRequest;
use App\Http\Requests\FileFunctions\MoveItemRequest;
use App\Http\Requests\FileFunctions\RenameItemRequest;
use App\Http\Requests\FileFunctions\UploadRequest;
use App\Models\File;
use App\Models\Folder;
use App\Models\Share;
use App\Services\DemoService;
use App\Services\FileManagerService;
use App\Services\HelperService;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Database\Eloquent\Model;
use App\Models\Folder;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use App\Services\DemoService;
use App\Services\HelperService;
use App\Http\Controllers\Controller;
use App\Services\FileManagerService;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Contracts\Routing\ResponseFactory;
use App\Http\Requests\FileFunctions\UploadRequest;
use App\Http\Requests\FileFunctions\MoveItemRequest;
use App\Http\Requests\FileFunctions\DeleteItemRequest;
use App\Http\Requests\FileFunctions\RenameItemRequest;
use App\Http\Requests\FileFunctions\CreateFolderRequest;
class ManipulateShareItemsController extends Controller
{
@@ -123,7 +121,6 @@ class ManipulateShareItemsController extends Controller
{
abort_if(is_demo_account($shared->user->email), 204, 'Done.');
// Check ability to access protected share record
$this->helper->check_protected_share_record($shared);
@@ -133,7 +130,6 @@ class ManipulateShareItemsController extends Controller
}
foreach ($request->items as $file) {
// Get file|folder item
$item = get_item($file['type'], $file['id']);
@@ -205,22 +201,19 @@ class ManipulateShareItemsController extends Controller
}
foreach ($request->items as $item) {
if ($item['type'] === 'folder') {
$this->helper->check_item_access([
$request->to_id, $item['id']
$request->to_id, $item['id'],
], $shared);
}
if ($item['type'] !== 'folder') {
$file = File::where('id', $item['id'])
->where('user_id', $shared->user_id)
->firstOrFail();
$this->helper->check_item_access([
$request->to_id, $file->folder_id
$request->to_id, $file->folder_id,
], $shared);
}
}
@@ -250,7 +243,7 @@ class ManipulateShareItemsController extends Controller
$folder = Folder::whereUserId($shared->user_id)
->where('id', $id);
if (!$folder->exists()) {
if (! $folder->exists()) {
abort(404, 'Requested folder doesn\'t exists.');
}
@@ -258,8 +251,8 @@ class ManipulateShareItemsController extends Controller
// Get file
return response([
'url' => route('zip_public', [
'id' => $zip->id,
'url' => route('zip_public', [
'id' => $zip->id,
'token' => $shared->token,
]),
'name' => $zip->basename,
@@ -297,8 +290,8 @@ class ManipulateShareItemsController extends Controller
// Get file
return response([
'url' => route('zip_public', [
'id' => $zip->id,
'url' => route('zip_public', [
'id' => $zip->id,
'token' => $shared->token,
]),
'name' => $zip->basename,