A free open source IT asset/license management system
Removed Storage::exists() for directory checks
snipe46c9cc23a59c
diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.phpindex fc5c610322..530fec523f 100644--- a/app/Http/Controllers/Account/AcceptanceController.php+++ b/app/Http/Controllers/Account/AcceptanceController.php@@ -149,20 +149,6 @@ class AcceptanceController extends Controllerreturn redirect()->back()->with('error', trans('admin/users/message.error.accept_or_decline'));}- /**- * Check for the signature directory- */- if (! Storage::exists(rtrim(FileStorage::Signatures->privateStorageKey(), '/'))) {- Storage::makeDirectory(rtrim(FileStorage::Signatures->privateStorageKey(), '/'), 775);- }-- /**- * Check for the eula-pdfs directory- */- if (! Storage::exists(rtrim(FileStorage::EulaPdfs->privateStorageKey(), '/'))) {- Storage::makeDirectory(rtrim(FileStorage::EulaPdfs->privateStorageKey(), '/'), 775);- }-$item = $acceptance->checkoutable_type::find($acceptance->checkoutable_id);$username_slug = Str::slug($assignedUser->username);diff --git a/app/Http/Controllers/Api/UploadedFilesController.php b/app/Http/Controllers/Api/UploadedFilesController.phpindex 3fdf70c4cd..595b30e75c 100644--- a/app/Http/Controllers/Api/UploadedFilesController.php+++ b/app/Http/Controllers/Api/UploadedFilesController.php@@ -107,11 +107,6 @@ class UploadedFilesController extends Controllerreturn response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.invalid_object')));}- // If the file storage directory doesn't exist, create it- if (! Storage::exists(parent::getMapStoragePath()[$object_type])) {- Storage::makeDirectory(parent::getMapStoragePath()[$object_type], 775);- }-if ($request->hasFile('file')) {// Loop over the attached files and add them to the objectforeach ($request->file('file') as $file) {diff --git a/app/Http/Controllers/MaintenancesController.php b/app/Http/Controllers/MaintenancesController.phpindex a438f9df17..35933f919d 100644--- a/app/Http/Controllers/MaintenancesController.php+++ b/app/Http/Controllers/MaintenancesController.php@@ -14,7 +14,6 @@ use App\Models\MaintenanceType;use Illuminate\Contracts\View\View;use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;-use Illuminate\Support\Facades\Storage;use Illuminate\Support\Facades\Validator;/**@@ -315,10 +314,6 @@ class MaintenancesController extends Controller$objectType = 'maintenances';$storagePath = parent::getMapStoragePath()[$objectType];- if (! Storage::exists($storagePath)) {- Storage::makeDirectory($storagePath, 775);- }-$uploadFileRequest = app(UploadFileRequest::class);foreach ((array) $request->file('file') as $file) {diff --git a/app/Http/Controllers/UploadedFilesController.php b/app/Http/Controllers/UploadedFilesController.phpindex 230dd37633..7e8e7579dc 100644--- a/app/Http/Controllers/UploadedFilesController.php+++ b/app/Http/Controllers/UploadedFilesController.php@@ -47,11 +47,6 @@ class UploadedFilesController extends Controllerreturn redirect()->back()->withFragment('files')->with('error', trans('general.file_upload_status.invalid_object'));}- // If the file storage directory doesn't exist, create it- if (! Storage::exists(parent::getMapStoragePath()[$object_type])) {- Storage::makeDirectory(parent::getMapStoragePath()[$object_type], 775);- }-if ($request->hasFile('file')) {// Loop over the attached files and add them to the objectforeach ($request->file('file') as $file) {diff --git a/app/Http/Middleware/SecurityHeaders.php b/app/Http/Middleware/SecurityHeaders.phpindex 1d014ef78f..1a988a33d6 100644--- a/app/Http/Middleware/SecurityHeaders.php+++ b/app/Http/Middleware/SecurityHeaders.php@@ -88,11 +88,8 @@ class SecurityHeaders$csp_policy[] = "connect-src 'self'";$csp_policy[] = "object-src 'none'";$csp_policy[] = "font-src 'self' data:";- $csp_policy[] = "img-src 'self' data: ".config('app.url').' '.config('app.additional_csp_urls').' '.config('filesystems.disks.public_aws.url').' https://secure.gravatar.com http://gravatar.com maps.google.com maps.gstatic.com *.googleapis.com';+ $csp_policy[] = "img-src 'self' data: ".config('app.url').' '.config('app.additional_csp_urls').' '.config('filesystems.disks.public.url').' https://secure.gravatar.com http://gravatar.com maps.google.com maps.gstatic.com *.googleapis.com';- if (config('filesystems.disks.public.driver') == 's3') {- $csp_policy[] = "img-src 'self' data: ".config('filesystems.disks.public.url');- }$csp_policy = implode(';', $csp_policy);$response->headers->set('Content-Security-Policy', $csp_policy);