A free open source IT asset/license management system
Switched self:: to parent:: to make Codacy shush
snipeed2c8ae5b232
diff --git a/app/Http/Controllers/Api/UploadedFilesController.php b/app/Http/Controllers/Api/UploadedFilesController.phpindex 9de28b595a..cdad95bfa8 100644--- a/app/Http/Controllers/Api/UploadedFilesController.php+++ b/app/Http/Controllers/Api/UploadedFilesController.php@@ -31,7 +31,7 @@ class UploadedFilesController extends Controller{// Check the permissions to make sure the user can view the object- $object = self::$map_object_type[$object_type]::withTrashed()->find($id);+ $object = parent::$map_object_type[$object_type]::withTrashed()->find($id);$this->authorize('files', $object);if (! $object) {@@ -49,7 +49,7 @@ class UploadedFilesController extends Controller'created_at',];- $uploads = self::$map_object_type[$object_type]::withTrashed()->find($id)->uploads()+ $uploads = parent::$map_object_type[$object_type]::withTrashed()->find($id)->uploads()->with('adminuser');$limit = app('api_limit_value');@@ -97,7 +97,7 @@ class UploadedFilesController extends Controller// to the object. `manageFiles` is stricter than `files` (used by// index/show below) so a read-only cascade like the one on// AssetModelPolicy does not accidentally grant write access.- $object = self::$map_object_type[$object_type]::withTrashed()->find($id);+ $object = parent::$map_object_type[$object_type]::withTrashed()->find($id);$this->authorize('manageFiles', $object);if (! $object) {@@ -105,21 +105,21 @@ class UploadedFilesController extends Controller}// If the file storage directory doesn't exist, create it- if (! Storage::exists(self::$map_storage_path[$object_type])) {- Storage::makeDirectory(self::$map_storage_path[$object_type], 775);+ if (! Storage::exists(parent::$map_storage_path[$object_type])) {+ Storage::makeDirectory(parent::$map_storage_path[$object_type], 775);}if ($request->hasFile('file')) {// Loop over the attached files and add them to the objectforeach ($request->file('file') as $file) {- $file_name = $request->handleFile(self::$map_storage_path[$object_type], self::$map_file_prefix[$object_type].'-'.$object->id, $file);+ $file_name = $request->handleFile(parent::$map_storage_path[$object_type], parent::$map_file_prefix[$object_type].'-'.$object->id, $file);$files[] = $file_name;$object->logUpload($file_name, $request->input('notes'));}if (isset($files)) {$file_results = Actionlog::select('action_logs.*')->where('action_type', '=', 'uploaded')- ->where('item_type', '=', self::$map_object_type[$object_type])+ ->where('item_type', '=', parent::$map_object_type[$object_type])->where('item_id', '=', $id)->whereIn('filename', $files)->get();@@ -147,7 +147,7 @@ class UploadedFilesController extends Controllerpublic function show($object_type, $id, $file_id): JsonResponse|StreamedResponse|Storage|StorageHelper|BinaryFileResponse{// Check the permissions to make sure the user can view the object- $object = self::$map_object_type[$object_type]::withTrashed()->find($id);+ $object = parent::$map_object_type[$object_type]::withTrashed()->find($id);$this->authorize('files', $object);if (! $object) {@@ -155,17 +155,17 @@ class UploadedFilesController extends Controller}// Check that the file being requested exists for the object- if (! $log = Actionlog::whereNotNull('filename')->where('item_type', self::$map_object_type[$object_type])->where('item_id', $object->id)->find($file_id)+ if (! $log = Actionlog::whereNotNull('filename')->where('item_type', parent::$map_object_type[$object_type])->where('item_id', $object->id)->find($file_id)) {return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.invalid_id')), 200);}- if (! Storage::exists(self::$map_storage_path[$object_type].$log->filename)) {+ if (! Storage::exists(parent::$map_storage_path[$object_type].$log->filename)) {return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.file_not_found'), 200));}if (request('inline') == 'true') {- $path = self::$map_storage_path[$object_type];+ $path = parent::$map_storage_path[$object_type];// Only allowlisted extensions may be served inline. Everything// else (including XML, which can pull an XSLT stylesheet and@@ -180,7 +180,7 @@ class UploadedFilesController extends Controller]);}- return StorageHelper::downloader(self::$map_storage_path[$object_type].$log->filename);+ return StorageHelper::downloader(parent::$map_storage_path[$object_type].$log->filename);}@@ -201,7 +201,7 @@ class UploadedFilesController extends Controller// See store(): `manageFiles` is the strict write ability so a// read-only cascade in files() does not authorize deletion.- $object = self::$map_object_type[$object_type]::withTrashed()->find($id);+ $object = parent::$map_object_type[$object_type]::withTrashed()->find($id);$this->authorize('manageFiles', $object);if (! $object) {@@ -212,14 +212,14 @@ class UploadedFilesController extends Controller$log = Actionlog::query()->where('id', $file_id)->where('action_type', 'uploaded')- ->where('item_type', self::$map_object_type[$object_type])+ ->where('item_type', parent::$map_object_type[$object_type])->where('item_id', $object->id)->first();if ($log) {// Check the file actually exists, and delete it- if (Storage::exists(self::$map_storage_path[$object_type].$log->filename)) {- Storage::delete(self::$map_storage_path[$object_type].$log->filename);+ if (Storage::exists(parent::$map_storage_path[$object_type].$log->filename)) {+ Storage::delete(parent::$map_storage_path[$object_type].$log->filename);}// Delete the record of the fileif ($log->logUploadDelete($object, $log->filename)) {diff --git a/app/Http/Controllers/MaintenancesController.php b/app/Http/Controllers/MaintenancesController.phpindex ae36dd3bbb..c5c174f95e 100644--- a/app/Http/Controllers/MaintenancesController.php+++ b/app/Http/Controllers/MaintenancesController.php@@ -299,7 +299,7 @@ class MaintenancesController extends Controller}$objectType = 'maintenances';- $storagePath = self::$map_storage_path[$objectType];+ $storagePath = parent::$map_storage_path[$objectType];if (! Storage::exists($storagePath)) {Storage::makeDirectory($storagePath, 775);@@ -314,7 +314,7 @@ class MaintenancesController extends Controller$fileName = $uploadFileRequest->handleFile($storagePath,- self::$map_file_prefix[$objectType].'-'.$maintenance->id,+ parent::$map_file_prefix[$objectType].'-'.$maintenance->id,$file);diff --git a/app/Http/Controllers/QrCodeController.php b/app/Http/Controllers/QrCodeController.phpindex 4acaad619f..6781ca4f41 100644--- a/app/Http/Controllers/QrCodeController.php+++ b/app/Http/Controllers/QrCodeController.php@@ -35,7 +35,7 @@ class QrCodeController extends Controllerreturn $object_type.' is not a valid type.';}- $object = self::$map_object_type[$object_type]::withTrashed()->find($id);+ $object = parent::$map_object_type[$object_type]::withTrashed()->find($id);if (! $object) {return 'That item is invalid';diff --git a/app/Http/Controllers/UploadedFilesController.php b/app/Http/Controllers/UploadedFilesController.phpindex dad39672da..b9317d4033 100644--- a/app/Http/Controllers/UploadedFilesController.php+++ b/app/Http/Controllers/UploadedFilesController.php@@ -39,7 +39,7 @@ class UploadedFilesController extends Controller// to the object. `manageFiles` is stricter than `files` (used by// show/download) so a read-only cascade like the one on// AssetModelPolicy does not accidentally grant write access.- $object = self::$map_object_type[$object_type]::withTrashed()->find($id);+ $object = parent::$map_object_type[$object_type]::withTrashed()->find($id);$this->authorize('manageFiles', $object);if (! $object) {@@ -47,20 +47,20 @@ class UploadedFilesController extends Controller}// If the file storage directory doesn't exist, create it- if (! Storage::exists(self::$map_storage_path[$object_type])) {- Storage::makeDirectory(self::$map_storage_path[$object_type], 775);+ if (! Storage::exists(parent::$map_storage_path[$object_type])) {+ Storage::makeDirectory(parent::$map_storage_path[$object_type], 775);}if ($request->hasFile('file')) {// Loop over the attached files and add them to the objectforeach ($request->file('file') as $file) {- $file_name = $request->handleFile(self::$map_storage_path[$object_type], self::$map_file_prefix[$object_type].'-'.$object->id, $file);+ $file_name = $request->handleFile(parent::$map_storage_path[$object_type], parent::$map_file_prefix[$object_type].'-'.$object->id, $file);$files[] = $file_name;$object->logUpload($file_name, $request->input('notes'));}$files = Actionlog::select('action_logs.*')->where('action_type', '=', 'uploaded')- ->where('item_type', '=', self::$map_object_type[$object_type])+ ->where('item_type', '=', parent::$map_object_type[$object_type])->where('item_id', '=', $id)->whereIn('filename', $files)->get();@@ -87,7 +87,7 @@ class UploadedFilesController extends Controllerpublic function show($object_type, $id, $file_id): RedirectResponse|StreamedResponse|Storage|StorageHelper|BinaryFileResponse{// Check the permissions to make sure the user can view the object- $object = self::$map_object_type[$object_type]::withTrashed()->find($id);+ $object = parent::$map_object_type[$object_type]::withTrashed()->find($id);$this->authorize('files', $object);if (! $object) {@@ -95,16 +95,16 @@ class UploadedFilesController extends Controller}// Check that the file being requested exists for the object- if (! $log = Actionlog::whereNotNull('filename')->where('item_type', self::$map_object_type[$object_type])->where('item_id', $object->id)->find($file_id)) {+ if (! $log = Actionlog::whereNotNull('filename')->where('item_type', parent::$map_object_type[$object_type])->where('item_id', $object->id)->find($file_id)) {return redirect()->back()->withFragment('files')->with('error', trans('general.file_upload_status.invalid_id'));}- if (! Storage::exists(self::$map_storage_path[$object_type].$log->filename)) {+ if (! Storage::exists(parent::$map_storage_path[$object_type].$log->filename)) {return redirect()->back()->withFragment('files')->with('error', trans('general.file_upload_status.file_not_found'));}if (request('inline') == 'true') {- $path = self::$map_storage_path[$object_type];+ $path = parent::$map_storage_path[$object_type];if (! StorageHelper::allowSafeInline($path.$log->filename)) {return StorageHelper::downloader($path.$log->filename);@@ -113,7 +113,7 @@ class UploadedFilesController extends Controllerreturn Storage::download($path.$log->filename, $log->filename, ['Content-Disposition' => 'inline']);}- return StorageHelper::downloader(self::$map_storage_path[$object_type].$log->filename);+ return StorageHelper::downloader(parent::$map_storage_path[$object_type].$log->filename);}@@ -134,7 +134,7 @@ class UploadedFilesController extends Controller// See store(): `manageFiles` is the strict write ability so a// read-only cascade in files() does not authorize deletion.- $object = self::$map_object_type[$object_type]::withTrashed()->find($id);+ $object = parent::$map_object_type[$object_type]::withTrashed()->find($id);$this->authorize('manageFiles', $object);if (! $object) {@@ -142,13 +142,13 @@ class UploadedFilesController extends Controller}// Check for the file- $log = Actionlog::where('id', $file_id)->where('item_type', self::$map_object_type[$object_type])+ $log = Actionlog::where('id', $file_id)->where('item_type', parent::$map_object_type[$object_type])->where('item_id', $object->id)->first();if ($log) {// Check the file actually exists, and delete it- if (Storage::exists(self::$map_storage_path[$object_type].$log->filename)) {- Storage::delete(self::$map_storage_path[$object_type].$log->filename);+ if (Storage::exists(parent::$map_storage_path[$object_type].$log->filename)) {+ Storage::delete(parent::$map_storage_path[$object_type].$log->filename);}// Delete the record of the fileif ($log->logUploadDelete($object, $log->filename)) {