A free open source IT asset/license management system
Apply pint to non-API controllers
snipe9bc92f57c8a2
diff --git a/app/Http/Controllers/Accessories/AccessoriesController.php b/app/Http/Controllers/Accessories/AccessoriesController.phpindex 2be6a77c5c..3e773a5591 100755--- a/app/Http/Controllers/Accessories/AccessoriesController.php+++ b/app/Http/Controllers/Accessories/AccessoriesController.php@@ -7,11 +7,11 @@ use App\Http\Controllers\Controller;use App\Http\Requests\ImageUploadRequest;use App\Models\Accessory;use App\Models\Company;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;+use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Storage;use Illuminate\Support\Facades\Validator;-use \Illuminate\Contracts\View\View;-use \Illuminate\Http\RedirectResponse;-use Illuminate\Support\Facades\Log;/** This controller handles all actions related to Accessories for* the Snipe-IT Asset Management application.@@ -25,12 +25,14 @@ class AccessoriesController extends Controller* the content for the accessories listing, which is generated in getDatatable.** @author [A. Gianotto] [<[email protected]>]+ ** @see AccessoriesController::getDatatable() method that generates the JSON response* @since [v1.0]*/- public function index() : View+ public function index(): View{$this->authorize('index', Accessory::class);+return view('accessories.index');}@@ -39,43 +41,42 @@ class AccessoriesController extends Controller** @author [A. Gianotto] [<[email protected]>]*/- public function create() : View+ public function create(): View{$this->authorize('create', Accessory::class);$category_type = 'accessory';return view('accessories/edit')->with('category_type', $category_type)- ->with('item', new Accessory);+ ->with('item', new Accessory);}/*** Validate and save new Accessory from form post** @author [A. Gianotto] [<[email protected]>]- * @param ImageUploadRequest $request*/- public function store(ImageUploadRequest $request) : RedirectResponse+ public function store(ImageUploadRequest $request): RedirectResponse{$this->authorize(Accessory::class);-+// create a new model instance- $accessory = new Accessory();+ $accessory = new Accessory;// Update the accessory data- $accessory->name = request('name');- $accessory->category_id = request('category_id');- $accessory->location_id = request('location_id');- $accessory->min_amt = request('min_amt');- $accessory->company_id = Company::getIdForCurrentUser(request('company_id'));- $accessory->order_number = request('order_number');- $accessory->manufacturer_id = request('manufacturer_id');- $accessory->model_number = request('model_number');- $accessory->purchase_date = request('purchase_date');- $accessory->purchase_cost = request('purchase_cost');- $accessory->qty = request('qty');- $accessory->created_by = auth()->id();- $accessory->supplier_id = request('supplier_id');- $accessory->notes = request('notes');+ $accessory->name = request('name');+ $accessory->category_id = request('category_id');+ $accessory->location_id = request('location_id');+ $accessory->min_amt = request('min_amt');+ $accessory->company_id = Company::getIdForCurrentUser(request('company_id'));+ $accessory->order_number = request('order_number');+ $accessory->manufacturer_id = request('manufacturer_id');+ $accessory->model_number = request('model_number');+ $accessory->purchase_date = request('purchase_date');+ $accessory->purchase_cost = request('purchase_cost');+ $accessory->qty = request('qty');+ $accessory->created_by = auth()->id();+ $accessory->supplier_id = request('supplier_id');+ $accessory->notes = request('notes');if ($request->has('use_cloned_image')) {$cloned_model_img = Accessory::select('image')->find($request->input('clone_image_from_id'));@@ -90,7 +91,7 @@ class AccessoriesController extends Controller$accessory = $request->handleImages($accessory);}- if($request->input('redirect_option') === 'back'){+ if ($request->input('redirect_option') === 'back') {session()->put(['redirect_option' => 'index']);} else {session()->put(['redirect_option' => $request->input('redirect_option')]);@@ -110,12 +111,14 @@ class AccessoriesController extends Controller* Return view for the Accessory update form, prepopulated with existing data** @author [A. Gianotto] [<[email protected]>]- * @param int $accessoryId+ *+ * @param int $accessoryId*/- public function edit(Accessory $accessory) : View | RedirectResponse+ public function edit(Accessory $accessory): View|RedirectResponse{$this->authorize('update', $accessory);session()->put('url.intended', url()->previous());+return view('accessories.edit')->with('item', $accessory)->with('category_type', 'accessory');}@@ -123,10 +126,12 @@ class AccessoriesController extends Controller* Returns a view that presents a form to clone an accessory.** @author [J. Vinsmoke]- * @param int $accessoryId+ *+ * @param int $accessoryId+ ** @since [v6.0]*/- public function getClone(Accessory $accessory) : View | RedirectResponse+ public function getClone(Accessory $accessory): View|RedirectResponse{$this->authorize('create', $accessory);@@ -138,24 +143,24 @@ class AccessoriesController extends Controllerreturn view('accessories/edit')->with('cloned_model', $accessory_to_clone)->with('item', $cloned);-+}/*** Save edited Accessory from form post** @author [A. Gianotto] [<[email protected]>]- * @param ImageUploadRequest $request- * @param int $accessoryId+ *+ * @param int $accessoryId*/- public function update(ImageUploadRequest $request, Accessory $accessory) : RedirectResponse+ public function update(ImageUploadRequest $request, Accessory $accessory): RedirectResponse{$this->authorize('update', $accessory);if ($accessory = Accessory::withCount('checkouts as checkouts_count')->find($accessory->id)) {$validator = Validator::make($request->all(), [- "qty" => "required|numeric|min:$accessory->checkouts_count"+ 'qty' => "required|numeric|min:$accessory->checkouts_count",]);if ($validator->fails()) {@@ -181,7 +186,7 @@ class AccessoriesController extends Controller$accessory = $request->handleImages($accessory);- if ($request->input('redirect_option') === 'back'){+ if ($request->input('redirect_option') === 'back') {session()->put(['redirect_option' => 'index']);} else {session()->put(['redirect_option' => $request->input('redirect_option')]);@@ -202,9 +207,10 @@ class AccessoriesController extends Controller* Delete the given accessory.** @author [A. Gianotto] [<[email protected]>]- * @param int $accessoryId+ *+ * @param int $accessoryId*/- public function destroy(Accessory $accessory) : RedirectResponse+ public function destroy(Accessory $accessory): RedirectResponse{$this->authorize('delete', $accessory);$accessory->loadCount('checkouts as checkouts_count');@@ -226,21 +232,23 @@ class AccessoriesController extends Controllerreturn redirect()->route('accessories.index')->with('error', trans('admin/accessories/general.delete_disabled'));}-/*** Returns a view that invokes the ajax table which contains* the content for the accessory detail view, which is generated in getDataView.** @author [A. Gianotto] [<[email protected]>]- * @param int $accessoryID+ *+ * @param int $accessoryID+ ** @see AccessoriesController::getDataView() method that generates the JSON response* @since [v1.0]*/- public function show(Accessory $accessory) : View | RedirectResponse+ public function show(Accessory $accessory): View|RedirectResponse{$this->authorize('view', $accessory);$accessory->loadCount('checkouts as checkouts_count');- $accessory->load(['adminuser' => fn($query) => $query->withTrashed()]);+ $accessory->load(['adminuser' => fn ($query) => $query->withTrashed()]);+return view('accessories.view', compact('accessory'));}}diff --git a/app/Http/Controllers/Accessories/AccessoryCheckinController.php b/app/Http/Controllers/Accessories/AccessoryCheckinController.phpindex 11a3f9d6fc..5a7dc55bcf 100644--- a/app/Http/Controllers/Accessories/AccessoryCheckinController.php+++ b/app/Http/Controllers/Accessories/AccessoryCheckinController.php@@ -7,10 +7,10 @@ use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Models\Accessory;use App\Models\AccessoryCheckout;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;use Illuminate\Support\Facades\DB;-use \Illuminate\Contracts\View\View;-use \Illuminate\Http\RedirectResponse;class AccessoryCheckinController extends Controller{@@ -18,11 +18,12 @@ class AccessoryCheckinController extends Controller* Check the accessory back into inventory** @author [A. Gianotto] [<[email protected]>]- * @param Request $request- * @param int $accessoryUserId- * @param string $backto+ *+ * @param Request $request+ * @param int $accessoryUserId+ * @param string $backto*/- public function create($accessoryUserId = null, $backto = null) : View | RedirectResponse+ public function create($accessoryUserId = null, $backto = null): View|RedirectResponse{if (is_null($accessory_user = DB::table('accessories_checkout')->find($accessoryUserId))) {return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));@@ -31,14 +32,13 @@ class AccessoryCheckinController extends Controller$accessory = Accessory::find($accessory_user->accessory_id);$this->authorize('checkin', $accessory);- //based on what the accessory is checked out to the target redirect option will be displayed accordingly.+ // based on what the accessory is checked out to the target redirect option will be displayed accordingly.$target_option = match ($accessory_user->assigned_type) {'App\Models\Asset' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.asset')]),'App\Models\Location' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.location')]),default => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.user')]),};-return view('accessories/checkin', compact('accessory', 'target_option'))->with('backto', $backto);}@@ -47,11 +47,13 @@ class AccessoryCheckinController extends Controller* Check in the item so that it can be checked out again to someone else** @uses Accessory::checkin_email() to determine if an email can and should be sent+ ** @author [A. Gianotto] [<[email protected]>]- * @param null $accessoryCheckoutId- * @param string $backto+ *+ * @param null $accessoryCheckoutId+ * @param string $backto*/- public function store(Request $request, $accessoryCheckoutId = null, $backto = null) : RedirectResponse+ public function store(Request $request, $accessoryCheckoutId = null, $backto = null): RedirectResponse{if (is_null($accessory_checkout = AccessoryCheckout::find($accessoryCheckoutId))) {return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));@@ -67,7 +69,6 @@ class AccessoryCheckinController extends Controller'App\Models\Asset' => 'asset',});-$checkin_hours = date('H:i:s');$checkin_at = date('Y-m-d H:i:s');if ($request->filled('checkin_at')) {@@ -83,6 +84,7 @@ class AccessoryCheckinController extends Controllerreturn Helper::getRedirectOption($request, $accessory->id, 'Accessories')->with('success', trans('admin/accessories/message.checkin.success'));}+// Redirect to the accessory management page with errorreturn redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.checkin.error'));}diff --git a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php b/app/Http/Controllers/Accessories/AccessoryCheckoutController.phpindex a31ba7ab54..e23ea4f4a9 100644--- a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php+++ b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php@@ -11,30 +11,29 @@ use App\Models\Accessory;use App\Models\AccessoryCheckout;use App\Models\User;use Carbon\Carbon;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;-use Illuminate\Support\Facades\Auth;-use \Illuminate\Contracts\View\View;-use \Illuminate\Http\RedirectResponse;class AccessoryCheckoutController extends Controller{-use CheckInOutRequest;/*** Return the form to checkout an Accessory to a user.** @author [A. Gianotto] [<[email protected]>]- * @param int $id+ *+ * @param int $id*/- public function create(Accessory $accessory) : View | RedirectResponse+ public function create(Accessory $accessory): View|RedirectResponse{$this->authorize('checkout', $accessory);if ($accessory->category) {// Make sure there is at least one available to checkout- if ($accessory->numRemaining() <= 0){+ if ($accessory->numRemaining() <= 0) {return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.checkout.unavailable'));}@@ -55,19 +54,19 @@ class AccessoryCheckoutController extends Controller* trigger a Slack message and send an email.** @author [A. Gianotto] [<[email protected]>]- * @param Request $request- * @param Accessory $accessory+ *+ * @param Request $request*/- public function store(AccessoryCheckoutRequest $request, Accessory $accessory) : RedirectResponse+ public function store(AccessoryCheckoutRequest $request, Accessory $accessory): RedirectResponse{$this->authorize('checkout', $accessory);$target = $this->determineCheckoutTarget();session()->put(['checkout_to_type' => $target]);-+$accessory->checkout_qty = $request->input('checkout_qty', 1);-+for ($i = 0; $i < $accessory->checkout_qty; $i++) {$accessory_checkout = new AccessoryCheckout([@@ -96,7 +95,6 @@ class AccessoryCheckoutController extends Controllersession()->put(['redirect_option' => $request->input('redirect_option'), 'checkout_to_type' => $request->input('checkout_to_type')]);-// Redirect to the new accessory pagereturn Helper::getRedirectOption($request, $accessory->id, 'Accessories')->with('success', trans('admin/accessories/message.checkout.success'));diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.phpindex 394c330ea7..8d6050fb13 100644--- a/app/Http/Controllers/Account/AcceptanceController.php+++ b/app/Http/Controllers/Account/AcceptanceController.php@@ -4,36 +4,34 @@ namespace App\Http\Controllers\Account;use App\Events\CheckoutAccepted;use App\Events\CheckoutDeclined;-use App\Events\ItemAccepted;-use App\Events\ItemDeclined;+use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Mail\CheckoutAcceptanceResponseMail;use App\Models\CheckoutAcceptance;use App\Models\Company;-use App\Models\Contracts\Acceptable;use App\Models\Setting;use App\Models\User;use App\Notifications\AcceptanceItemAcceptedNotification;use App\Notifications\AcceptanceItemAcceptedToUserNotification;use App\Notifications\AcceptanceItemDeclinedNotification;use Exception;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;+use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Mail;use Illuminate\Support\Facades\Storage;use Illuminate\Support\Str;-use \Illuminate\Contracts\View\View;-use \Illuminate\Http\RedirectResponse;-use Illuminate\Support\Facades\Log;-use App\Helpers\Helper;class AcceptanceController extends Controller{/*** Show a listing of pending checkout acceptances for the current user*/- public function index() : View+ public function index(): View{$acceptances = CheckoutAcceptance::forUser(auth()->user())->pending()->get();+return view('account/accept.index', compact('acceptances'));}@@ -42,11 +40,10 @@ class AcceptanceController extends Controller** @param int $id*/- public function create($id) : View | RedirectResponse+ public function create($id): View|RedirectResponse{$acceptance = CheckoutAcceptance::find($id);-if (is_null($acceptance)) {return redirect()->route('account.accept')->with('error', trans('admin/hardware/message.does_not_exist'));}@@ -69,20 +66,18 @@ class AcceptanceController extends Controller/*** Stores the accept/decline of the checkout acceptance*- * @param Request $request* @param int $id*/- public function store(Request $request, $id) : RedirectResponse+ public function store(Request $request, $id): RedirectResponse{- if (!$acceptance = CheckoutAcceptance::find($id)) {+ if (! $acceptance = CheckoutAcceptance::find($id)) {return redirect()->route('account.accept')->with('error', trans('admin/hardware/message.does_not_exist'));}-+$assigned_user = User::find($acceptance->assigned_to_id);$settings = Setting::getSettings();- $sig_filename='';-+ $sig_filename = '';if (! $acceptance->isPending()) {return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.asset_already_accepted'));@@ -121,11 +116,11 @@ class AcceptanceController extends Controller// The item was accepted, check for a signatureif ($request->filled('signature_output')) {- $sig_filename = 'siglog-' . Str::uuid() . '-' . date('Y-m-d-his') . '.png';+ $sig_filename = 'siglog-'.Str::uuid().'-'.date('Y-m-d-his').'.png';$data_uri = $request->input('signature_output');$encoded_image = explode(',', $data_uri);$decoded_image = base64_decode($encoded_image[1]);- Storage::put('private_uploads/signatures/' . $sig_filename, (string)$decoded_image);+ Storage::put('private_uploads/signatures/'.$sig_filename, (string) $decoded_image);// No image data is present, kick them back.// This mostly only applies to users on super-duper crapola browsers *cough* IE *cough*@@ -134,12 +129,11 @@ class AcceptanceController extends Controller}}-// Convert PDF logo to base64 for TCPDF// This is needed for TCPDF to properly embed the image if it's a png and the cache isn't writable$encoded_logo = null;if (($settings->acceptance_pdf_logo) && (Storage::disk('public')->exists($settings->acceptance_pdf_logo))) {- $encoded_logo = base64_encode(file_get_contents(public_path() . '/uploads/' . $settings->acceptance_pdf_logo));+ $encoded_logo = base64_encode(file_get_contents(public_path().'/uploads/'.$settings->acceptance_pdf_logo));}// Get the data array ready for the notifications and PDF generation@@ -158,7 +152,7 @@ class AcceptanceController extends Controller'email' => $assigned_user->email,'employee_num' => $assigned_user->employee_num,'site_name' => $settings->site_name,- 'company_name' => $item->company?->name?? $settings->site_name,+ 'company_name' => $item->company?->name ?? $settings->site_name,'signature' => (($sig_filename && array_key_exists('1', $encoded_image))) ? $encoded_image[1] : null,'logo' => ($encoded_logo) ?? null,'date_settings' => $settings->date_display_format,@@ -167,37 +161,36 @@ class AcceptanceController extends Controllerif ($request->input('asset_acceptance') == 'accepted') {-$pdf_filename = 'accepted-'.$acceptance->checkoutable_id.'-'.$acceptance->display_checkoutable_type.'-eula-'.date('Y-m-d-h-i-s').'.pdf';// Generate the PDF content$pdf_content = $acceptance->generateAcceptancePdf($data, $acceptance);- Storage::put('private_uploads/eula-pdfs/' .$pdf_filename, $pdf_content);+ Storage::put('private_uploads/eula-pdfs/'.$pdf_filename, $pdf_content);// Log the acceptance$acceptance->accept($sig_filename, $item->getEula(), $pdf_filename, $request->input('note'));// Send the PDF to the signing user- if (($request->input('send_copy') == '1') && ($assigned_user->email !='')) {+ if (($request->input('send_copy') == '1') && ($assigned_user->email != '')) {// Add the attachment for the signing user into the $data array$data['file'] = $pdf_filename;try {$assigned_user->notify((new AcceptanceItemAcceptedToUserNotification($data))->locale($assigned_user->locale));- } catch (\Exception $e) {+ } catch (Exception $e) {Log::warning($e);}}try {$acceptance->notify((new AcceptanceItemAcceptedNotification($data))->locale(Setting::getSettings()->locale));- } catch (\Exception $e) {+ } catch (Exception $e) {Log::warning($e);}event(new CheckoutAccepted($acceptance));$return_msg = trans('admin/users/message.accepted');- // Item was declined+ // Item was declined} else {for ($i = 0; $i < ($acceptance->qty ?? 1); $i++) {@@ -210,7 +203,6 @@ class AcceptanceController extends Controller$return_msg = trans('admin/users/message.declined');}-// Send an email notification if one is requestedif ($acceptance->alert_on_response_id) {try {@@ -230,10 +222,8 @@ class AcceptanceController extends ControllerLog::warning($e);}}+return redirect()->to('account/accept')->with('success', $return_msg);}---}diff --git a/app/Http/Controllers/ActionlogController.php b/app/Http/Controllers/ActionlogController.phpindex 144e56a69f..d63cb9c380 100644--- a/app/Http/Controllers/ActionlogController.php+++ b/app/Http/Controllers/ActionlogController.php@@ -4,17 +4,18 @@ namespace App\Http\Controllers;use App\Helpers\Helper;use App\Models\Actionlog;+use App\Models\Asset;use Illuminate\Http\RedirectResponse;+use Illuminate\Http\Response;use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Storage;use Symfony\Component\HttpFoundation\BinaryFileResponse;-use \Illuminate\Http\Response;class ActionlogController extends Controller{- public function displaySig($filename) : RedirectResponse | Response | bool+ public function displaySig($filename): RedirectResponse|Response|bool{- // PHP doesn't let you handle file not found errors well with+ // PHP doesn't let you handle file not found errors well with// file_get_contents, so we set the error reporting for just this classerror_reporting(0);@@ -23,15 +24,17 @@ class ActionlogController extends Controllercase 's3':$file = 'private_uploads/signatures/'.$filename;+return redirect()->away(Storage::disk($disk)->temporaryUrl($file, now()->addMinutes(5)));default:- $this->authorize('view', \App\Models\Asset::class);+ $this->authorize('view', Asset::class);$file = config('app.private_uploads').'/signatures/'.$filename;$filetype = Helper::checkUploadIsImage($file);$contents = file_get_contents($file, false, stream_context_create(['http' => ['ignore_errors' => true]]));if ($contents === false) {Log::warning('File '.$file.' not found');+return false;} else {return response()->make($contents)->header('Content-Type', $filetype);@@ -39,7 +42,7 @@ class ActionlogController extends Controller}}- public function getStoredEula($filename) : Response | BinaryFileResponse | RedirectResponse+ public function getStoredEula($filename): Response|BinaryFileResponse|RedirectResponse{if ($actionlog = Actionlog::where('filename', $filename)->with('user')->with('target')->firstOrFail()) {@@ -47,18 +50,17 @@ class ActionlogController extends Controller$this->authorize('view', $actionlog->target);$this->authorize('view', $actionlog->user);-if (config('filesystems.default') == 's3_private') {- return redirect()->away(Storage::disk('s3_private')->temporaryUrl('private_uploads/eula-pdfs/' . $filename, now()->addMinutes(5)));+ return redirect()->away(Storage::disk('s3_private')->temporaryUrl('private_uploads/eula-pdfs/'.$filename, now()->addMinutes(5)));}- if (Storage::exists('private_uploads/eula-pdfs/' . $filename)) {+ if (Storage::exists('private_uploads/eula-pdfs/'.$filename)) {if (request()->input('inline') == 'true') {- return response()->file(config('app.private_uploads') . '/eula-pdfs/' . $filename);+ return response()->file(config('app.private_uploads').'/eula-pdfs/'.$filename);}- return response()->download(config('app.private_uploads') . '/eula-pdfs/' . $filename);+ return response()->download(config('app.private_uploads').'/eula-pdfs/'.$filename);}return redirect()->back()->with('error', trans('general.file_does_not_exist'));diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.phpindex a74365298e..86ed8cfad2 100755--- a/app/Http/Controllers/AssetModelsController.php+++ b/app/Http/Controllers/AssetModelsController.php@@ -10,35 +10,36 @@ use App\Models\AssetModel;use App\Models\CustomField;use App\Models\SnipeModel;use App\Models\User;-use Illuminate\Support\Facades\Auth;-use Illuminate\Support\Facades\DB;-use Illuminate\Support\Facades\Validator;+use Illuminate\Auth\Access\AuthorizationException;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;+use Illuminate\Support\Facades\DB;use Illuminate\Support\Facades\Storage;-use Illuminate\Support\Facades\Log;-use \Illuminate\Contracts\View\View;-use \Illuminate\Http\RedirectResponse;+use Illuminate\Support\Facades\Validator;use Illuminate\Support\MessageBag;-/*** This class controls all actions related to asset models for* the Snipe-IT Asset Management application.** @version v1.0+ ** @author [A. Gianotto] [<[email protected]>]*/class AssetModelsController extends Controller{protected MessageBag $validatorErrors;+/*** Returns a view that invokes the ajax tables which actually contains* the content for the accessories listing, which is generated in getDatatable.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]*/- public function index() : View+ public function index(): View{$this->authorize('index', AssetModel::class);@@ -49,9 +50,10 @@ class AssetModelsController extends Controller* Returns a view containing the asset model creation form.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]*/- public function create() : View+ public function create(): View{$this->authorize('create', AssetModel::class);@@ -64,10 +66,12 @@ class AssetModelsController extends Controller* Validate and process the new Asset Model data.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param ImageUploadRequest $request+ *+ * @param ImageUploadRequest $request*/- public function store(StoreAssetModelRequest $request) : RedirectResponse+ public function store(StoreAssetModelRequest $request): RedirectResponse{$this->authorize('create', AssetModel::class);$model = new AssetModel;@@ -101,11 +105,9 @@ class AssetModelsController extends Controller$model = $request->handleImages($model);}--if ($model->save()) {if ($this->shouldAddDefaultValues($request->input())) {- if (!$this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))){+ if (! $this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))) {return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.fieldset_default_value.error'));}}@@ -120,29 +122,33 @@ class AssetModelsController extends Controller* Returns a view containing the asset model edit form.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param int $modelId+ *+ * @param int $modelId*/- public function edit(AssetModel $model) : View | RedirectResponse+ public function edit(AssetModel $model): View|RedirectResponse{$this->authorize('update', AssetModel::class);$category_type = 'asset';+return view('models/edit', compact('category_type'))->with('item', $model)->with('depreciation_list', Helper::depreciationList());}-/*** Validates and processes form data from the edit* Asset Model form based on the model ID passed.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param ImageUploadRequest $request- * @param int $modelId- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param ImageUploadRequest $request+ * @param int $modelId+ *+ * @throws AuthorizationException*/- public function update(StoreAssetModelRequest $request, AssetModel $model) : RedirectResponse+ public function update(StoreAssetModelRequest $request, AssetModel $model): RedirectResponse{$this->authorize('update', AssetModel::class);@@ -163,21 +169,22 @@ class AssetModelsController extends Controller$this->removeCustomFieldsDefaultValues($model);if ($this->shouldAddDefaultValues($request->input())) {- if (!$this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))) {+ if (! $this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))) {return redirect()->back()->withInput()->withErrors($this->validatorErrors);}}if ($model->wasChanged('eol')) {- if ($model->eol > 0) {- $newEol = $model->eol;- $model->assets()->whereNotNull('purchase_date')->where('eol_explicit', false)- ->update(['asset_eol_date' => DB::raw('DATE_ADD(purchase_date, INTERVAL ' . $newEol . ' MONTH)')]);- } elseif ($model->eol == 0) {- $model->assets()->whereNotNull('purchase_date')->where('eol_explicit', false)- ->update(['asset_eol_date' => DB::raw('null')]);- }+ if ($model->eol > 0) {+ $newEol = $model->eol;+ $model->assets()->whereNotNull('purchase_date')->where('eol_explicit', false)+ ->update(['asset_eol_date' => DB::raw('DATE_ADD(purchase_date, INTERVAL '.$newEol.' MONTH)')]);+ } elseif ($model->eol == 0) {+ $model->assets()->whereNotNull('purchase_date')->where('eol_explicit', false)+ ->update(['asset_eol_date' => DB::raw('null')]);}+ }+return redirect()->route('models.index')->with('success', trans('admin/models/message.update.success'));}@@ -189,14 +196,15 @@ class AssetModelsController extends Controller* cannot be deleted if there are associated assets.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param int $modelId+ *+ * @param int $modelId*/- public function destroy(AssetModel $model) : RedirectResponse+ public function destroy(AssetModel $model): RedirectResponse{$this->authorize('delete', AssetModel::class);-if ($model->assets()->count() > 0) {// Throw an error that this model is associated with assetsreturn redirect()->route('models.index')->with('error', trans('admin/models/message.assoc_users'));@@ -213,10 +221,12 @@ class AssetModelsController extends Controller* Restore a given Asset Model (mark as un-deleted)** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param int $id+ *+ * @param int $id*/- public function getRestore($id) : RedirectResponse+ public function getRestore($id): RedirectResponse{$this->authorize('create', AssetModel::class);@@ -227,19 +237,19 @@ class AssetModelsController extends Controller}if ($model->restore()) {- $logaction = new Actionlog();+ $logaction = new Actionlog;$logaction->item_type = AssetModel::class;$logaction->item_id = $model->id;$logaction->created_at = date('Y-m-d H:i:s');$logaction->created_by = auth()->id();$logaction->logaction('restore');-// Redirect them to the deleted page if there are more, otherwise the section index$deleted_models = AssetModel::onlyTrashed()->count();if ($deleted_models > 0) {return redirect()->back()->with('success', trans('admin/models/message.restore.success'));}+return redirect()->route('models.index')->with('success', trans('admin/models/message.restore.success'));}@@ -251,17 +261,19 @@ class AssetModelsController extends Controller}-/*** Get the model information to present to the model view page** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param int $modelId+ *+ * @param int $modelId*/- public function show(AssetModel $model) : View | RedirectResponse+ public function show(AssetModel $model): View|RedirectResponse{$this->authorize('view', AssetModel::class);+return view('models/view', compact('model'));}@@ -269,10 +281,12 @@ class AssetModelsController extends Controller* Get the clone page to clone a model** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param int $modelId+ *+ * @param int $modelId*/- public function getClone(AssetModel $model) : View | RedirectResponse+ public function getClone(AssetModel $model): View|RedirectResponse{$this->authorize('create', AssetModel::class);@@ -288,28 +302,28 @@ class AssetModelsController extends Controller->with('cloned_model', $cloned_model);}-/*** Get the custom fields form** @author [B. Wetherington] [<[email protected]>]+ ** @since [v2.0]- * @param int $modelId+ *+ * @param int $modelId*/- public function getCustomFields($modelId) : View+ public function getCustomFields($modelId): View{return view('models.custom_fields_form')->with('model', AssetModel::find($modelId));}--/*** Returns a view that allows the user to bulk edit model attributes** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.7]*/- public function postBulkEdit(Request $request) : View | RedirectResponse+ public function postBulkEdit(Request $request): View|RedirectResponse{$models_raw_array = $request->input('ids');@@ -328,7 +342,7 @@ class AssetModelsController extends Controllerreturn view('models/bulk-delete', compact('models'))->with('valid_count', $valid_count);- // Otherwise display the bulk edit screen+ // Otherwise display the bulk edit screen} else {$nochange = ['NC' => 'No Change'];$fieldset_list = $nochange + Helper::customFieldsetList();@@ -344,20 +358,18 @@ class AssetModelsController extends Controller->with('error', 'You must select at least one model to edit.');}--/*** Returns a view that allows the user to bulk edit model attrbutes** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.7]*/- public function postBulkEditSave(Request $request) : RedirectResponse+ public function postBulkEditSave(Request $request): RedirectResponse{$models_raw_array = $request->input('ids');$update_array = [];-if (($request->filled('manufacturer_id') && ($request->input('manufacturer_id') != 'NC'))) {$update_array['manufacturer_id'] = $request->input('manufacturer_id');}@@ -371,7 +383,6 @@ class AssetModelsController extends Controller$update_array['depreciation_id'] = $request->input('depreciation_id');}-if (count($update_array) > 0) {AssetModel::whereIn('id', $models_raw_array)->update($update_array);@@ -388,10 +399,12 @@ class AssetModelsController extends Controller* cannot be deleted if there are associated assets.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param int $modelId+ *+ * @param int $modelId*/- public function postBulkDelete(Request $request) : RedirectResponse+ public function postBulkDelete(Request $request): RedirectResponse{$models_raw_array = $request->input('ids');@@ -411,14 +424,13 @@ class AssetModelsController extends Controller}}-if ($del_error_count == 0) {return redirect()->route('models.index')- ->with('success', trans('admin/models/message.bulkdelete.success', ['success_count'=> $del_count]));+ ->with('success', trans('admin/models/message.bulkdelete.success', ['success_count' => $del_count]));}return redirect()->route('models.index')- ->with('warning', trans('admin/models/message.bulkdelete.success_partial', ['fail_count'=>$del_error_count, 'success_count'=> $del_count]));+ ->with('warning', trans('admin/models/message.bulkdelete.success_partial', ['fail_count' => $del_error_count, 'success_count' => $del_count]));}return redirect()->route('models.index')@@ -428,10 +440,8 @@ class AssetModelsController extends Controller/*** Returns true if a fieldset is set, 'add default values' is ticked and if* any default values were entered into the form.- *- * @param array $input*/- private function shouldAddDefaultValues(array $input) : bool+ private function shouldAddDefaultValues(array $input): bool{return ! empty($input['add_default_values'])&& ! empty($input['default_values'])@@ -441,12 +451,11 @@ class AssetModelsController extends Controller/*** Adds default values to a model (as long as they are truthy)*- * @param AssetModel $model- * @param array $defaultValues+ * @param AssetModel $model*/private function assignCustomFieldsDefaultValues(AssetModel|SnipeModel $model, array $defaultValues): bool{- $data = array();+ $data = [];foreach ($defaultValues as $customFieldId => $defaultValue) {$customField = CustomField::find($customFieldId);@@ -454,13 +463,13 @@ class AssetModelsController extends Controller}$allRules = $model->fieldset->validation_rules();- $rules = array();+ $rules = [];foreach ($allRules as $field => $validation) {// If the field is marked as required, eliminate the rule so it doesn't interfere with the default values// (we are at model level, the rule still applies when creating a new asset using this model)$index = array_search('required', $validation);- if ($index !== false){+ if ($index !== false) {$validation[$index] = 'nullable';}$rules[$field] = $validation;@@ -473,24 +482,25 @@ class AssetModelsController extends Controller$validator = Validator::make($data, $rules)->setAttributeNames($attributes);- if($validator->fails()){+ if ($validator->fails()) {$this->validatorErrors = $validator->errors();+return false;}foreach ($defaultValues as $customFieldId => $defaultValue) {- if(is_array($defaultValue)){+ if (is_array($defaultValue)) {$model->defaultValues()->attach($customFieldId, ['default_value' => implode(', ', $defaultValue)]);- }elseif ($defaultValue) {+ } elseif ($defaultValue) {$model->defaultValues()->attach($customFieldId, ['default_value' => $defaultValue]);}}+return true;}/*** Removes all default values- **/private function removeCustomFieldsDefaultValues(AssetModel|SnipeModel $model): void{diff --git a/app/Http/Controllers/Assets/AssetCheckinController.php b/app/Http/Controllers/Assets/AssetCheckinController.phpindex 785c7a8d3c..175a8e5a4f 100644--- a/app/Http/Controllers/Assets/AssetCheckinController.php+++ b/app/Http/Controllers/Assets/AssetCheckinController.php@@ -10,11 +10,10 @@ use App\Http\Traits\MigratesLegacyAssetLocations;use App\Models\Asset;use App\Models\CheckoutAcceptance;use App\Models\LicenseSeat;+use Illuminate\Contracts\View\View;use Illuminate\Database\Eloquent\Builder;+use Illuminate\Http\RedirectResponse;use Illuminate\Support\Facades\Log;-use \Illuminate\Contracts\View\View;-use \Illuminate\Http\RedirectResponse;-use Illuminate\Support\Facades\Validator;class AssetCheckinController extends Controller{@@ -24,11 +23,13 @@ class AssetCheckinController extends Controller* Returns a view that presents a form to check an asset back into inventory.** @author [A. Gianotto] [<[email protected]>]- * @param int $assetId- * @param string $backto+ *+ * @param int $assetId+ * @param string $backto+ ** @since [v1.0]*/- public function create(Asset $asset, $backto = null) : View | RedirectResponse+ public function create(Asset $asset, $backto = null): View|RedirectResponse{$this->authorize('checkin', $asset);@@ -38,7 +39,7 @@ class AssetCheckinController extends Controllerreturn redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.checkin.already_checked_in'));}- if (!$asset->model) {+ if (! $asset->model) {return redirect()->route('hardware.show', $asset->id)->with('error', trans('admin/hardware/general.model_invalid_fix'));}@@ -54,6 +55,7 @@ class AssetCheckinController extends Controller'App\Models\Location' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.location')]),default => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.user')]),};+return view('hardware/checkin', compact('asset', 'target_option'))->with('item', $asset)->with('statusLabel_list', Helper::statusLabelList())@@ -65,12 +67,13 @@ class AssetCheckinController extends Controller* Validate and process the form data to check an asset back into inventory.** @author [A. Gianotto] [<[email protected]>]- * @param AssetCheckinRequest $request- * @param int $assetId- * @param null $backto+ *+ * @param int $assetId+ * @param null $backto+ ** @since [v1.0]*/- public function store(AssetCheckinRequest $request, $assetId = null, $backto = null) : RedirectResponse+ public function store(AssetCheckinRequest $request, $assetId = null, $backto = null): RedirectResponse{// Check if the asset existsif (is_null($asset = Asset::find($assetId))) {@@ -82,7 +85,7 @@ class AssetCheckinController extends Controllerreturn redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.checkin.already_checked_in'));}- if (!$asset->model) {+ if (! $asset->model) {return redirect()->route('hardware.show', $asset->id)->with('error', trans('admin/hardware/general.model_invalid_fix'));}@@ -115,7 +118,7 @@ class AssetCheckinController extends ControllerLog::debug('NEW Location ID: '.$request->input('location_id'));$asset->location_id = $request->input('location_id');- if ($request->input('update_default_location') == 0){+ if ($request->input('update_default_location') == 0) {$asset->rtd_location_id = $request->input('location_id');}}@@ -141,7 +144,7 @@ class AssetCheckinController extends Controllerfunction (Builder $query) use ($asset) {$query->where('id', $asset->id);})->get();- $acceptances->map(function($acceptance) {+ $acceptances->map(function ($acceptance) {$acceptance->delete();});@@ -153,9 +156,11 @@ class AssetCheckinController extends Controllerif ($asset->save()) {event(new CheckoutableCheckedIn($asset, $target, auth()->user(), $request->input('note'), $checkin_at, $originalValues));+return Helper::getRedirectOption($request, $asset->id, 'Assets')->with('success', trans('admin/hardware/message.checkin.success'));}+// Redirect to the asset management page with errorreturn redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.checkin.error').$asset->getErrors());}diff --git a/app/Http/Controllers/Assets/AssetCheckoutController.php b/app/Http/Controllers/Assets/AssetCheckoutController.phpindex 4c26055257..ea28066489 100644--- a/app/Http/Controllers/Assets/AssetCheckoutController.php+++ b/app/Http/Controllers/Assets/AssetCheckoutController.php@@ -8,11 +8,10 @@ use App\Http\Controllers\CheckInOutRequest;use App\Http\Controllers\Controller;use App\Http\Requests\AssetCheckoutRequest;use App\Models\Asset;+use App\Models\Setting;+use Illuminate\Contracts\View\View;use Illuminate\Database\Eloquent\ModelNotFoundException;-use Illuminate\Support\Facades\Session;-use \Illuminate\Contracts\View\View;-use \Illuminate\Http\RedirectResponse;-use Illuminate\Support\Facades\Validator;+use Illuminate\Http\RedirectResponse;class AssetCheckoutController extends Controller{@@ -23,16 +22,19 @@ class AssetCheckoutController extends Controller* user.** @author [A. Gianotto] [<[email protected]>]- * @param int $assetId+ *+ * @param int $assetId+ ** @since [v1.0]- * @return \Illuminate\Contracts\View\View+ *+ * @return View*/- public function create(Asset $asset) : View | RedirectResponse+ public function create(Asset $asset): View|RedirectResponse{$this->authorize('checkout', $asset);- if (!$asset->model) {+ if (! $asset->model) {return redirect()->route('hardware.show', $asset)->with('error', trans('admin/hardware/general.model_invalid_fix'));}@@ -44,7 +46,6 @@ class AssetCheckoutController extends Controllerreturn redirect()->route('hardware.edit', $asset)->withErrors($asset->getErrors());}-if ($asset->availableForCheckout()) {return view('hardware/checkout', compact('asset'))->with('statusLabel_list', Helper::deployableStatusLabelList())@@ -60,13 +61,12 @@ class AssetCheckoutController extends Controller* Validate and process the form data to check out an asset to a user.** @author [A. Gianotto] [<[email protected]>]- * @param AssetCheckoutRequest $request+ ** @since [v1.0]*/- public function store(AssetCheckoutRequest $request, $assetId) : RedirectResponse+ public function store(AssetCheckoutRequest $request, $assetId): RedirectResponse{-try {// Check if the asset existsif (! $asset = Asset::find($assetId)) {@@ -76,7 +76,7 @@ class AssetCheckoutController extends Controller}$this->authorize('checkout', $asset);- if (!$asset->model) {+ if (! $asset->model) {return redirect()->route('hardware.show', $asset)->with('error', trans('admin/hardware/general.model_invalid_fix'));}@@ -101,10 +101,9 @@ class AssetCheckoutController extends Controller$asset->status_id = $request->input('status_id');}-- if(!empty($asset->licenseseats->all())){- if(request('checkout_to_type') == 'user') {- foreach ($asset->licenseseats as $seat){+ if (! empty($asset->licenseseats->all())) {+ if (request('checkout_to_type') == 'user') {+ foreach ($asset->licenseseats as $seat) {$seat->assigned_to = $target->id;$seat->save();}@@ -114,11 +113,11 @@ class AssetCheckoutController extends Controller// Add any custom fields that should be included in the checkout$asset->customFieldsForCheckinCheckout('display_checkout');- $settings = \App\Models\Setting::getSettings();+ $settings = Setting::getSettings();// We have to check whether $target->company_id is null here since locations don't have a company yet- if (($settings->full_multiple_companies_support) && ((!is_null($target->company_id)) && (!is_null($asset->company_id)))) {- if ($target->company_id != $asset->company_id){+ if (($settings->full_multiple_companies_support) && ((! is_null($target->company_id)) && (! is_null($asset->company_id)))) {+ if ($target->company_id != $asset->company_id) {return redirect()->route('hardware.checkout.create', $asset)->with('error', trans('general.error_user_company'));}}@@ -129,8 +128,9 @@ class AssetCheckoutController extends Controllerreturn Helper::getRedirectOption($request, $asset->id, 'Assets')->with('success', trans('admin/hardware/message.checkout.success'));}+// Redirect to the asset management page with error- return redirect()->route("hardware.checkout.create", $asset)->with('error', trans('admin/hardware/message.checkout.error').$asset->getErrors());+ return redirect()->route('hardware.checkout.create', $asset)->with('error', trans('admin/hardware/message.checkout.error').$asset->getErrors());} catch (ModelNotFoundException $e) {return redirect()->back()->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($asset->getErrors());} catch (CheckoutNotAllowed $e) {diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.phpindex cece060dc8..f896e161ae 100755--- a/app/Http/Controllers/Assets/AssetsController.php+++ b/app/Http/Controllers/Assets/AssetsController.php@@ -5,12 +5,10 @@ namespace App\Http\Controllers\Assets;use App\Events\CheckoutableCheckedIn;use App\Helpers\Helper;use App\Http\Controllers\Controller;-use App\Http\Requests\ImageUploadRequest;use App\Http\Requests\CreateMultipleAssetRequest;-use App\Http\Requests\UpdateAssetRequest;-use App\Models\Actionlog;+use App\Http\Requests\ImageUploadRequest;use App\Http\Requests\UploadFileRequest;-use Illuminate\Support\Facades\Log;+use App\Models\Actionlog;use App\Models\Asset;use App\Models\AssetModel;use App\Models\CheckoutRequest;@@ -19,18 +17,20 @@ use App\Models\Location;use App\Models\Setting;use App\Models\Statuslabel;use App\Models\User;+use App\Observers\AssetObserver;use App\View\Label;use Carbon\Carbon;-use Illuminate\Support\Facades\DB;-use Illuminate\Support\Facades\Gate;+use Com\Tecnick\Barcode\Barcode;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;+use Illuminate\Http\Response;use Illuminate\Support\Facades\Crypt;+use Illuminate\Support\Facades\DB;+use Illuminate\Support\Facades\Gate;+use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Storage;-use Illuminate\Support\Facades\Validator;use League\Csv\Reader;-use Illuminate\Http\Response;-use Illuminate\Contracts\View\View;-use Illuminate\Http\RedirectResponse;use Symfony\Component\HttpFoundation\BinaryFileResponse;use TypeError;@@ -39,11 +39,13 @@ use TypeError;* the Snipe-IT Asset Management application.** @version v1.0+ ** @author [A. Gianotto] [<[email protected]>]*/class AssetsController extends Controller{protected $qrCodeDimensions = ['height' => 3.5, 'width' => 3.5];+protected $barCodeDimensions = ['height' => 2, 'width' => 22];public function __construct()@@ -57,11 +59,11 @@ class AssetsController extends Controller* the content for the assets listing, which is generated in getDatatable.** @author [A. Gianotto] [<[email protected]>]+ ** @see AssetController::getDatatable() method that generates the JSON response* @since [v1.0]- * @param Request $request*/- public function index(Request $request) : View+ public function index(Request $request): View{$this->authorize('index', Asset::class);$company = Company::find($request->input('company_id'));@@ -73,11 +75,12 @@ class AssetsController extends Controller* Returns a view that presents a form to create a new asset.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param Request $request+ ** @internal param int $model_id*/- public function create(Request $request) : View+ public function create(Request $request): View{$this->authorize('create', Asset::class);$view = view('hardware/edit')@@ -97,6 +100,7 @@ class AssetsController extends Controller* Validate and process new asset form data.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]*/public function store(CreateMultipleAssetRequest $request): RedirectResponse@@ -117,7 +121,7 @@ class AssetsController extends Controller$settings = Setting::getSettings();- //Validate required serial based on model setting+ // Validate required serial based on model settingfor ($a = 1, $aMax = count($asset_tags); $a <= $aMax; $a++) {if ($model && $model->require_serial === 1 && empty($serials[$a])) {$serial_errors["serials.$a"] = trans('admin/hardware/form.serial_required', ['number' => $a]);@@ -125,7 +129,7 @@ class AssetsController extends Controller}- if (!empty($serial_errors)) {+ if (! empty($serial_errors)) {return redirect()->back()->withInput()->withErrors($serial_errors);@@ -139,7 +143,7 @@ class AssetsController extends Controllertry {DB::beginTransaction();for ($a = 1, $aMax = count($asset_tags); $a <= $aMax; $a++) {- $asset = new Asset();+ $asset = new Asset;$asset->model()->associate($model);$asset->name = $request->input('name');@@ -169,21 +173,21 @@ class AssetsController extends Controller$asset->rtd_location_id = request('rtd_location_id', null);$asset->byod = request('byod', 0);- if (!empty($settings->audit_interval)) {- $asset->next_audit_date = Carbon::now()->addMonths((int)$settings->audit_interval)->toDateString();+ if (! empty($settings->audit_interval)) {+ $asset->next_audit_date = Carbon::now()->addMonths((int) $settings->audit_interval)->toDateString();}// Set location_id to rtd_location_id ONLY if the asset isn't being checked out- if (!request('assigned_user') && !request('assigned_asset') && !request('assigned_location')) {+ if (! request('assigned_user') && ! request('assigned_asset') && ! request('assigned_location')) {$asset->location_id = $request->input('rtd_location_id', null);}if ($request->has('use_cloned_image')) {$cloned_model_img = Asset::select('image')->find($request->input('clone_image_from_id'));if ($cloned_model_img) {- $new_image_name = 'clone-' . date('U') . '-' . $cloned_model_img->image;- $new_image = 'assets/' . $new_image_name;- Storage::disk('public')->copy('assets/' . $cloned_model_img->image, $new_image);+ $new_image_name = 'clone-'.date('U').'-'.$cloned_model_img->image;+ $new_image = 'assets/'.$new_image_name;+ Storage::disk('public')->copy('assets/'.$cloned_model_img->image, $new_image);$asset->image = $new_image_name;}@@ -226,7 +230,7 @@ class AssetsController extends Controllerif ($userId = request('assigned_user')) {$target = User::find($userId);- if (!$target) {+ if (! $target) {return redirect()->back()->withInput()->with('error', trans('admin/hardware/message.create.target_not_found.user'));}$location = $target->location_id;@@ -234,7 +238,7 @@ class AssetsController extends Controller} elseif ($assetId = request('assigned_asset')) {$target = Asset::find($assetId);- if (!$target) {+ if (! $target) {return redirect()->back()->withInput()->with('error', trans('admin/hardware/message.create.target_not_found.asset'));}$location = $target->location_id;@@ -242,7 +246,7 @@ class AssetsController extends Controller} elseif ($locationId = request('assigned_location')) {$target = Location::find($locationId);- if (!$target) {+ if (! $target) {return redirect()->back()->withInput()->with('error', trans('admin/hardware/message.create.target_not_found.location'));}$location = $target->id;@@ -252,47 +256,45 @@ class AssetsController extends Controller$asset->checkOut($target, auth()->user(), date('Y-m-d H:i:s'), $request->input('expected_checkin', null), 'Checked out on asset creation', $request->input('name'), $location);}- $successes[] = "<a href='" . route('hardware.show', $asset) . "' style='color: white;'>" . e($asset->asset_tag) . "</a>";+ $successes[] = "<a href='".route('hardware.show', $asset)."' style='color: white;'>".e($asset->asset_tag).'</a>';} else {$asset->throwValidationException(); // we have to do this for the reason listed above - can't use saveOrFail()- $failures[] = join(",", $asset->getErrors()->all()); //TODO - this can probably go away soon+ $failures[] = implode(',', $asset->getErrors()->all()); // TODO - this can probably go away soon}}} catch (\Throwable $e) {- \Log::debug("Caught exception in multi-create - rolling back: " . $e->getMessage());+ \Log::debug('Caught exception in multi-create - rolling back: '.$e->getMessage());DB::rollBack();throw $e;}DB::commit();- if($request->input('redirect_option') === 'back'){+ if ($request->input('redirect_option') === 'back') {session()->put(['redirect_option' => 'index']);} else {session()->put(['redirect_option' => $request->input('redirect_option')]);}session()->put(['checkout_to_type' => $request->input('checkout_to_type'),- 'other_redirect' => 'model' ]);--+ 'other_redirect' => 'model']);if ($successes) {if ($failures) {- //some succeeded, some failed- return Helper::getRedirectOption($request, $asset->id, 'Assets') //FIXME - not tested- ->with('success-unescaped', trans_choice('admin/hardware/message.create.multi_success_linked', $successes, ['links' => join(", ", $successes)]))- ->with('warning', trans_choice('admin/hardware/message.create.partial_failure', $failures, ['failures' => join("; ", $failures)]));+ // some succeeded, some failed+ return Helper::getRedirectOption($request, $asset->id, 'Assets') // FIXME - not tested+ ->with('success-unescaped', trans_choice('admin/hardware/message.create.multi_success_linked', $successes, ['links' => implode(', ', $successes)]))+ ->with('warning', trans_choice('admin/hardware/message.create.partial_failure', $failures, ['failures' => implode('; ', $failures)]));} else {if (count($successes) == 1) {- //the most common case, keeping it so we don't have to make every use of that translation string be trans_choice'ed- //and re-translated+ // the most common case, keeping it so we don't have to make every use of that translation string be trans_choice'ed+ // and re-translatedreturn Helper::getRedirectOption($request, $asset->id, 'Assets')->with('success-unescaped', trans('admin/hardware/message.create.success_linked', ['link' => route('hardware.show', $asset), 'id', 'tag' => e($asset->asset_tag)]));} else {- //multi-success+ // multi-successreturn Helper::getRedirectOption($request, $asset->id, 'Assets')- ->with('success-unescaped', trans_choice('admin/hardware/message.create.multi_success_linked', $successes, ['links' => join(", ", $successes)]));+ ->with('success-unescaped', trans_choice('admin/hardware/message.create.multi_success_linked', $successes, ['links' => implode(', ', $successes)]));}}@@ -301,34 +303,38 @@ class AssetsController extends Controllerreturn redirect()->back()->withInput()->withErrors($asset->getErrors());}-/*** Returns a view that presents a form to edit an existing asset.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @return \Illuminate\Contracts\View\View+ *+ * @return View*/- public function edit(Asset $asset) : View | RedirectResponse+ public function edit(Asset $asset): View|RedirectResponse{$this->authorize($asset);session()->put('url.intended', url()->previous());+return view('hardware/edit')->with('item', $asset)->with('statuslabel_list', Helper::statusLabelList())->with('statuslabel_types', Helper::statusTypeList());}-/*** Returns a view that presents information about an asset for detail view.** @author [A. Gianotto] [<[email protected]>]- * @param int $assetId+ *+ * @param int $assetId+ ** @since [v1.0]- * @return \Illuminate\Contracts\View\View+ *+ * @return View*/- public function show(Asset $asset) : View | RedirectResponse+ public function show(Asset $asset): View|RedirectResponse{$this->authorize('view', $asset);$settings = Setting::getSettings();@@ -364,11 +370,13 @@ class AssetsController extends Controller/*** Validate and process asset edit form.*- * @param int $assetId+ * @param int $assetId+ ** @since [v1.0]+ ** @author [A. Gianotto] [<[email protected]>]*/- public function update(ImageUploadRequest $request, Asset $asset) : RedirectResponse+ public function update(ImageUploadRequest $request, Asset $asset): RedirectResponse{$this->authorize($asset);@@ -378,25 +386,25 @@ class AssetsController extends Controller$asset->purchase_cost = $request->input('purchase_cost', null);$asset->purchase_date = $request->input('purchase_date', null);$asset->next_audit_date = $request->input('next_audit_date', null);- if ($request->filled('purchase_date') && !$request->filled('asset_eol_date') && ($asset->model?->eol > 0)) {- $asset->purchase_date = $request->input('purchase_date', null);+ if ($request->filled('purchase_date') && ! $request->filled('asset_eol_date') && ($asset->model?->eol > 0)) {+ $asset->purchase_date = $request->input('purchase_date', null);$asset->asset_eol_date = Carbon::parse($request->input('purchase_date'))->addMonths($asset->model->eol)->format('Y-m-d');$asset->eol_explicit = false;} elseif ($request->filled('asset_eol_date')) {- $asset->asset_eol_date = $request->input('asset_eol_date', null);+ $asset->asset_eol_date = $request->input('asset_eol_date', null);$months = (int) Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date, true);- if($asset->model->eol) {- if($months != $asset->model->eol > 0) {- $asset->eol_explicit = true;- } else {- $asset->eol_explicit = false;- }- } else {- $asset->eol_explicit = true;- }- } elseif (!$request->filled('asset_eol_date') && (($asset->model?->eol) == 0)) {- $asset->asset_eol_date = null;- $asset->eol_explicit = false;+ if ($asset->model->eol) {+ if ($months != $asset->model->eol > 0) {+ $asset->eol_explicit = true;+ } else {+ $asset->eol_explicit = false;+ }+ } else {+ $asset->eol_explicit = true;+ }+ } elseif (! $request->filled('asset_eol_date') && (($asset->model?->eol) == 0)) {+ $asset->asset_eol_date = null;+ $asset->eol_explicit = false;}$asset->supplier_id = $request->input('supplier_id', null);$asset->expected_checkin = $request->input('expected_checkin', null);@@ -457,7 +465,7 @@ class AssetsController extends Controller$model = AssetModel::find($request->input('model_id'));if (($model) && ($model->fieldset)) {foreach ($model->fieldset->fields as $field) {- if ($field->element == 'checkbox' && !$request->has($field->db_column)) {+ if ($field->element == 'checkbox' && ! $request->has($field->db_column)) {$asset->{$field->db_column} = null;}if ($request->has($field->db_column)) {@@ -485,12 +493,11 @@ class AssetsController extends Controller'other_redirect' => $request->input('redirect_option') === 'other_redirect' ? 'model' : null,]);-- //Validate required serial based on model setting+ // Validate required serial based on model settingif ($model && $model->require_serial === 1 && empty($serial[1])) {return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))->with('warning', trans('admin/hardware/form.serial_required_post_model_update', [- 'asset_model' => $model->name+ 'asset_model' => $model->name,]));}if ($asset->save()) {@@ -505,10 +512,12 @@ class AssetsController extends Controller* Delete a given asset (mark as deleted).** @author [A. Gianotto] [<[email protected]>]- * @param int $assetId+ *+ * @param int $assetId+ ** @since [v1.0]*/- public function destroy(Request $request, Asset $asset) : RedirectResponse+ public function destroy(Request $request, Asset $asset): RedirectResponse{$this->authorize('delete', $asset);if ($asset->assignedTo) {@@ -522,7 +531,6 @@ class AssetsController extends Controller->update(['assigned_to' => null, 'assigned_type' => null]);}-if ($asset->image) {try {Storage::disk('public')->delete('assets'.'/'.$asset->image);@@ -531,7 +539,6 @@ class AssetsController extends Controller}}-$asset->delete();return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.delete.success'));@@ -541,16 +548,18 @@ class AssetsController extends Controller* Searches the assets table by serial, and redirects if it finds one** @author [A. Gianotto] [<[email protected]>]+ ** @since [v3.0]*/- public function getAssetBySerial(Request $request) : RedirectResponse+ public function getAssetBySerial(Request $request): RedirectResponse{- $topsearch = ($request->input('topsearch')=="true");+ $topsearch = ($request->input('topsearch') == 'true');- if (!$asset = Asset::where('serial', '=', $request->input('serial'))->first()) {+ if (! $asset = Asset::where('serial', '=', $request->input('serial'))->first()) {return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));}$this->authorize('view', $asset);+return redirect()->route('hardware.show', $asset->id)->with('topsearch', $topsearch);}@@ -558,10 +567,10 @@ class AssetsController extends Controller* Searches the assets table by asset tag, and redirects if it finds one** @author [A. Gianotto] [<[email protected]>]+ ** @since [v3.0]- * @return \Illuminate\Http\RedirectResponse*/- public function getAssetByTag(Request $request, $tag=null) : RedirectResponse+ public function getAssetByTag(Request $request, $tag = null): RedirectResponse{$tag = $tag ? $tag : $request->input('assetTag');$topsearch = ($request->input('topsearch') == 'true');@@ -573,7 +582,7 @@ class AssetsController extends Controllerif ($assets->count() != 1) {return redirect()->route('hardware.index')->with('search', $tag)- ->with('warning', trans('admin/hardware/message.does_not_exist_var', [ 'asset_tag' => $tag ]));+ ->with('warning', trans('admin/hardware/message.does_not_exist_var', ['asset_tag' => $tag]));}$asset = $assets->first();$this->authorize('view', $asset);@@ -581,15 +590,16 @@ class AssetsController extends Controllerreturn redirect()->route('hardware.show', $asset->id)->with('topsearch', $topsearch);}-/*** Return a QR code for the asset** @author [A. Gianotto] [<[email protected]>]- * @param int $assetId+ *+ * @param int $assetId+ ** @since [v1.0]*/- public function getQrCode(Asset $asset) : Response | BinaryFileResponse | string | bool+ public function getQrCode(Asset $asset): Response|BinaryFileResponse|string|bool{$settings = Setting::getSettings();@@ -605,7 +615,7 @@ class AssetsController extends Controllerreturn response()->file($qr_file, $header);} else {- $barcode = new \Com\Tecnick\Barcode\Barcode();+ $barcode = new Barcode;$barcode_obj = $barcode->getBarcodeObj($settings->label2_2d_type, route('hardware.show', $asset->id), $size['height'], $size['width'], 'black', [-2, -2, -2, -2]);file_put_contents($qr_file, $barcode_obj->getPngData());@@ -616,6 +626,7 @@ class AssetsController extends Controllerreturn 'That asset is invalid';}+return false;}@@ -623,8 +634,11 @@ class AssetsController extends Controller* Return a 2D barcode for the asset** @author [A. Gianotto] [<[email protected]>]- * @param int $assetId+ *+ * @param int $assetId+ ** @since [v1.0]+ ** @return Response*/public function getBarCode($assetId = null)@@ -642,7 +656,7 @@ class AssetsController extends Controller// Calculate barcode width in pixel based on label width (inch)$barcode_width = ($settings->labels_width - $settings->labels_display_sgutter) * 200.000000000001;- $barcode = new \Com\Tecnick\Barcode\Barcode();+ $barcode = new Barcode;try {$barcode_obj = $barcode->getBarcodeObj($settings->label2_1d_type, $asset->asset_tag, ($barcode_width < 300 ? $barcode_width : 300), 50);file_put_contents($barcode_file, $barcode_obj->getPngData());@@ -656,6 +670,7 @@ class AssetsController extends Controller}}}+return null;}@@ -663,8 +678,9 @@ class AssetsController extends Controller* Return a label for an individual asset.** @author [L. Swartzendruber] [<[email protected]>- * @param int $assetId- * @return \Illuminate\Contracts\View\View+ *+ * @param int $assetId+ * @return View*/public function getLabel($assetId = null){@@ -672,8 +688,8 @@ class AssetsController extends Controller$asset = Asset::find($assetId);$this->authorize('view', $asset);- return (new Label())- ->with('assets', collect([ $asset ]))+ return (new Label)+ ->with('assets', collect([$asset]))->with('settings', Setting::getSettings())->with('template', request()->input('template'))->with('offset', request()->input('offset'))@@ -686,9 +702,12 @@ class AssetsController extends Controller* Returns a view that presents a form to clone an asset.** @author [A. Gianotto] [<[email protected]>]- * @param int $assetId+ *+ * @param int $assetId+ ** @since [v1.0]- * @return \Illuminate\Contracts\View\View+ *+ * @return View*/public function getClone(Asset $asset){@@ -712,8 +731,10 @@ class AssetsController extends Controller* Return history import view** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @return \Illuminate\Contracts\View\View+ *+ * @return View*/public function getImportHistory(){@@ -734,8 +755,10 @@ class AssetsController extends Controller* Checkin date in future or empty, check the item out to the user.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v3.3]- * @return \Illuminate\Contracts\View\View+ *+ * @return View*/public function postImportHistory(Request $request){@@ -754,7 +777,7 @@ class AssetsController extends Controller$results = $csv->getRecords();} catch (\Exception $e) {return back()->with('error', trans('general.error_in_import_file', ['error' => $e->getMessage()]));- }+ }$item = [];$status = [];$status['error'] = [];@@ -770,14 +793,14 @@ class AssetsController extends Controller$item[$asset_tag][$batch_counter]['checkout_date'] = Carbon::parse(Helper::array_smart_fetch($row, 'checkout date'))->format('Y-m-d H:i:s');if ($isCheckinHeaderExplicit) {- //checkin date not empty, assume past transaction or future checkin date (expected)+ // checkin date not empty, assume past transaction or future checkin date (expected)if (! empty(Helper::array_smart_fetch($row, 'checkin date'))) {$item[$asset_tag][$batch_counter]['checkin_date'] = Carbon::parse(Helper::array_smart_fetch($row, 'checkin date'))->format('Y-m-d H:i:s');} else {$item[$asset_tag][$batch_counter]['checkin_date'] = '';}} else {- //checkin header missing, assume data is unavailable and make checkin date explicit (now) so we don't encounter invalid state.+ // checkin header missing, assume data is unavailable and make checkin date explicit (now) so we don't encounter invalid state.$item[$asset_tag][$batch_counter]['checkin_date'] = Carbon::parse(now())->format('Y-m-d H:i:s');}@@ -823,18 +846,18 @@ class AssetsController extends Controller// A matching user was foundif ($user = $user->first()) {- //$user is now matched user from db+ // $user is now matched user from db$item[$asset_tag][$batch_counter]['user_id'] = $user->id;Actionlog::firstOrCreate(['item_id' => $asset->id,'item_type' => Asset::class,- 'created_by' => auth()->id(),+ 'created_by' => auth()->id(),'note' => 'Checkout imported by '.auth()->user()->display_name.' from history importer','target_id' => $item[$asset_tag][$batch_counter]['user_id'],'target_type' => User::class,- 'created_at' => $item[$asset_tag][$batch_counter]['checkout_date'],- 'action_type' => 'checkout',+ 'created_at' => $item[$asset_tag][$batch_counter]['checkout_date'],+ 'action_type' => 'checkout',]);$checkin_date = $item[$asset_tag][$batch_counter]['checkin_date'];@@ -844,16 +867,15 @@ class AssetsController extends Controller// if checkin date header exists, assume that empty or future date is still checked out// if checkin is before today's date, assume it's checked in and do not assign user ID, if checkin date is in the future or blank, this is the expected checkin date, items are checked out- if ((strtotime($checkin_date) > strtotime(Carbon::now())) || (empty($checkin_date)))- {- //only do this if item is checked out+ if ((strtotime($checkin_date) > strtotime(Carbon::now())) || (empty($checkin_date))) {+ // only do this if item is checked out$asset->assigned_to = $user->id;$asset->assigned_type = User::class;}}if (! empty($checkin_date)) {- //only make a checkin there is a valid checkin date or we created one on import.+ // only make a checkin there is a valid checkin date or we created one on import.Actionlog::firstOrCreate(['item_id' => $item[$asset_tag][$batch_counter]['asset_id'],'item_type' => Asset::class,@@ -893,9 +915,12 @@ class AssetsController extends Controller* Restore a deleted asset.** @author [A. Gianotto] [<[email protected]>]- * @param int $assetId+ *+ * @param int $assetId+ ** @since [v1.0]- * @return \Illuminate\Contracts\View\View+ *+ * @return View*/public function getRestore($assetId = null){@@ -912,6 +937,7 @@ class AssetsController extends Controllerif ($deleted_assets > 0) {return redirect()->back()->with('success', trans('admin/hardware/message.restore.success'));}+return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.restore.success'));}@@ -927,6 +953,7 @@ class AssetsController extends Controller$this->authorize('audit', Asset::class);$settings = Setting::getSettings();$dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString();+return view('hardware/quickscan')->with('next_audit_date', $dt);}@@ -937,7 +964,6 @@ class AssetsController extends Controllerreturn view('hardware/quickscan-checkin')->with('statusLabel_list', Helper::statusLabelList());}-public function dueForAudit(){$this->authorize('audit', Asset::class);@@ -952,13 +978,11 @@ class AssetsController extends Controllerreturn view('hardware/checkin-due');}-- public function audit(Asset $asset): View | RedirectResponse+ public function audit(Asset $asset): View|RedirectResponse{$this->authorize('audit', Asset::class);$settings = Setting::getSettings();-// Invoke the validation to see if the audit will complete successfully$asset->setRules($asset->getRules() + $asset->customFieldValidationRules());@@ -966,7 +990,8 @@ class AssetsController extends Controllerreturn redirect()->route('hardware.edit', $asset)->withErrors($asset->getErrors());}- $dt = Carbon::now()->addMonths( (int) $settings->audit_interval)->toDateString();+ $dt = Carbon::now()->addMonths((int) $settings->audit_interval)->toDateString();+return view('hardware/audit')->with('asset', $asset)->with('item', $asset)->with('next_audit_date', $dt)->with('locations_list');}@@ -978,7 +1003,6 @@ class AssetsController extends Controllersession()->put('redirect_option', $request->input('redirect_option'));session()->put('other_redirect', 'audit');-$originalValues = $asset->getRawOriginal();$asset->next_audit_date = $request->input('next_audit_date');@@ -993,7 +1017,7 @@ class AssetsController extends Controller// Update custom fields in the databaseif (($asset->model) && ($asset->model->fieldset)) {foreach ($asset->model->fieldset->fields as $field) {- if (($field->display_audit=='1') && ($request->has($field->db_column))) {+ if (($field->display_audit == '1') && ($request->has($field->db_column))) {if ($field->field_encrypted == '1') {if (Gate::allows('assets.view.encrypted_custom_fields')) {if (is_array($request->input($field->db_column))) {@@ -1034,13 +1058,11 @@ class AssetsController extends Controller* We handle validation on the save() by checking if the asset is valid via the ->isValid() method,* which manually invokes Watson Validating to make sure the asset's model is valid.*- * @see \App\Observers\AssetObserver::updating()- * @see \App\Models\Asset::save()+ * @see AssetObserver::updating()+ * @see Asset::save()*/-$asset->unsetEventDispatcher();-/*** Invoke Watson Validating to check the asset itself and check to make sure it saved correctly.* We have to invoke this manually because of the unsetEventDispatcher() above.)@@ -1054,6 +1076,7 @@ class AssetsController extends Controller}$asset->logAudit($request->input('note'), $request->input('location_id'), $file_name, $originalValues);+return Helper::getRedirectOption($request, $asset->id, 'Assets')->with('success', trans('admin/hardware/message.audit.success'));}diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.phpindex 014ed6a73d..bf29f87ee3 100644--- a/app/Http/Controllers/Assets/BulkAssetsController.php+++ b/app/Http/Controllers/Assets/BulkAssetsController.php@@ -6,23 +6,23 @@ use App\Events\CheckoutablesCheckedOutInBulk;use App\Helpers\Helper;use App\Http\Controllers\CheckInOutRequest;use App\Http\Controllers\Controller;+use App\Http\Requests\AssetCheckoutRequest;use App\Models\Asset;use App\Models\AssetModel;-use App\Models\Statuslabel;+use App\Models\CustomField;use App\Models\Setting;+use App\Models\Statuslabel;use App\View\Label;use Carbon\Carbon;+use Illuminate\Contracts\View\View;+use Illuminate\Database\Eloquent\ModelNotFoundException;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;use Illuminate\Support\Facades\Context;use Illuminate\Support\Facades\Crypt;use Illuminate\Support\Facades\DB;use Illuminate\Support\Facades\Gate;use Illuminate\Support\Facades\Log;-use App\Http\Requests\AssetCheckoutRequest;-use App\Models\CustomField;-use Illuminate\Contracts\View\View;-use Illuminate\Http\RedirectResponse;-use Illuminate\Database\Eloquent\ModelNotFoundException;class BulkAssetsController extends Controller{@@ -39,10 +39,12 @@ class BulkAssetsController extends Controller* action would make a lot more sense here and make things a lot more clear.** @author [A. Gianotto] [<[email protected]>]+ ** @internal param int $assetId+ ** @since [v2.0]*/- public function edit(Request $request) : View | RedirectResponse+ public function edit(Request $request): View|RedirectResponse{$this->authorize('view', Asset::class);@@ -56,8 +58,8 @@ class BulkAssetsController extends Controller$asset_ids = $request->input('ids');if ($request->input('bulk_actions') === 'checkout') {- $status_check =$this->hasUndeployableStatus($asset_ids);- if($status_check && $status_check['status'] === true){+ $status_check = $this->hasUndeployableStatus($asset_ids);+ if ($status_check && $status_check['status'] === true) {$asset_tags = implode(', ', array_column($status_check['tags'], 'asset_tag'));$asset_ids = $status_check['asset_ids'];@@ -66,11 +68,13 @@ class BulkAssetsController extends Controller}$request->session()->flashInput(['selected_assets' => $asset_ids]);+return redirect()->route('hardware.bulkcheckout.show');}if ($request->input('bulk_actions') === 'maintenance') {$request->session()->flashInput(['selected_assets' => $asset_ids]);+return redirect()->route('maintenances.create');}@@ -104,7 +108,6 @@ class BulkAssetsController extends Controller'asset_eol_date',];-/*** Make sure the column is allowed, and if it's a custom field, make sure we strip the custom_fields. prefix*/@@ -115,9 +118,8 @@ class BulkAssetsController extends Controller$column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'assets.id';$query = Asset::with('assignedTo', 'location', 'model')- ->whereIn('assets.id', $asset_ids)- ->withTrashed();-+ ->whereIn('assets.id', $asset_ids)+ ->withTrashed();switch ($sort_override) {case 'model':@@ -158,19 +160,19 @@ class BulkAssetsController extends Controllerif ($assets->isEmpty()) {Log::debug('No assets were found for the provided IDs', ['ids' => $asset_ids]);+return redirect()->back()->with('error', trans('admin/hardware/message.update.assets_do_not_exist_or_are_invalid'));}$models = $assets->unique('model_id');$modelNames = [];- foreach($models as $model) {+ foreach ($models as $model) {$modelNames[] = $model->model?->name;}if ($request->filled('bulk_actions')) {-switch ($request->input('bulk_actions')) {case 'labels':$this->authorize('view', Asset::class);@@ -195,10 +197,12 @@ class BulkAssetsController extends Controller$assets->each(function ($asset) {$this->authorize('delete', $asset);});+return view('hardware/bulk-restore')->with('assets', $assets);case 'edit':$this->authorize('update', Asset::class);+return view('hardware/bulk')->with('assets', $asset_ids)->with('statuslabel_list', Helper::statusLabelList())@@ -207,8 +211,6 @@ class BulkAssetsController extends Controller}}--return redirect()->back()->with('error', 'No action selected');}@@ -216,42 +218,40 @@ class BulkAssetsController extends Controller* Save bulk edits** @author [A. Gianotto] [<[email protected]>]+ ** @internal param array $assets+ ** @since [v2.0]*/- public function update(Request $request) : RedirectResponse+ public function update(Request $request): RedirectResponse{$this->authorize('update', Asset::class);$has_errors = 0;- $error_array = array();+ $error_array = [];// Get the back url from the session and then destroy the session$bulk_back_url = $request->session()->pull('bulk_back_url', url()->previous());- $custom_field_columns = CustomField::all()->pluck('db_column')->toArray();+ $custom_field_columns = CustomField::all()->pluck('db_column')->toArray();// find custom field input attributes that start with 'null_'$null_custom_fields_inputs = array_filter($request->all(), function ($key) {// filter out all keys that start with 'null_'- return (strpos($key, 'null_') === 0);- }, ARRAY_FILTER_USE_KEY);;+ return strpos($key, 'null_') === 0;+ }, ARRAY_FILTER_USE_KEY);// remove 'null' from the keys$custom_fields_to_null = [];foreach ($null_custom_fields_inputs as $key => $value) {$custom_fields_to_null[str_replace('null', '', $key)] = $value;}-if (! $request->filled('ids') || count($request->input('ids')) == 0) {return redirect($bulk_back_url)->with('error', trans('admin/hardware/message.update.no_assets_selected'));}-$assets = Asset::whereIn('id', $request->input('ids'))->get();--/*** If ANY of these are filled, prepare to update the values on the assets.*@@ -259,7 +259,6 @@ class BulkAssetsController extends Controller* make sense (for example, changing the status ID to something incompatible with* its checkout status.*/-if (($request->filled('name'))|| ($request->filled('purchase_date'))|| ($request->filled('expected_checkin'))@@ -307,70 +306,68 @@ class BulkAssetsController extends Controller->conditionallyAddItem('next_audit_date')->conditionallyAddItem('asset_eol_date')->conditionallyAddItem('notes');- foreach ($custom_field_columns as $key => $custom_field_column) {- $this->conditionallyAddItem($custom_field_column);- }+ foreach ($custom_field_columns as $key => $custom_field_column) {+ $this->conditionallyAddItem($custom_field_column);+ }foreach ($custom_fields_to_null as $key => $custom_field_to_null) {$this->conditionallyAddItem($key);}- if (!($asset->eol_explicit)) {- if ($request->filled('model_id')) {- $model = AssetModel::find($request->input('model_id'));- if ($model->eol > 0) {- if ($request->filled('purchase_date')) {- $this->update_array['asset_eol_date'] = Carbon::parse($request->input('purchase_date'))->addMonths($model->eol)->format('Y-m-d');- } else {- $this->update_array['asset_eol_date'] = Carbon::parse($asset->purchase_date)->addMonths($model->eol)->format('Y-m-d');- }- } else {- $this->update_array['asset_eol_date'] = null;- }- } elseif (($request->filled('purchase_date')) && ($asset->model->eol > 0)) {- $this->update_array['asset_eol_date'] = Carbon::parse($request->input('purchase_date'))->addMonths($asset->model->eol)->format('Y-m-d');- }- }-+ if (! ($asset->eol_explicit)) {+ if ($request->filled('model_id')) {+ $model = AssetModel::find($request->input('model_id'));+ if ($model->eol > 0) {+ if ($request->filled('purchase_date')) {+ $this->update_array['asset_eol_date'] = Carbon::parse($request->input('purchase_date'))->addMonths($model->eol)->format('Y-m-d');+ } else {+ $this->update_array['asset_eol_date'] = Carbon::parse($asset->purchase_date)->addMonths($model->eol)->format('Y-m-d');+ }+ } else {+ $this->update_array['asset_eol_date'] = null;+ }+ } elseif (($request->filled('purchase_date')) && ($asset->model->eol > 0)) {+ $this->update_array['asset_eol_date'] = Carbon::parse($request->input('purchase_date'))->addMonths($asset->model->eol)->format('Y-m-d');+ }+ }+/*** Blank out fields that were requested to be blanked out via checkbox*/- if ($request->input('null_name')=='1') {+ if ($request->input('null_name') == '1') {$this->update_array['name'] = null;}- if ($request->input('null_purchase_date')=='1') {+ if ($request->input('null_purchase_date') == '1') {$this->update_array['purchase_date'] = null;- if (!($asset->eol_explicit)) {- $this->update_array['asset_eol_date'] = null;- }+ if (! ($asset->eol_explicit)) {+ $this->update_array['asset_eol_date'] = null;+ }}- if ($request->input('null_expected_checkin_date')=='1') {+ if ($request->input('null_expected_checkin_date') == '1') {$this->update_array['expected_checkin'] = null;}- if ($request->input('null_next_audit_date')=='1') {+ if ($request->input('null_next_audit_date') == '1') {$this->update_array['next_audit_date'] = null;}- if ($request->input('null_asset_eol_date')=='1') {+ if ($request->input('null_asset_eol_date') == '1') {$this->update_array['asset_eol_date'] = null;// If they are nulling the EOL date to allow it to calculate, set eol explicit to 0- if ($request->input('calc_eol')=='1') {+ if ($request->input('calc_eol') == '1') {$this->update_array['eol_explicit'] = 0;}}- if ($request->input('null_notes')=='1') {+ if ($request->input('null_notes') == '1') {$this->update_array['notes'] = null;}--if ($request->filled('purchase_cost')) {- $this->update_array['purchase_cost'] = $request->input('purchase_cost');+ $this->update_array['purchase_cost'] = $request->input('purchase_cost');}if ($request->filled('company_id')) {@@ -410,7 +407,7 @@ class BulkAssetsController extends Controller$unassigned = $asset->assigned_to == '';$deployable = $updated_status->deployable == '1' && $asset->assetstatus?->deployable == '1';- $pending = $updated_status->pending === 1;+ $pending = $updated_status->pending === 1;if ($unassigned || $deployable || $pending) {$this->update_array['status_id'] = $updated_status->id;@@ -445,7 +442,6 @@ class BulkAssetsController extends Controller}-/*** ------------------------------------------------------------------------------* ANYTHING that happens past this foreach@@ -464,7 +460,6 @@ class BulkAssetsController extends Controller}/**- ** Start all the custom fields shenanigans*/@@ -522,14 +517,13 @@ class BulkAssetsController extends Controller} // endforeach}-// Check if it passes validation, and then try to save- if (!$asset->update($this->update_array)) {+ if (! $asset->update($this->update_array)) {// Build the error arrayforeach ($asset->getErrors()->toArray() as $key => $message) {for ($x = 0; $x < count($message); $x++) {- $error_array[$key][] = trans('general.asset') . ' ' . $asset->id . ': ' . $message[$x];+ $error_array[$key][] = trans('general.asset').' '.$asset->id.': '.$message[$x];$has_errors++;}}@@ -540,7 +534,7 @@ class BulkAssetsController extends Controllerif ($has_errors > 0) {session()->put('bulkedit_ids', $request->input('ids'));- session()->put('bulk_asset_errors',$error_array);+ session()->put('bulk_asset_errors', $error_array);return redirect()->route('hardware.index')@@ -550,21 +544,24 @@ class BulkAssetsController extends Controllerreturn redirect($bulk_back_url)->with('success', trans('admin/hardware/message.update.success'));}+// no values given, nothing to updatereturn redirect($bulk_back_url)->with('warning', trans('admin/hardware/message.update.nothing_updated'));}/*** Array to store update data per item+ ** @var array*/private $update_array;/*** Adds parameter to update array for an item if it exists in request- * @param string $field field name+ *+ * @param string $field field name*/- protected function conditionallyAddItem($field) : BulkAssetsController+ protected function conditionallyAddItem($field): BulkAssetsController{if (request()->filled($field)) {$this->update_array[$field] = request()->input($field);@@ -577,11 +574,12 @@ class BulkAssetsController extends Controller* Save bulk deleted.** @author [A. Gianotto] [<[email protected]>]- * @param Request $request+ ** @internal param array $assets+ ** @since [v2.0]*/- public function destroy(Request $request) : RedirectResponse+ public function destroy(Request $request): RedirectResponse{$this->authorize('delete', Asset::class);@@ -592,31 +590,32 @@ class BulkAssetsController extends Controller}$assetIds = $request->input('ids');- if(empty($assetIds)) {+ if (empty($assetIds)) {return redirect($bulk_back_url)->with('error', trans('admin/hardware/message.delete.nothing_updated'));}$assignedAssets = Asset::whereIn('id', $assetIds)->whereNotNull('assigned_to')->get();- if($assignedAssets->isNotEmpty()) {+ if ($assignedAssets->isNotEmpty()) {- //if assets are checked out, return a list of asset tags that would need to be checked in first.+ // if assets are checked out, return a list of asset tags that would need to be checked in first.$assetTags = $assignedAssets->pluck('asset_tag')->implode(', ');- return redirect($bulk_back_url)->with('error', trans_choice('admin/hardware/message.delete.assigned_to_error', $assignedAssets->count(), ['asset_tag' => $assetTags] ));++ return redirect($bulk_back_url)->with('error', trans_choice('admin/hardware/message.delete.assigned_to_error', $assignedAssets->count(), ['asset_tag' => $assetTags]));}foreach (Asset::wherein('id', $assetIds)->get() as $asset) {- $asset->delete();- }+ $asset->delete();+ }return redirect($bulk_back_url)->with('success', trans('admin/hardware/message.delete.success'));- // no values given, nothing to update+ // no values given, nothing to update}/*** Show Bulk Checkout Page*/- public function showCheckout() : View+ public function showCheckout(): View{$this->authorize('checkout', Asset::class);@@ -626,7 +625,7 @@ class BulkAssetsController extends Controller$assets = Asset::findMany(old('selected_assets'));[$assignable, $alreadyAssigned] = $assets->partition(function (Asset $asset) {- return !$asset->assigned_to;+ return ! $asset->assigned_to;});session()->flashInput(['selected_assets' => $assignable->pluck('id')->values()->toArray()]);@@ -644,7 +643,7 @@ class BulkAssetsController extends Controller/*** Process Multiple Checkout Request*/- public function storeCheckout(AssetCheckoutRequest $request) : RedirectResponse | ModelNotFoundException+ public function storeCheckout(AssetCheckoutRequest $request): RedirectResponse|ModelNotFoundException{Context::add('action', 'bulk_asset_checkout');@@ -707,7 +706,7 @@ class BulkAssetsController extends Controller}$errors = [];- DB::transaction(function () use ($target, $admin, $checkout_at, $expected_checkin, &$errors, $assets, $request) { //NOTE: $errors is passsed by reference!+ DB::transaction(function () use ($target, $admin, $checkout_at, $expected_checkin, &$errors, $assets, $request) { // NOTE: $errors is passsed by reference!foreach ($assets as $asset) {$this->authorize('checkout', $asset);@@ -718,7 +717,7 @@ class BulkAssetsController extends Controller$checkout_success = $asset->checkOut($target, $admin, $checkout_at, $expected_checkin, e($request->input('note')), $asset->name, null);- //TODO - I think this logic is duplicated in the checkOut method?+ // TODO - I think this logic is duplicated in the checkOut method?if ($target->location_id != '') {$asset->location_id = $target->location_id;// TODO - I don't know why this is being saved without events@@ -727,7 +726,7 @@ class BulkAssetsController extends Controller});}- if (!$checkout_success) {+ if (! $checkout_success) {$errors = array_merge_recursive($errors, $asset->getErrors()->toArray());}}@@ -746,14 +745,16 @@ class BulkAssetsController extends Controller// Redirect to the new asset pagereturn redirect()->to('hardware')->with('success', trans_choice('admin/hardware/message.multi-checkout.success', $asset_ids));}+// Redirect to the asset management page with errorreturn redirect()->route('hardware.bulkcheckout.show')->withInput()->with('error', trans_choice('admin/hardware/message.multi-checkout.error', $asset_ids))->withErrors($errors);} catch (ModelNotFoundException $e) {return redirect()->route('hardware.bulkcheckout.show')->withInput()->with('error', trans_choice('admin/hardware/message.multi-checkout.error', $request->input('selected_assets')));}-+}- public function restore(Request $request) : RedirectResponse++ public function restore(Request $request): RedirectResponse{$this->authorize('update', Asset::class);$assetIds = $request->input('ids');@@ -764,11 +765,13 @@ class BulkAssetsController extends Controllerforeach ($assetIds as $key => $assetId) {$asset = Asset::withTrashed()->find($assetId);$asset->restore();- }+ }+return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.restore.success'));}}- public function hasUndeployableStatus (array $asset_ids)++ public function hasUndeployableStatus(array $asset_ids){$undeployable = Asset::whereIn('id', $asset_ids)->undeployable()@@ -784,9 +787,10 @@ class BulkAssetsController extends Controller$undeployableIds = array_column($undeployableTags, 'id');$filtered_ids = array_diff($asset_ids, $undeployableIds);- if($undeployable->isNotEmpty()) {- return ['status' => true, 'tags' => $undeployableTags, 'asset_ids' => $filtered_ids];- }+ if ($undeployable->isNotEmpty()) {+ return ['status' => true, 'tags' => $undeployableTags, 'asset_ids' => $filtered_ids];+ }+return false;}diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.phpindex f385c054c6..8dbb8be150 100644--- a/app/Http/Controllers/Auth/ForgotPasswordController.php+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php@@ -4,8 +4,10 @@ namespace App\Http\Controllers\Auth;use App\Http\Controllers\Controller;use Illuminate\Foundation\Auth\SendsPasswordResetEmails;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;use Illuminate\Support\Facades\Log;+class ForgotPasswordController extends Controller{/*@@ -35,6 +37,7 @@ class ForgotPasswordController extends Controller/*** Get the e-mail subject line to be used for the reset link email.* Overriding method "getEmailSubject()" from trait "use ResetsPasswords"+ ** @return string*/public function getEmailSubject()@@ -45,8 +48,7 @@ class ForgotPasswordController extends Controller/*** Send a reset link to the given user.*- * @param \Illuminate\Http\Request $request- * @return \Illuminate\Http\RedirectResponse+ * @return RedirectResponse*/public function sendResetLinkEmail(Request $request){@@ -67,7 +69,6 @@ class ForgotPasswordController extends Controller* Once we have attempted to send the link, we will examine the response* then see the message we need to show to the user. Finally, we'll send out a proper response.*/-$response = null;try {@@ -78,8 +79,8 @@ class ForgotPasswordController extends Controller['ldap_import' => '0']));- } catch(\Exception $e) {- Log::info('Password reset attempt: User '.$request->input('username').'failed with exception: '.$e );+ } catch (\Exception $e) {+ Log::info('Password reset attempt: User '.$request->input('username').'failed with exception: '.$e);}// Prevent timing attack to enumerate users.@@ -102,10 +103,10 @@ class ForgotPasswordController extends Controller** Instead we tell the user we've sent an email even though we haven't.* It's bad UX, but better security. The compromises we sometimes have to make.- */+ */// Regardless of response, we do not want to disclose the status of a user account,// so we give them a generic "If this exists, we're TOTALLY gonna email you" responsereturn redirect()->route('login')->with('success', trans('passwords.sent'));- }+ }}diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.phpindex 0b87865455..1e8a8cf475 100644--- a/app/Http/Controllers/Auth/LoginController.php+++ b/app/Http/Controllers/Auth/LoginController.php@@ -3,20 +3,20 @@namespace App\Http\Controllers\Auth;use App\Http\Controllers\Controller;+use App\Models\Ldap;use App\Models\SamlNonce;use App\Models\Setting;use App\Models\User;-use App\Models\Ldap;use App\Services\Saml;use Com\Tecnick\Barcode\Barcode;use Google2FA;use Illuminate\Foundation\Auth\ThrottlesLogins;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;-use Illuminate\Support\Carbon;use Illuminate\Support\Facades\Auth;+use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Session;use Illuminate\Support\Facades\Validator;-use Illuminate\Support\Facades\Log;use Redirect;/**@@ -24,6 +24,7 @@ use Redirect;* database users and LDAP users.** @author [A. Gianotto] [<[email protected]>]+ ** @version v1.0*/class LoginController extends Controller@@ -48,7 +49,6 @@ class LoginController extends Controller/*** Create a new authentication controller instance.*- * @param Saml $saml** @return void*/@@ -68,14 +68,13 @@ class LoginController extends Controllerreturn redirect()->intended('/');}- if (!$request->session()->has('loggedout')) {+ if (! $request->session()->has('loggedout')) {// If the environment is set to ALWAYS require SAML, go straight to the SAML route.// We don't need to check other settings, as this should override those.if (config('app.require_saml')) {return redirect()->route('saml.login');}-if ($this->saml->isEnabled() && Setting::getSettings()->saml_forcelogin == '1' && ! ($request->has('nosaml') || $request->session()->has('error'))) {return redirect()->route('saml.login');}@@ -95,8 +94,6 @@ class LoginController extends Controller** @since 5.0.0*- * @param Request $request- ** @return User** @throws \Exception@@ -111,14 +108,14 @@ class LoginController extends Controllertry {$user = $saml->samlLogin($samlData);$notValidAfter = new \Carbon\Carbon(@$samlData['assertionNotOnOrAfter']);- if(\Carbon::now()->greaterThanOrEqualTo($notValidAfter)) {- abort(400,"Expired SAML Assertion");+ if (\Carbon::now()->greaterThanOrEqualTo($notValidAfter)) {+ abort(400, 'Expired SAML Assertion');}- if(SamlNonce::where('nonce', @$samlData['nonce'])->count() > 0) {- abort(400,"Assertion has already been used");+ if (SamlNonce::where('nonce', @$samlData['nonce'])->count() > 0) {+ abort(400, 'Assertion has already been used');}- Log::debug("okay, fine, this is a new nonce then. Good for you.");- if (!is_null($user)) {+ Log::debug('okay, fine, this is a new nonce then. Good for you.');+ if (! is_null($user)) {Auth::login($user);} else {$username = $saml->getUsername();@@ -131,7 +128,7 @@ class LoginController extends Controller$user->last_login = \Carbon::now();$user->saveQuietly();}- $s = new SamlNonce();+ $s = new SamlNonce;$s->nonce = @$samlData['nonce'];$s->not_valid_after = $notValidAfter;$s->save();@@ -141,17 +138,15 @@ class LoginController extends Controllerthrow $e;}- // Fallthrough with better logging+ // Fallthrough with better logging} else {// Better loggingif (empty($samlData)) {- Log::debug("SAML page requested, but samlData seems empty.");+ Log::debug('SAML page requested, but samlData seems empty.');}}--}/**@@ -161,57 +156,54 @@ class LoginController extends Controller** @since 5.0.0*- * @param Request $request- *- * @return User- ** @throws \Exception*/private function loginViaLdap(Request $request): User{- Log::debug("Binding user to LDAP.");- $ldap_user = Ldap::findAndBindUserLdap($request->input('username'), $request->input('password'));- if (!$ldap_user) {- Log::debug("LDAP user ".$request->input('username')." not found in LDAP or could not bind");- throw new \Exception("Could not find user in LDAP directory");- } else {- Log::debug("LDAP user ".$request->input('username')." successfully bound to LDAP");- }-- // Check if the user already exists in the database and was imported via LDAP- $user = User::where('username', '=', $request->input('username'))->whereNull('deleted_at')->where('ldap_import', '=', 1)->where('activated', '=', '1')->first(); // FIXME - if we get more than one we should fail. and we sure about this ldap_import thing?- Log::debug("Local auth lookup complete");-- // The user does not exist in the database. Try to get them from LDAP.- // If user does not exist and authenticates successfully with LDAP we- // will create it on the fly and sign in with default permissions- if (!$user) {- Log::debug("Local user ".$request->input('username')." does not exist");- Log::debug("Creating local user ".$request->input('username'));-- if ($user = Ldap::createUserFromLdap($ldap_user, $request->input('password'))) {- Log::debug("Local user created.");- } else {- Log::debug("Could not create local user.");- throw new \Exception("Could not create local user");- }- // If the user exists and they were imported from LDAP already- } else {- Log::debug("Local user ".$request->input('username')." exists in database. Updating existing user against LDAP.");-- $ldap_attr = Ldap::parseAndMapLdapAttributes($ldap_user);+ Log::debug('Binding user to LDAP.');+ $ldap_user = Ldap::findAndBindUserLdap($request->input('username'), $request->input('password'));+ if (! $ldap_user) {+ Log::debug('LDAP user '.$request->input('username').' not found in LDAP or could not bind');+ throw new \Exception('Could not find user in LDAP directory');+ } else {+ Log::debug('LDAP user '.$request->input('username').' successfully bound to LDAP');+ }++ // Check if the user already exists in the database and was imported via LDAP+ $user = User::where('username', '=', $request->input('username'))->whereNull('deleted_at')->where('ldap_import', '=', 1)->where('activated', '=', '1')->first(); // FIXME - if we get more than one we should fail. and we sure about this ldap_import thing?+ Log::debug('Local auth lookup complete');++ // The user does not exist in the database. Try to get them from LDAP.+ // If user does not exist and authenticates successfully with LDAP we+ // will create it on the fly and sign in with default permissions+ if (! $user) {+ Log::debug('Local user '.$request->input('username').' does not exist');+ Log::debug('Creating local user '.$request->input('username'));++ if ($user = Ldap::createUserFromLdap($ldap_user, $request->input('password'))) {+ Log::debug('Local user created.');+ } else {+ Log::debug('Could not create local user.');+ throw new \Exception('Could not create local user');+ }+ // If the user exists and they were imported from LDAP already+ } else {+ Log::debug('Local user '.$request->input('username').' exists in database. Updating existing user against LDAP.');++ $ldap_attr = Ldap::parseAndMapLdapAttributes($ldap_user);$user->password = $user->noPassword();- if (Setting::getSettings()->ldap_pw_sync=='1') {+ if (Setting::getSettings()->ldap_pw_sync == '1') {$user->password = bcrypt($request->input('password'));}$user->last_login = \Carbon::now();$user->email = $ldap_attr['email'];$user->first_name = $ldap_attr['firstname'];- $user->last_name = $ldap_attr['lastname']; //FIXME (or TODO?) - do we need to map additional fields that we now support? E.g. country, phone, etc.+ $user->last_name = $ldap_attr['lastname']; // FIXME (or TODO?) - do we need to map additional fields that we now support? E.g. country, phone, etc.$user->saveQuietly();} // End if(!user)+return $user;}@@ -219,8 +211,8 @@ class LoginController extends Controller{$header_name = Setting::getSettings()->login_remote_user_header_name ?: 'REMOTE_USER';$remote_user = $request->server($header_name);- if (!isset($remote_user)) {- $remote_user = $request->server('REDIRECT_'.$header_name);+ if (! isset($remote_user)) {+ $remote_user = $request->server('REDIRECT_'.$header_name);}if (Setting::getSettings()->login_remote_user_enabled == '1' && isset($remote_user) && ! empty($remote_user)) {Log::debug("Authenticating via HTTP header $header_name.");@@ -262,19 +254,21 @@ class LoginController extends Controller/*** Account sign in form processing.*- * @return \Illuminate\Http\RedirectResponse+ * @return RedirectResponse*/public function login(Request $request){- //If the environment is set to ALWAYS require SAML, return access denied+ // If the environment is set to ALWAYS require SAML, return access deniedif (config('app.require_saml')) {Log::debug('require SAML is enabled in the .env - return a 403');+return view('errors.403');}if (Setting::getSettings()->login_common_disabled == '1') {Log::debug('login_common_disabled is set to 1 - return a 403');+return view('errors.403');}@@ -300,14 +294,14 @@ class LoginController extends Controller// Should we even check for LDAP users?if (Setting::getSettings()->ldap_enabled) { // avoid hitting the $this->ldap- LOG::debug('LDAP is enabled.');+ Log::debug('LDAP is enabled.');try {- LOG::debug('Attempting to log user in by LDAP authentication.');+ Log::debug('Attempting to log user in by LDAP authentication.');$user = $this->loginViaLdap($request);Auth::login($user, $request->input('remember'));// If the user was unable to login via LDAP, log the error and let them fall through to- // local authentication.+ // local authentication.} catch (\Exception $e) {Log::debug('There was an error authenticating the LDAP user: '.$e->getMessage());}@@ -335,15 +329,15 @@ class LoginController extends Controller$user->activated = 1;$user->saveQuietly();}+// Redirect to the users pagereturn redirect()->intended()->with('success', trans('auth/message.signin.success'));}-/*** Two factor enrollment page*- * @return \Illuminate\Http\RedirectResponse+ * @return RedirectResponse*/public function getTwoFactorEnroll(){@@ -369,7 +363,7 @@ class LoginController extends Controller$secret = Google2FA::generateSecretKey();$user->two_factor_secret = $secret;- $barcode = new Barcode();+ $barcode = new Barcode;$barcode_obj =$barcode->getBarcodeObj('QRCODE',@@ -393,7 +387,7 @@ class LoginController extends Controller/*** Two factor code form page*- * @return \Illuminate\Http\RedirectResponse+ * @return RedirectResponse*/public function getTwoFactorAuth(){@@ -417,9 +411,8 @@ class LoginController extends Controller/*** Two factor code submission*- * @param Request $request*- * @return \Illuminate\Http\RedirectResponse+ * @return RedirectResponse*/public function postTwoFactorAuth(Request $request){@@ -446,11 +439,9 @@ class LoginController extends Controllerreturn redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.invalid_code'));}-/*** Logout page.*- * @param Request $request** @return Illuminate\Http\RedirectResponse*/@@ -462,9 +453,9 @@ class LoginController extends Controller$samlLogout = $request->session()->get('saml_logout');$sloRedirectUrl = null;$sloRequestUrl = null;-+// Only allow GET if we are doing SAML SLO otherwise abort with 405- if ($request->isMethod('GET') && !$samlLogout) {+ if ($request->isMethod('GET') && ! $samlLogout) {abort(405);}@@ -486,7 +477,7 @@ class LoginController extends Controller$request->session()->regenerate(true);$request->session()->forget('2fa_authed');- if ($request->session()->has('password_hash_'.Auth::getDefaultDriver())){+ if ($request->session()->has('password_hash_'.Auth::getDefaultDriver())) {$request->session()->remove('password_hash_'.Auth::getDefaultDriver());}@@ -504,11 +495,9 @@ class LoginController extends Controllerreturn redirect()->route('login')->with(['success' => trans('auth/message.logout.success'), 'loggedout' => true]);}-/*** Get a validator for an incoming registration request.*- * @param array $data* @return \Illuminate\Contracts\Validation\Validator*/protected function validator(array $data)@@ -519,13 +508,11 @@ class LoginController extends Controller]);}-public function username(){return 'username';}-public function legacyAuthRedirect(){return redirect()->route('login');diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.phpindex 805b829180..06f9ab9e99 100644--- a/app/Http/Controllers/Auth/ResetPasswordController.php+++ b/app/Http/Controllers/Auth/ResetPasswordController.php@@ -63,10 +63,11 @@ class ResetPasswordController extends Controllerpublic function showResetForm(Request $request, $token = null){- $credentials = $request->only('email', 'token');+ $credentials = $request->only('email', 'token');if (is_null($this->broker()->getUser($credentials))) {Log::debug('Password reset form FAILED - this token is not valid.');+return redirect()->route('password.request')->with('error', trans('passwords.token'));}@@ -94,7 +95,6 @@ class ResetPasswordController extends Controllerif ($user = User::where('username', '=', $request->input('username'))->where('activated', '1')->whereNotNull('email')->first()) {Log::debug($user->username.' exists');-// handle the password validation rules set by the admin settingsif (strpos(Setting::passwordComplexityRulesSaving('store'), 'disallow_same_pwd_as_user_fields') !== false) {$request->validate(@@ -105,30 +105,29 @@ class ResetPasswordController extends Controllerif ($user->ldap_import != '1') {- // set the response- $response = $broker->reset(- $this->credentials($request), function ($user, $password) {+ // set the response+ $response = $broker->reset(+ $this->credentials($request), function ($user, $password) {$this->resetPassword($user, $password);});- // Check if the password reset above actually worked- if ($response == \Password::PASSWORD_RESET) {- Log::debug('Password reset for ' . $user->username . ' worked');- return redirect()->guest('login')->with('success', trans('passwords.reset'));- }+ // Check if the password reset above actually worked+ if ($response == \Password::PASSWORD_RESET) {+ Log::debug('Password reset for '.$user->username.' worked');++ return redirect()->guest('login')->with('success', trans('passwords.reset'));+ }- Log::debug('Password reset for ' . $user->username . ' FAILED - this user exists but the token is not valid');- return redirect()->back()->withInput($request->only('email'))->with('success', trans('passwords.reset'));+ Log::debug('Password reset for '.$user->username.' FAILED - this user exists but the token is not valid');++ return redirect()->back()->withInput($request->only('email'))->with('success', trans('passwords.reset'));}}-Log::debug('Password reset for '.$request->input('username').' FAILED - user does not exist or does not have an email address - but make it look like it succeeded');+return redirect()->guest('login')->with('success', trans('passwords.reset'));}---}diff --git a/app/Http/Controllers/Auth/SamlController.php b/app/Http/Controllers/Auth/SamlController.phpindex 6a4c1f65b0..6a01e39d15 100644--- a/app/Http/Controllers/Auth/SamlController.php+++ b/app/Http/Controllers/Auth/SamlController.php@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Auth;use App\Http\Controllers\Controller;use App\Services\Saml;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;use Illuminate\Support\Facades\Log;@@ -42,8 +43,6 @@ class SamlController extends Controller** @since 5.0.0*- * @param Request $request- ** @return Response*/public function metadata(Request $request)@@ -52,6 +51,7 @@ class SamlController extends Controllerif (empty($metadata)) {Log::debug('SAML metadata is empty - return a 403');+return response()->view('errors.403', [], 403);}@@ -69,9 +69,7 @@ class SamlController extends Controller** @since 5.0.0*- * @param Request $request- *- * @return \Illuminate\Http\RedirectResponse+ * @return RedirectResponse*/public function login(Request $request){@@ -91,9 +89,7 @@ class SamlController extends Controller** @since 5.0.0*- * @param Request $request- *- * @return \Illuminate\Http\RedirectResponse+ * @return RedirectResponse*/public function acs(Request $request){@@ -103,14 +99,14 @@ class SamlController extends Controllertry {$auth->processResponse();} catch (\Exception $e) {- Log::warning("Exception caught in SAML login: " . $e->getMessage());+ Log::warning('Exception caught in SAML login: '.$e->getMessage());$saml_exception = true;}$errors = $auth->getErrors();- if (!empty($errors) || $saml_exception) {- Log::warning('There was an error with SAML ACS: ' . implode(', ', $errors));- Log::warning('Reason: ' . $auth->getLastErrorReason());+ if (! empty($errors) || $saml_exception) {+ Log::warning('There was an error with SAML ACS: '.implode(', ', $errors));+ Log::warning('Reason: '.$auth->getLastErrorReason());return redirect()->route('login')->with('error', trans('auth/message.signin.error'));}@@ -130,9 +126,7 @@ class SamlController extends Controller** @since 5.0.0*- * @param Request $request- *- * @return \Illuminate\Http\RedirectResponse+ * @return RedirectResponse*/public function sls(Request $request){@@ -142,18 +136,18 @@ class SamlController extends Controllertry {$sloUrl = $auth->processSLO(true, null, $retrieveParametersFromServer, null, true);} catch (\Exception $e) {- Log::warning("Exception caught in SAML single-logout: " . $e->getMessage());+ Log::warning('Exception caught in SAML single-logout: '.$e->getMessage());$saml_exception = true;}$errors = $auth->getErrors();- if (!empty($errors) || $saml_exception) {- Log::warning('There was an error with SAML SLS: ' . implode(', ', $errors));- Log::warning('Reason: ' . $auth->getLastErrorReason());+ if (! empty($errors) || $saml_exception) {+ Log::warning('There was an error with SAML SLS: '.implode(', ', $errors));+ Log::warning('Reason: '.$auth->getLastErrorReason());return view('errors.403');}- return redirect()->route('logout.get')->with(['saml_logout' => true,'saml_slo_redirect_url' => $sloUrl]);+ return redirect()->route('logout.get')->with(['saml_logout' => true, 'saml_slo_redirect_url' => $sloUrl]);}}diff --git a/app/Http/Controllers/BulkAssetModelsController.php b/app/Http/Controllers/BulkAssetModelsController.phpindex c1ecf309fb..9e2c5bccef 100644--- a/app/Http/Controllers/BulkAssetModelsController.php+++ b/app/Http/Controllers/BulkAssetModelsController.php@@ -4,9 +4,9 @@ namespace App\Http\Controllers;use App\Helpers\Helper;use App\Models\AssetModel;-use Illuminate\Http\Request;+use Illuminate\Contracts\View\View;use Illuminate\Http\RedirectResponse;-use \Illuminate\Contracts\View\View;+use Illuminate\Http\Request;class BulkAssetModelsController extends Controller{@@ -14,10 +14,10 @@ class BulkAssetModelsController extends Controller* Returns a view that allows the user to bulk edit model attrbutes** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.7]- * @param Request $request*/- public function edit(Request $request) : View | RedirectResponse+ public function edit(Request $request): View|RedirectResponse{$models_raw_array = $request->input('ids');@@ -58,20 +58,20 @@ class BulkAssetModelsController extends Controller* Returns a view that allows the user to bulk edit model attrbutes** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.7]- * @param Request $request*/- public function update(Request $request): View | RedirectResponse+ public function update(Request $request): View|RedirectResponse{$this->authorize('update', AssetModel::class);-+$models_raw_array = $request->input('ids');$update_array = [];if (($request->filled('manufacturer_id') && ($request->input('manufacturer_id') != 'NC'))) {$update_array['manufacturer_id'] = $request->input('manufacturer_id');}-+if (($request->filled('category_id') && ($request->input('category_id') != 'NC'))) {$update_array['category_id'] = $request->input('category_id');}@@ -112,12 +112,13 @@ class BulkAssetModelsController extends Controller* cannot be deleted if there are associated assets.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]*/- public function destroy(Request $request) : RedirectResponse+ public function destroy(Request $request): RedirectResponse{$this->authorize('delete', AssetModel::class);-+$models_raw_array = $request->input('ids');if ((is_array($models_raw_array)) && (count($models_raw_array) > 0)) {@@ -137,11 +138,11 @@ class BulkAssetModelsController extends Controllerif ($del_error_count == 0) {return redirect()->route('models.index')- ->with('success', trans('admin/models/message.bulkdelete.success', ['success_count'=> $del_count]));+ ->with('success', trans('admin/models/message.bulkdelete.success', ['success_count' => $del_count]));}return redirect()->route('models.index')- ->with('warning', trans('admin/models/message.bulkdelete.success_partial', ['fail_count'=>$del_error_count, 'success_count'=> $del_count]));+ ->with('warning', trans('admin/models/message.bulkdelete.success_partial', ['fail_count' => $del_error_count, 'success_count' => $del_count]));}return redirect()->route('models.index')diff --git a/app/Http/Controllers/BulkCategoriesController.php b/app/Http/Controllers/BulkCategoriesController.phpindex f0f967b90a..b59c487d08 100644--- a/app/Http/Controllers/BulkCategoriesController.php+++ b/app/Http/Controllers/BulkCategoriesController.php@@ -25,6 +25,7 @@ class BulkCategoriesController extends Controller$category = Category::find($id);if (is_null($category)) {$errors[] = trans('admin/categories/message.does_not_exist');+continue;}try {@@ -41,7 +42,7 @@ class BulkCategoriesController extends Controller} catch (ItemStillHasConsumables) {$errors[] = trans('general.bulk_delete_associations.assoc_consumables_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]);} catch (ItemStillHasLicenses) {- $errors[] = trans('general.bulk_delete_associations.assoc_licenses_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]);;+ $errors[] = trans('general.bulk_delete_associations.assoc_licenses_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]);} catch (\Exception $e) {report($e);$errors[] = trans('general.something_went_wrong');@@ -51,6 +52,7 @@ class BulkCategoriesController extends Controllerif ($success_count > 0) {return redirect()->route('categories.index')->with('success', trans_choice('admin/categories/message.delete.partial_success', $success_count, ['count' => $success_count]))->with('multi_error_messages', $errors);}+return redirect()->route('categories.index')->with('multi_error_messages', $errors);} else {return redirect()->route('categories.index')->with('success', trans('admin/categories/message.delete.bulk_success'));diff --git a/app/Http/Controllers/BulkManufacturersController.php b/app/Http/Controllers/BulkManufacturersController.phpindex ec8da05125..d2e0b8e616 100644--- a/app/Http/Controllers/BulkManufacturersController.php+++ b/app/Http/Controllers/BulkManufacturersController.php@@ -4,9 +4,7 @@ namespace App\Http\Controllers;use App\Actions\Manufacturers\DeleteManufacturerAction;use App\Exceptions\ItemStillHasAccessories;-use App\Exceptions\ItemStillHasAssetModels;use App\Exceptions\ItemStillHasAssets;-use App\Exceptions\ItemStillHasChildren;use App\Exceptions\ItemStillHasComponents;use App\Exceptions\ItemStillHasConsumables;use App\Exceptions\ItemStillHasLicenses;@@ -25,6 +23,7 @@ class BulkManufacturersController extends Controller$manufacturer = Manufacturer::find($id);if (is_null($manufacturer)) {$errors[] = trans('admin/manufacturers/message.does_not_exist');+continue;}try {@@ -39,7 +38,7 @@ class BulkManufacturersController extends Controller} catch (ItemStillHasComponents $e) {$errors[] = trans('general.bulk_delete_associations.assoc_components_no_count', ['item_name' => $manufacturer->name, 'item' => trans('general.manufacturer')]);} catch (ItemStillHasLicenses $e) {- $errors[] = trans('general.bulk_delete_associations.assoc_licenses_no_count', ['item_name' => $manufacturer->name, 'item' => trans('general.manufacturer')]);;+ $errors[] = trans('general.bulk_delete_associations.assoc_licenses_no_count', ['item_name' => $manufacturer->name, 'item' => trans('general.manufacturer')]);} catch (\Exception $e) {report($e);$errors[] = trans('general.something_went_wrong');@@ -49,6 +48,7 @@ class BulkManufacturersController extends Controllerif ($success_count > 0) {return redirect()->route('manufacturers.index')->with('success', trans_choice('admin/manufacturers/message.delete.partial_success', $success_count, ['count' => $success_count]))->with('multi_error_messages', $errors);}+return redirect()->route('manufacturers.index')->with('multi_error_messages', $errors);} else {return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.delete.bulk_success'));diff --git a/app/Http/Controllers/BulkSuppliersController.php b/app/Http/Controllers/BulkSuppliersController.phpindex d7481c80db..394bf08e53 100644--- a/app/Http/Controllers/BulkSuppliersController.php+++ b/app/Http/Controllers/BulkSuppliersController.php@@ -4,11 +4,11 @@ namespace App\Http\Controllers;use App\Actions\Suppliers\DestroySupplierAction;use App\Exceptions\ItemStillHasAccessories;+use App\Exceptions\ItemStillHasAssets;use App\Exceptions\ItemStillHasComponents;use App\Exceptions\ItemStillHasConsumables;-use App\Exceptions\ItemStillHasMaintenances;-use App\Exceptions\ItemStillHasAssets;use App\Exceptions\ItemStillHasLicenses;+use App\Exceptions\ItemStillHasMaintenances;use App\Models\Supplier;use Illuminate\Http\Request;@@ -25,6 +25,7 @@ class BulkSuppliersController extends Controller$supplier = Supplier::find($id);if (is_null($supplier)) {$errors[] = trans('admin/suppliers/message.delete.not_found');+continue;}try {@@ -50,6 +51,7 @@ class BulkSuppliersController extends Controllerif ($success_count > 0) {return redirect()->route('suppliers.index')->with('success', trans_choice('admin/suppliers/message.delete.partial_success', $success_count, ['count' => $success_count]))->with('multi_error_messages', $errors);}+return redirect()->route('suppliers.index')->with('multi_error_messages', $errors);} else {return redirect()->route('suppliers.index')->with('success', trans('admin/suppliers/message.delete.bulk_success'));diff --git a/app/Http/Controllers/CategoriesController.php b/app/Http/Controllers/CategoriesController.phpindex f74e2fcb44..4788d4e2d5 100755--- a/app/Http/Controllers/CategoriesController.php+++ b/app/Http/Controllers/CategoriesController.php@@ -3,26 +3,19 @@namespace App\Http\Controllers;use App\Actions\Categories\DestroyCategoryAction;-use App\Exceptions\ItemStillHasAccessories;-use App\Exceptions\ItemStillHasAssetModels;-use App\Exceptions\ItemStillHasAssets;use App\Exceptions\ItemStillHasChildren;-use App\Exceptions\ItemStillHasComponents;-use App\Exceptions\ItemStillHasConsumables;-use App\Exceptions\ItemStillHasLicenses;use App\Helpers\Helper;use App\Http\Requests\ImageUploadRequest;use App\Models\Category;-use Illuminate\Support\Facades\Auth;-use Illuminate\Support\Facades\Storage;+use Illuminate\Contracts\View\View;use Illuminate\Http\RedirectResponse;-use \Illuminate\Contracts\View\View;/*** This class controls all actions related to Categories for* the Snipe-IT Asset Management application.** @version v1.0+ ** @author [A. Gianotto] [<[email protected]>]*/class CategoriesController extends Controller@@ -32,10 +25,11 @@ class CategoriesController extends Controller* the content for the categories listing, which is generated in getDatatable.** @author [A. Gianotto] [<[email protected]>]+ ** @see CategoriesController::getDatatable() method that generates the JSON response* @since [v1.0]*/- public function index() : View+ public function index(): View{// Show the page$this->authorize('view', Category::class);@@ -47,10 +41,11 @@ class CategoriesController extends Controller* Returns a form view to create a new category.** @author [A. Gianotto] [<[email protected]>]+ ** @see CategoriesController::store() method that stores the data* @since [v1.0]*/- public function create() : View+ public function create(): View{// Show the page$this->authorize('create', Category::class);@@ -63,14 +58,14 @@ class CategoriesController extends Controller* Validates and stores the new category data.** @author [A. Gianotto] [<[email protected]>]+ ** @see CategoriesController::create() method that makes the form.* @since [v1.0]- * @param ImageUploadRequest $request*/- public function store(ImageUploadRequest $request) : RedirectResponse+ public function store(ImageUploadRequest $request): RedirectResponse{$this->authorize('create', Category::class);- $category = new Category();+ $category = new Category;$category->name = $request->input('name');$category->category_type = $request->input('category_type');$category->eula_text = $request->input('eula_text');@@ -78,7 +73,7 @@ class CategoriesController extends Controller$category->require_acceptance = $request->input('require_acceptance', '0');$category->alert_on_response = $request->input('alert_on_response', '0');$category->checkin_email = $request->input('checkin_email', '0');- $category->tag_color = $request->input('tag_color');+ $category->tag_color = $request->input('tag_color');$category->notes = $request->input('notes');$category->created_by = auth()->id();@@ -94,27 +89,33 @@ class CategoriesController extends Controller* Returns a view that makes a form to update a category.** @author [A. Gianotto] [<[email protected]>]+ ** @see CategoriesController::postEdit() method saves the data- * @param int $categoryId+ *+ * @param int $categoryId+ ** @since [v1.0]*/- public function edit(Category $category) : RedirectResponse | View+ public function edit(Category $category): RedirectResponse|View{$this->authorize('update', Category::class);+return view('categories/edit')->with('item', $category)- ->with('category_types', Helper::categoryTypeList());+ ->with('category_types', Helper::categoryTypeList());}/*** Validates and stores the updated category data.** @author [A. Gianotto] [<[email protected]>]+ ** @see CategoriesController::getEdit() method that makes the form.- * @param ImageUploadRequest $request- * @param int $categoryId+ *+ * @param int $categoryId+ ** @since [v1.0]*/- public function update(ImageUploadRequest $request, Category $category) : RedirectResponse+ public function update(ImageUploadRequest $request, Category $category): RedirectResponse{$this->authorize('update', Category::class);$category->name = $request->input('name');@@ -123,7 +124,7 @@ class CategoriesController extends Controllerif (($request->filled('category_type') && ($category->itemCount() > 0))) {$request->validate(['category_type' => 'in:'.$category->category_type]);}-+$category->category_type = $request->input('category_type', $category->category_type);$category->fill($request->all());@@ -133,7 +134,7 @@ class CategoriesController extends Controller$category->require_acceptance = $request->input('require_acceptance', '0');$category->alert_on_response = $request->input('alert_on_response', '0');$category->checkin_email = $request->input('checkin_email', '0');- $category->tag_color = $request->input('tag_color');+ $category->tag_color = $request->input('tag_color');$category->notes = $request->input('notes');$category = $request->handleImages($category);@@ -142,6 +143,7 @@ class CategoriesController extends Controller// Redirect to the new category pagereturn redirect()->route('categories.index')->with('success', trans('admin/categories/message.update.success'));}+// The given data did not pass validationreturn redirect()->back()->withInput()->withErrors($category->getErrors());}@@ -150,8 +152,10 @@ class CategoriesController extends Controller* Validates and marks a category as deleted.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param int $categoryId+ *+ * @param int $categoryId*/public function destroy(Category $category): RedirectResponse{@@ -162,6 +166,7 @@ class CategoriesController extends Controllerreturn redirect()->route('categories.index')->with('error', trans('general.bulk_delete_associations.general_assoc_warning', ['item' => trans('general.category')]));} catch (\Exception $e) {report($e);+return redirect()->route('categories.index')->with('error', trans('admin/categories/message.delete.error'));}@@ -173,27 +178,30 @@ class CategoriesController extends Controller* the content for the categories detail view, which is generated in getDataView.** @author [A. Gianotto] [<[email protected]>]+ ** @see CategoriesController::getDataView() method that generates the JSON response- * @param $id+ *+ * @param $id+ ** @since [v1.8]*/- public function show(Category $category) : View | RedirectResponse+ public function show(Category $category): View|RedirectResponse{$this->authorize('view', Category::class);- if ($category->category_type == 'asset') {- $category_type = 'hardware';- $category_type_route = 'assets';- } elseif ($category->category_type == 'accessory') {- $category_type = 'accessories';- $category_type_route = 'accessories';- } else {- $category_type = $category->category_type;- $category_type_route = $category->category_type.'s';- }-- return view('categories/view', compact('category'))- ->with('category_type', $category_type)- ->with('category_type_route', $category_type_route);+ if ($category->category_type == 'asset') {+ $category_type = 'hardware';+ $category_type_route = 'assets';+ } elseif ($category->category_type == 'accessory') {+ $category_type = 'accessories';+ $category_type_route = 'accessories';+ } else {+ $category_type = $category->category_type;+ $category_type_route = $category->category_type.'s';+ }++ return view('categories/view', compact('category'))+ ->with('category_type', $category_type)+ ->with('category_type_route', $category_type_route);}}diff --git a/app/Http/Controllers/CheckInOutRequest.php b/app/Http/Controllers/CheckInOutRequest.phpindex 6ab327fff8..a4cf0fae34 100644--- a/app/Http/Controllers/CheckInOutRequest.php+++ b/app/Http/Controllers/CheckInOutRequest.php@@ -12,7 +12,7 @@ trait CheckInOutRequest/*** Find target for checkout*/- protected function determineCheckoutTarget() : ?SnipeModel+ protected function determineCheckoutTarget(): ?SnipeModel{// This item is checked out to a locationswitch (request('checkout_to_type')) {@@ -29,11 +29,12 @@ trait CheckInOutRequest/*** Update the location of the asset passed in.- * @param Asset $asset Asset being updated- * @param SnipeModel $target Target with location- * @return Asset Asset being updated+ *+ * @param Asset $asset Asset being updated+ * @param SnipeModel $target Target with location+ * @return Asset Asset being updated*/- protected function updateAssetLocation($asset, $target) : Asset+ protected function updateAssetLocation($asset, $target): Asset{switch (request('checkout_to_type')) {case 'location':@@ -49,8 +50,8 @@ trait CheckInOutRequest}break;case 'user':- $asset->location_id = $target->location_id;- break;+ $asset->location_id = $target->location_id;+ break;}return $asset;diff --git a/app/Http/Controllers/CompaniesController.php b/app/Http/Controllers/CompaniesController.phpindex bcf1950713..fa4dd47922 100644--- a/app/Http/Controllers/CompaniesController.php+++ b/app/Http/Controllers/CompaniesController.php@@ -4,11 +4,11 @@ namespace App\Http\Controllers;use App\Http\Requests\ImageUploadRequest;use App\Models\Company;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;-use Illuminate\Support\Facades\Storage;use Illuminate\Support\Facades\Log;-use Illuminate\Http\RedirectResponse;-use \Illuminate\Contracts\View\View;+use Illuminate\Support\Facades\Storage;/*** This controller handles all actions related to Companies for@@ -22,9 +22,10 @@ final class CompaniesController extends Controller* Returns view to display listing of companies.** @author [Abdullah Alansari] [<[email protected]>]+ ** @since [v1.8]*/- public function index() : View+ public function index(): View{$this->authorize('view', Company::class);@@ -35,9 +36,10 @@ final class CompaniesController extends Controller* Returns view to create a new company.** @author [Abdullah Alansari] [<[email protected]>]+ ** @since [v1.8]*/- public function create() : View+ public function create(): View{$this->authorize('create', Company::class);@@ -48,10 +50,12 @@ final class CompaniesController extends Controller* Save data from new company form.** @author [Abdullah Alansari] [<[email protected]>]+ ** @since [v1.8]- * @param Request $request+ *+ * @param Request $request*/- public function store(ImageUploadRequest $request) : RedirectResponse+ public function store(ImageUploadRequest $request): RedirectResponse{$this->authorize('create', Company::class);@@ -78,12 +82,15 @@ final class CompaniesController extends Controller* Return form to edit existing company.** @author [Abdullah Alansari] [<[email protected]>]+ ** @since [v1.8]- * @param int $companyId+ *+ * @param int $companyId*/- public function edit(Company $company) : View | RedirectResponse+ public function edit(Company $company): View|RedirectResponse{$this->authorize('update', $company);+return view('companies/edit')->with('item', $company);}@@ -91,11 +98,12 @@ final class CompaniesController extends Controller* Save data from edit company form.** @author [Abdullah Alansari] [<[email protected]>]+ ** @since [v1.8]- * @param ImageUploadRequest $request- * @param int $companyId+ *+ * @param int $companyId*/- public function update(ImageUploadRequest $request, Company $company) : RedirectResponse+ public function update(ImageUploadRequest $request, Company $company): RedirectResponse{$this->authorize('update', $company);@@ -120,10 +128,12 @@ final class CompaniesController extends Controller* Delete company** @author [Abdullah Alansari] [<[email protected]>]+ ** @since [v1.8]- * @param int $companyId+ *+ * @param int $companyId*/- public function destroy($companyId) : RedirectResponse+ public function destroy($companyId): RedirectResponse{if (is_null($company = Company::find($companyId))) {@@ -131,11 +141,10 @@ final class CompaniesController extends Controller->with('error', trans('admin/companies/message.not_found'));}-$this->authorize('delete', $company);if (! $company->isDeletable()) {return redirect()->route('companies.index')- ->with('error', trans('admin/companies/message.assoc_users'));+ ->with('error', trans('admin/companies/message.assoc_users'));}if ($company->image) {@@ -152,9 +161,10 @@ final class CompaniesController extends Controller->with('success', trans('admin/companies/message.delete.success'));}- public function show(Company $company) : View | RedirectResponse+ public function show(Company $company): View|RedirectResponse{$this->authorize('view', Company::class);+return view('companies/view')->with('company', $company);}}diff --git a/app/Http/Controllers/Components/ComponentCheckinController.php b/app/Http/Controllers/Components/ComponentCheckinController.phpindex f501552466..019c6343b8 100644--- a/app/Http/Controllers/Components/ComponentCheckinController.php+++ b/app/Http/Controllers/Components/ComponentCheckinController.php@@ -3,14 +3,15 @@namespace App\Http\Controllers\Components;use App\Events\CheckoutableCheckedIn;-use App\Events\ComponentCheckedIn;use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Models\Asset;use App\Models\Component;+use Illuminate\Auth\Access\AuthorizationException;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;use Illuminate\Support\Carbon;-use Illuminate\Support\Facades\Auth;use Illuminate\Support\Facades\DB;use Illuminate\Support\Facades\Validator;@@ -20,11 +21,13 @@ class ComponentCheckinController extends Controller* Returns a view that allows the checkin of a component from an asset.** @author [A. Gianotto] [<[email protected]>]+ ** @see ComponentCheckinController::store() method that stores the data.* @since [v4.1.4]- * @param $component_asset_id- * @return \Illuminate\Contracts\View\View- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return View+ *+ * @throws AuthorizationException*/public function create($component_asset_id){@@ -50,12 +53,13 @@ class ComponentCheckinController extends Controller* Validate and store checkin data.** @author [A. Gianotto] [<[email protected]>]+ ** @see ComponentCheckinController::create() method that returns the form.* @since [v4.1.4]- * @param Request $request- * @param $component_asset_id- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return RedirectResponse+ *+ * @throws AuthorizationException*/public function store(Request $request, $component_asset_id, $backto = null){diff --git a/app/Http/Controllers/Components/ComponentCheckoutController.php b/app/Http/Controllers/Components/ComponentCheckoutController.phpindex 841bcf0b4a..ebb06f959f 100644--- a/app/Http/Controllers/Components/ComponentCheckoutController.php+++ b/app/Http/Controllers/Components/ComponentCheckoutController.php@@ -3,15 +3,15 @@namespace App\Http\Controllers\Components;use App\Events\CheckoutableCheckedOut;-use App\Events\ComponentCheckedOut;use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Models\Asset;use App\Models\Component;use App\Models\Setting;+use Illuminate\Auth\Access\AuthorizationException;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;-use Illuminate\Support\Facades\Auth;-use Illuminate\Support\Facades\Input;use Illuminate\Support\Facades\Validator;class ComponentCheckoutController extends Controller@@ -20,11 +20,14 @@ class ComponentCheckoutController extends Controller* Returns a view that allows the checkout of a component to an asset.** @author [A. Gianotto] [<[email protected]>]+ ** @see ComponentCheckoutController::store() method that stores the data.* @since [v3.0]- * @param int $id- * @return \Illuminate\Contracts\View\View- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param int $id+ * @return View+ *+ * @throws AuthorizationException*/public function create($id){@@ -37,7 +40,7 @@ class ComponentCheckoutController extends Controllerif ($component->category) {// Make sure there is at least one available to checkout- if ($component->numRemaining() <= 0){+ if ($component->numRemaining() <= 0) {return redirect()->route('components.index')->with('error', trans('admin/components/message.checkout.unavailable'));}@@ -60,17 +63,19 @@ class ComponentCheckoutController extends Controller* Validate and store checkout data.** @author [A. Gianotto] [<[email protected]>]+ ** @see ComponentCheckoutController::create() method that returns the form.* @since [v3.0]- * @param Request $request- * @param int $componentId- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param int $componentId+ * @return RedirectResponse+ *+ * @throws AuthorizationException*/public function store(Request $request, $componentId){// Check if the component exists- if (!$component = Component::find($componentId)) {+ if (! $component = Component::find($componentId)) {// Redirect to the component management page with errorreturn redirect()->route('components.index')->with('error', trans('admin/components/message.not_found'));}@@ -85,8 +90,8 @@ class ComponentCheckoutController extends Controller}$validator = Validator::make($request->all(), [- 'asset_id' => 'required|exists:assets,id',- 'assigned_qty' => "required|numeric|min:1|digits_between:1,$max_to_checkout",+ 'asset_id' => 'required|exists:assets,id',+ 'assigned_qty' => "required|numeric|min:1|digits_between:1,$max_to_checkout",]);if ($validator->fails()) {diff --git a/app/Http/Controllers/Components/ComponentsController.php b/app/Http/Controllers/Components/ComponentsController.phpindex eecc156c25..cd5ec0b738 100644--- a/app/Http/Controllers/Components/ComponentsController.php+++ b/app/Http/Controllers/Components/ComponentsController.php@@ -2,16 +2,17 @@namespace App\Http\Controllers\Components;+use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Http\Requests\ImageUploadRequest;use App\Models\Company;use App\Models\Component;-use App\Helpers\Helper;+use Illuminate\Auth\Access\AuthorizationException;use Illuminate\Contracts\View\View;use Illuminate\Http\RedirectResponse;+use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Storage;use Illuminate\Support\Facades\Validator;-use Illuminate\Support\Facades\Log;/*** This class controls all actions related to Components for@@ -26,10 +27,13 @@ class ComponentsController extends Controller* the content for the components listing, which is generated in getDatatable.** @author [A. Gianotto] [<[email protected]>]+ ** @see ComponentsController::getDatatable() method that generates the JSON response* @since [v3.0]- * @return \Illuminate\Contracts\View\View- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return View+ *+ * @throws AuthorizationException*/public function index(){@@ -38,15 +42,17 @@ class ComponentsController extends Controllerreturn view('components/index');}-/*** Returns a form to create a new component.** @author [A. Gianotto] [<[email protected]>]+ ** @see ComponentsController::postCreate() method that stores the data* @since [v3.0]- * @return \Illuminate\Contracts\View\View- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return View+ *+ * @throws AuthorizationException*/public function create(){@@ -60,41 +66,42 @@ class ComponentsController extends Controller* Validate and store data for new component.** @author [A. Gianotto] [<[email protected]>]+ ** @see ComponentsController::getCreate() method that generates the view* @since [v3.0]- * @param ImageUploadRequest $request- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return RedirectResponse+ *+ * @throws AuthorizationException*/public function store(ImageUploadRequest $request){$this->authorize('create', Component::class);- $component = new Component();- $component->name = $request->input('name');- $component->category_id = $request->input('category_id');- $component->supplier_id = $request->input('supplier_id');- $component->manufacturer_id = $request->input('manufacturer_id');- $component->model_number = $request->input('model_number');- $component->location_id = $request->input('location_id');- $component->company_id = Company::getIdForCurrentUser($request->input('company_id'));- $component->order_number = $request->input('order_number', null);- $component->min_amt = $request->input('min_amt', null);- $component->serial = $request->input('serial', null);- $component->purchase_date = $request->input('purchase_date', null);- $component->purchase_cost = $request->input('purchase_cost', null);- $component->qty = $request->input('qty');- $component->created_by = auth()->id();- $component->notes = $request->input('notes');+ $component = new Component;+ $component->name = $request->input('name');+ $component->category_id = $request->input('category_id');+ $component->supplier_id = $request->input('supplier_id');+ $component->manufacturer_id = $request->input('manufacturer_id');+ $component->model_number = $request->input('model_number');+ $component->location_id = $request->input('location_id');+ $component->company_id = Company::getIdForCurrentUser($request->input('company_id'));+ $component->order_number = $request->input('order_number', null);+ $component->min_amt = $request->input('min_amt', null);+ $component->serial = $request->input('serial', null);+ $component->purchase_date = $request->input('purchase_date', null);+ $component->purchase_cost = $request->input('purchase_cost', null);+ $component->qty = $request->input('qty');+ $component->created_by = auth()->id();+ $component->notes = $request->input('notes');$component = $request->handleImages($component);- if($request->input('redirect_option') === 'back'){+ if ($request->input('redirect_option') === 'back') {session()->put(['redirect_option' => 'index']);} else {session()->put(['redirect_option' => $request->input('redirect_option')]);}-if ($component->save()) {return Helper::getRedirectOption($request, $component->id, 'Components')->with('success', trans('admin/components/message.create.success'));@@ -107,32 +114,38 @@ class ComponentsController extends Controller* Return a view to edit a component.** @author [A. Gianotto] [<[email protected]>]+ ** @see ComponentsController::postEdit() method that stores the data.* @since [v3.0]- * @param int $componentId- * @return \Illuminate\Contracts\View\View- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param int $componentId+ * @return View+ *+ * @throws AuthorizationException*/public function edit(Component $component){- $this->authorize('update', $component);- session()->put('url.intended', url()->previous());- return view('components/edit')- ->with('item', $component)- ->with('category_type', 'component');- }+ $this->authorize('update', $component);+ session()->put('url.intended', url()->previous());+ return view('components/edit')+ ->with('item', $component)+ ->with('category_type', 'component');+ }/*** Return a view to edit a component.** @author [A. Gianotto] [<[email protected]>]+ ** @see ComponentsController::getEdit() method presents the form.- * @param ImageUploadRequest $request- * @param int $componentId- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param int $componentId+ * @return RedirectResponse+ *+ * @throws AuthorizationException+ ** @since [v3.0]*/public function update(ImageUploadRequest $request, Component $component)@@ -151,20 +164,20 @@ class ComponentsController extends Controller$this->authorize('update', $component);// Update the component data- $component->name = $request->input('name');- $component->category_id = $request->input('category_id');- $component->supplier_id = $request->input('supplier_id');- $component->manufacturer_id = $request->input('manufacturer_id');- $component->model_number = $request->input('model_number');- $component->location_id = $request->input('location_id');- $component->company_id = Company::getIdForCurrentUser($request->input('company_id'));- $component->order_number = $request->input('order_number');- $component->min_amt = $request->input('min_amt');- $component->serial = $request->input('serial');- $component->purchase_date = $request->input('purchase_date');- $component->purchase_cost = request('purchase_cost');- $component->qty = $request->input('qty');- $component->notes = $request->input('notes');+ $component->name = $request->input('name');+ $component->category_id = $request->input('category_id');+ $component->supplier_id = $request->input('supplier_id');+ $component->manufacturer_id = $request->input('manufacturer_id');+ $component->model_number = $request->input('model_number');+ $component->location_id = $request->input('location_id');+ $component->company_id = Company::getIdForCurrentUser($request->input('company_id'));+ $component->order_number = $request->input('order_number');+ $component->min_amt = $request->input('min_amt');+ $component->serial = $request->input('serial');+ $component->purchase_date = $request->input('purchase_date');+ $component->purchase_cost = request('purchase_cost');+ $component->qty = $request->input('qty');+ $component->notes = $request->input('notes');$component = $request->handleImages($component);@@ -182,10 +195,13 @@ class ComponentsController extends Controller* Delete a component.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v3.0]- * @param int $componentId- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param int $componentId+ * @return RedirectResponse+ *+ * @throws AuthorizationException*/public function destroy($componentId){@@ -196,7 +212,7 @@ class ComponentsController extends Controller$this->authorize('delete', $component);// Remove the image if one exists- if ($component->image && Storage::disk('public')->exists('components/' . $component->image)) {+ if ($component->image && Storage::disk('public')->exists('components/'.$component->image)) {try {Storage::disk('public')->delete('components/'.$component->image);} catch (\Exception $e) {@@ -217,19 +233,23 @@ class ComponentsController extends Controller* Return a view to display component information.** @author [A. Gianotto] [<[email protected]>]+ ** @see ComponentsController::getDataView() method that generates the JSON response* @since [v3.0]- * @param int $componentId- * @return \Illuminate\Contracts\View\View- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param int $componentId+ * @return View+ *+ * @throws AuthorizationException*/public function show(Component $component){- $this->authorize('view', $component);- return view('components/view', compact('component'))->with('snipe_component', $component);+ $this->authorize('view', $component);++ return view('components/view', compact('component'))->with('snipe_component', $component);}- public function getClone(Component $component) : View | RedirectResponse+ public function getClone(Component $component): View|RedirectResponse{$this->authorize('create', Component::class);diff --git a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php b/app/Http/Controllers/Consumables/ConsumableCheckoutController.phpindex 9074faade6..dd1115ef53 100644--- a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php+++ b/app/Http/Controllers/Consumables/ConsumableCheckoutController.php@@ -7,9 +7,10 @@ use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Models\Consumable;use App\Models\User;+use Illuminate\Auth\Access\AuthorizationException;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;-use \Illuminate\Contracts\View\View;-use \Illuminate\Http\RedirectResponse;class ConsumableCheckoutController extends Controller{@@ -17,11 +18,13 @@ class ConsumableCheckoutController extends Controller* Return a view to checkout a consumable to a user.** @author [A. Gianotto] [<[email protected]>]+ ** @see ConsumableCheckoutController::store() method that stores the data.* @since [v1.0]- * @param int $id+ *+ * @param int $id*/- public function create($id) : View | RedirectResponse+ public function create($id): View|RedirectResponse{if ($consumable = Consumable::find($id)) {@@ -32,7 +35,7 @@ class ConsumableCheckoutController extends Controllerif ($consumable->category) {// Make sure there is at least one available to checkout- if ($consumable->numRemaining() <= 0){+ if ($consumable->numRemaining() <= 0) {return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.checkout.unavailable', ['requested' => 1, 'remaining' => $consumable->numRemaining()]));}@@ -55,11 +58,14 @@ class ConsumableCheckoutController extends Controller* Saves the checkout information** @author [A. Gianotto] [<[email protected]>]+ ** @see ConsumableCheckoutController::create() method that returns the form.* @since [v1.0]- * @param int $consumableId- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param int $consumableId+ * @return RedirectResponse+ *+ * @throws AuthorizationException*/public function store(Request $request, $consumableId){@@ -71,13 +77,13 @@ class ConsumableCheckoutController extends Controller// If the quantity is not present in the request or is not a positive integer, set it to 1$quantity = $request->input('checkout_qty');- if (!isset($quantity) || !ctype_digit((string)$quantity) || $quantity <= 0) {+ if (! isset($quantity) || ! ctype_digit((string) $quantity) || $quantity <= 0) {$quantity = 1;}// Make sure there is at least one available to checkoutif ($consumable->numRemaining() <= 0 || $quantity > $consumable->numRemaining()) {- return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.checkout.unavailable', ['requested' => $quantity, 'remaining' => $consumable->numRemaining() ]));+ return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.checkout.unavailable', ['requested' => $quantity, 'remaining' => $consumable->numRemaining()]));}$admin_user = auth()->user();@@ -92,13 +98,13 @@ class ConsumableCheckoutController extends Controller// Update the consumable data$consumable->assigned_to = e($request->input('assigned_to'));- for ($i = 0; $i < $quantity; $i++){- $consumable->users()->attach($consumable->id, [- 'consumable_id' => $consumable->id,- 'created_by' => $admin_user->id,- 'assigned_to' => e($request->input('assigned_to')),- 'note' => $request->input('note'),- ]);+ for ($i = 0; $i < $quantity; $i++) {+ $consumable->users()->attach($consumable->id, [+ 'consumable_id' => $consumable->id,+ 'created_by' => $admin_user->id,+ 'assigned_to' => e($request->input('assigned_to')),+ 'note' => $request->input('note'),+ ]);}$consumable->checkout_qty = $quantity;@@ -117,7 +123,6 @@ class ConsumableCheckoutController extends Controllersession()->put(['redirect_option' => $request->input('redirect_option'), 'checkout_to_type' => $request->input('checkout_to_type')]);-// Redirect to the new consumable pagereturn Helper::getRedirectOption($request, $consumable->id, 'Consumables')->with('success', trans('admin/consumables/message.checkout.success'));diff --git a/app/Http/Controllers/Consumables/ConsumablesController.php b/app/Http/Controllers/Consumables/ConsumablesController.phpindex 993a30c458..2db53464d9 100644--- a/app/Http/Controllers/Consumables/ConsumablesController.php+++ b/app/Http/Controllers/Consumables/ConsumablesController.php@@ -5,13 +5,14 @@ namespace App\Http\Controllers\Consumables;use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Http\Requests\ImageUploadRequest;+use App\Http\Requests\StoreConsumableRequest;use App\Models\Company;use App\Models\Consumable;+use Illuminate\Auth\Access\AuthorizationException;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;use Illuminate\Support\Facades\Storage;use Illuminate\Support\Facades\Validator;-use Illuminate\Http\RedirectResponse;-use \Illuminate\Contracts\View\View;-use App\Http\Requests\StoreConsumableRequest;/*** This controller handles all actions related to Consumables for@@ -25,10 +26,13 @@ class ConsumablesController extends Controller* Return a view to display component information.** @author [A. Gianotto] [<[email protected]>]+ ** @see ConsumablesController::getDatatable() method that generates the JSON response* @since [v1.0]- * @return \Illuminate\Contracts\View\View- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return View+ *+ * @throws AuthorizationException*/public function index(){@@ -41,10 +45,13 @@ class ConsumablesController extends Controller* Return a view to display the form view to create a new consumable** @author [A. Gianotto] [<[email protected]>]+ ** @see ConsumablesController::postCreate() method that stores the form data* @since [v1.0]- * @return \Illuminate\Contracts\View\View- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return View+ *+ * @throws AuthorizationException*/public function create(){@@ -58,32 +65,34 @@ class ConsumablesController extends Controller* Validate and store new consumable data.** @author [A. Gianotto] [<[email protected]>]+ ** @see ConsumablesController::getCreate() method that returns the form view* @since [v1.0]- * @param ImageUploadRequest $request- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param ImageUploadRequest $request+ * @return RedirectResponse+ *+ * @throws AuthorizationException*/public function store(StoreConsumableRequest $request){$this->authorize('create', Consumable::class);- $consumable = new Consumable();- $consumable->name = $request->input('name');- $consumable->category_id = $request->input('category_id');- $consumable->supplier_id = $request->input('supplier_id');- $consumable->location_id = $request->input('location_id');- $consumable->company_id = Company::getIdForCurrentUser($request->input('company_id'));- $consumable->order_number = $request->input('order_number');- $consumable->min_amt = $request->input('min_amt');- $consumable->manufacturer_id = $request->input('manufacturer_id');- $consumable->model_number = $request->input('model_number');- $consumable->item_no = $request->input('item_no');- $consumable->purchase_date = $request->input('purchase_date');- $consumable->purchase_cost = $request->input('purchase_cost');- $consumable->qty = $request->input('qty');- $consumable->created_by = auth()->id();- $consumable->notes = $request->input('notes');-+ $consumable = new Consumable;+ $consumable->name = $request->input('name');+ $consumable->category_id = $request->input('category_id');+ $consumable->supplier_id = $request->input('supplier_id');+ $consumable->location_id = $request->input('location_id');+ $consumable->company_id = Company::getIdForCurrentUser($request->input('company_id'));+ $consumable->order_number = $request->input('order_number');+ $consumable->min_amt = $request->input('min_amt');+ $consumable->manufacturer_id = $request->input('manufacturer_id');+ $consumable->model_number = $request->input('model_number');+ $consumable->item_no = $request->input('item_no');+ $consumable->purchase_date = $request->input('purchase_date');+ $consumable->purchase_cost = $request->input('purchase_cost');+ $consumable->qty = $request->input('qty');+ $consumable->created_by = auth()->id();+ $consumable->notes = $request->input('notes');if ($request->has('use_cloned_image')) {$cloned_model_img = Consumable::select('image')->find($request->input('clone_image_from_id'));@@ -98,13 +107,12 @@ class ConsumablesController extends Controller$consumable = $request->handleImages($consumable);}- if($request->input('redirect_option') === 'back'){+ if ($request->input('redirect_option') === 'back') {session()->put(['redirect_option' => 'index']);} else {session()->put(['redirect_option' => $request->input('redirect_option')]);}-if ($consumable->save()) {return Helper::getRedirectOption($request, $consumable->id, 'Consumables')->with('success', trans('admin/consumables/message.create.success'));@@ -117,17 +125,20 @@ class ConsumablesController extends Controller* Returns a form view to edit a consumable.** @author [A. Gianotto] [<[email protected]>]- * @param int $consumableId+ *+ * @param int $consumableId+ ** @see ConsumablesController::postEdit() method that stores the form data.* @since [v1.0]*/- public function edit(Consumable $consumable) : View | RedirectResponse+ public function edit(Consumable $consumable): View|RedirectResponse{- $this->authorize($consumable);- session()->put('url.intended', url()->previous());- return view('consumables/edit')- ->with('item', $consumable)- ->with('category_type', 'consumable');+ $this->authorize($consumable);+ session()->put('url.intended', url()->previous());++ return view('consumables/edit')+ ->with('item', $consumable)+ ->with('category_type', 'consumable');}@@ -135,10 +146,13 @@ class ConsumablesController extends Controller* Returns a form view to edit a consumable.** @author [A. Gianotto] [<[email protected]>]- * @param ImageUploadRequest $request- * @param int $consumableId- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param ImageUploadRequest $request+ * @param int $consumableId+ * @return RedirectResponse+ *+ * @throws AuthorizationException+ ** @see ConsumablesController::getEdit() method that stores the form data.* @since [v1.0]*/@@ -147,7 +161,7 @@ class ConsumablesController extends Controller$min = $consumable->numCheckedOut();$validator = Validator::make($request->all(), [- "qty" => "required|numeric|min:$min"+ 'qty' => "required|numeric|min:$min",]);if ($validator->fails()) {@@ -158,20 +172,20 @@ class ConsumablesController extends Controller$this->authorize($consumable);- $consumable->name = $request->input('name');- $consumable->category_id = $request->input('category_id');- $consumable->supplier_id = $request->input('supplier_id');- $consumable->location_id = $request->input('location_id');- $consumable->company_id = Company::getIdForCurrentUser($request->input('company_id'));- $consumable->order_number = $request->input('order_number');- $consumable->min_amt = $request->input('min_amt');- $consumable->manufacturer_id = $request->input('manufacturer_id');- $consumable->model_number = $request->input('model_number');- $consumable->item_no = $request->input('item_no');- $consumable->purchase_date = $request->input('purchase_date');- $consumable->purchase_cost = $request->input('purchase_cost');- $consumable->qty = Helper::ParseFloat($request->input('qty'));- $consumable->notes = $request->input('notes');+ $consumable->name = $request->input('name');+ $consumable->category_id = $request->input('category_id');+ $consumable->supplier_id = $request->input('supplier_id');+ $consumable->location_id = $request->input('location_id');+ $consumable->company_id = Company::getIdForCurrentUser($request->input('company_id'));+ $consumable->order_number = $request->input('order_number');+ $consumable->min_amt = $request->input('min_amt');+ $consumable->manufacturer_id = $request->input('manufacturer_id');+ $consumable->model_number = $request->input('model_number');+ $consumable->item_no = $request->input('item_no');+ $consumable->purchase_date = $request->input('purchase_date');+ $consumable->purchase_cost = $request->input('purchase_cost');+ $consumable->qty = Helper::ParseFloat($request->input('qty'));+ $consumable->notes = $request->input('notes');$consumable = $request->handleImages($consumable);@@ -189,10 +203,14 @@ class ConsumablesController extends Controller* Delete a consumable.** @author [A. Gianotto] [<[email protected]>]- * @param int $consumableId+ *+ * @param int $consumableId+ ** @since [v1.0]- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return RedirectResponse+ *+ * @throws AuthorizationException*/public function destroy($consumableId){@@ -202,6 +220,7 @@ class ConsumablesController extends Controller$this->authorize($consumable);$consumable->delete();+// Redirect to the locations management pagereturn redirect()->route('consumables.index')->with('success', trans('admin/consumables/message.delete.success'));}@@ -210,20 +229,24 @@ class ConsumablesController extends Controller* Return a view to display component information.** @author [A. Gianotto] [<[email protected]>]+ ** @see ConsumablesController::getDataView() method that generates the JSON response* @since [v1.0]- * @param int $consumableId- * @return \Illuminate\Contracts\View\View- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param int $consumableId+ * @return View+ *+ * @throws AuthorizationException*/public function show(Consumable $consumable){$consumable = Consumable::withCount('users as users_consumables')->find($consumable->id);$this->authorize($consumable);+return view('consumables/view', compact('consumable'));}- public function clone(Consumable $consumable) : View+ public function clone(Consumable $consumable): View{$this->authorize('create', $consumable);$consumable_to_close = $consumable;diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.phpindex 689292ef66..9ba25401f2 100644--- a/app/Http/Controllers/Controller.php+++ b/app/Http/Controllers/Controller.php@@ -1,4 +1,5 @@<?php+/*! \mainpage Snipe-IT Code Documentation** \section intro_sec Introduction@@ -43,7 +44,7 @@ abstract class Controller extends BaseController{use AuthorizesRequests, DisablesDebugbar, DispatchesJobs, ValidatesRequests;- static $map_object_type = [+ public static $map_object_type = ['accessories' => Accessory::class,'maintenances' => Maintenance::class,'assets' => Asset::class,@@ -58,7 +59,7 @@ abstract class Controller extends BaseController'users' => User::class,];- static $map_storage_path = [+ public static $map_storage_path = ['accessories' => 'private_uploads/accessories/','maintenances' => 'private_uploads/maintenances/','assets' => 'private_uploads/assets/',@@ -73,7 +74,7 @@ abstract class Controller extends BaseController'users' => 'private_uploads/users/',];- static $map_file_prefix= [+ public static $map_file_prefix = ['accessories' => 'accessory','maintenances' => 'maintenance','assets' => 'asset',diff --git a/app/Http/Controllers/CustomFieldsController.php b/app/Http/Controllers/CustomFieldsController.phpindex 58c5187b7e..93c8cd5177 100644--- a/app/Http/Controllers/CustomFieldsController.php+++ b/app/Http/Controllers/CustomFieldsController.php@@ -6,10 +6,10 @@ use App\Helpers\Helper;use App\Http\Requests\CustomFieldRequest;use App\Models\CustomField;use App\Models\CustomFieldset;-use Illuminate\Support\Facades\Auth;-use Illuminate\Http\Request;+use Illuminate\Auth\Access\AuthorizationException;+use Illuminate\Contracts\View\View;use Illuminate\Http\RedirectResponse;-use \Illuminate\Contracts\View\View;+use Illuminate\Http\Request;/*** This controller handles all actions related to Custom Asset Fields for@@ -17,7 +17,9 @@ use \Illuminate\Contracts\View\View;** @todo Improve documentation here.* @todo Check for raw DB queries and try to convert them to query builder statements+ ** @version v2.0+ ** @author [Brady Wetherington] [<[email protected]>]*/class CustomFieldsController extends Controller@@ -26,9 +28,10 @@ class CustomFieldsController extends Controller* Returns a view with a listing of custom fields.** @author [Brady Wetherington] [<[email protected]>]+ ** @since [v1.8]*/- public function index() : View+ public function index(): View{$this->authorize('view', CustomField::class);@@ -43,23 +46,26 @@ class CustomFieldsController extends Controller* We already show those details on the listing page.** @see CustomFieldsController::storeField()+ ** @author [A. Gianotto] [<[email protected]>]+ ** @since [v5.1.5]*/- public function show() : RedirectResponse+ public function show(): RedirectResponse{return redirect()->route('fields.index');}-/*** Returns a view with a form to create a new custom field.** @see CustomFieldsController::storeField()+ ** @author [Brady Wetherington] [<[email protected]>]+ ** @since [v1.8]*/- public function create(Request $request) : View+ public function create(Request $request): View{$this->authorize('create', CustomField::class);$fieldsets = CustomFieldset::get();@@ -68,7 +74,7 @@ class CustomFieldsController extends Controller'predefinedFormats' => Helper::predefined_formats(),'customFormat' => '','fieldsets' => $fieldsets,- 'field' => new CustomField(),+ 'field' => new CustomField,]);}@@ -76,41 +82,42 @@ class CustomFieldsController extends Controller* Validates and stores a new custom field.** @see CustomFieldsController::createField()+ ** @author [Brady Wetherington] [<[email protected]>]+ ** @since [v1.8]*/- public function store(CustomFieldRequest $request) : RedirectResponse+ public function store(CustomFieldRequest $request): RedirectResponse{$this->authorize('create', CustomField::class);- $show_in_email = $request->input("show_in_email", 0);- $display_in_user_view = $request->input("display_in_user_view", 0);+ $show_in_email = $request->input('show_in_email', 0);+ $display_in_user_view = $request->input('display_in_user_view', 0);// Override the display settings if the field is encrypted- if ($request->input("field_encrypted") == '1') {+ if ($request->input('field_encrypted') == '1') {$show_in_email = '0';$display_in_user_view = '0';}-+$field = new CustomField([- "name" => trim($request->input("name")),- "element" => $request->input("element"),- "help_text" => $request->input("help_text"),- "field_values" => $request->input("field_values"),- "field_encrypted" => $request->input("field_encrypted", 0),- "show_in_email" => $show_in_email,- "is_unique" => $request->input("is_unique", 0),- "display_in_user_view" => $display_in_user_view,- "auto_add_to_fieldsets" => $request->input("auto_add_to_fieldsets", 0),- "show_in_listview" => $request->input("show_in_listview", 0),- "show_in_requestable_list" => $request->input("show_in_requestable_list", 0),- "display_checkin" => $request->input("display_checkin", 0),- "display_checkout" => $request->input("display_checkout", 0),- "display_audit" => $request->input("display_audit", 0),- "created_by" => auth()->id()+ 'name' => trim($request->input('name')),+ 'element' => $request->input('element'),+ 'help_text' => $request->input('help_text'),+ 'field_values' => $request->input('field_values'),+ 'field_encrypted' => $request->input('field_encrypted', 0),+ 'show_in_email' => $show_in_email,+ 'is_unique' => $request->input('is_unique', 0),+ 'display_in_user_view' => $display_in_user_view,+ 'auto_add_to_fieldsets' => $request->input('auto_add_to_fieldsets', 0),+ 'show_in_listview' => $request->input('show_in_listview', 0),+ 'show_in_requestable_list' => $request->input('show_in_requestable_list', 0),+ 'display_checkin' => $request->input('display_checkin', 0),+ 'display_checkout' => $request->input('display_checkout', 0),+ 'display_audit' => $request->input('display_audit', 0),+ 'created_by' => auth()->id(),]);-if ($request->filled('custom_format')) {$field->format = $request->input('custom_format');} else {@@ -127,7 +134,6 @@ class CustomFieldsController extends Controller$field->fieldset()->sync([]);}-return redirect()->route('fields.index')->with('success', trans('admin/custom_fields/message.field.create.success'));}@@ -135,26 +141,26 @@ class CustomFieldsController extends Controller->with('error', trans('admin/custom_fields/message.field.create.error'));}-/*** Detach a custom field from a fieldset.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v3.0]*/- public function deleteFieldFromFieldset($field_id, $fieldset_id) : RedirectResponse+ public function deleteFieldFromFieldset($field_id, $fieldset_id): RedirectResponse{$this->authorize('update', CustomField::class);$field = CustomField::find($field_id);- // Check that the field exists - this is mostly related to the demo, where we- // rewrite the data every x minutes, so it's possible someone might be disassociating+ // Check that the field exists - this is mostly related to the demo, where we+ // rewrite the data every x minutes, so it's possible someone might be disassociating// a field from a fieldset just as we're wiping the databaseif (($field) && ($fieldset_id)) {- if ($field->fieldset()->detach($fieldset_id)) {- return redirect()->route('fieldsets.show', ['fieldset' => $fieldset_id])- ->with('success', trans('admin/custom_fields/message.field.delete.success'));+ if ($field->fieldset()->detach($fieldset_id)) {+ return redirect()->route('fieldsets.show', ['fieldset' => $fieldset_id])+ ->with('success', trans('admin/custom_fields/message.field.delete.success'));} else {return redirect()->back()->with('error', trans('admin/custom_fields/message.field.delete.error'))->withInput();@@ -163,16 +169,16 @@ class CustomFieldsController extends Controllerreturn redirect()->back()->with('error', trans('admin/custom_fields/message.field.delete.error'));-}/*** Delete a custom field.** @author [Brady Wetherington] [<[email protected]>]+ ** @since [v1.8]*/- public function destroy(CustomField $field) : RedirectResponse+ public function destroy(CustomField $field): RedirectResponse{$this->authorize('delete', CustomField::class);@@ -180,19 +186,21 @@ class CustomFieldsController extends Controllerreturn redirect()->back()->with('error', trans('admin/custom_fields/message.field.delete.in_use'));}$field->delete();- return redirect()->route("fields.index")- ->with("success", trans('admin/custom_fields/message.field.delete.success'));- }+ return redirect()->route('fields.index')+ ->with('success', trans('admin/custom_fields/message.field.delete.success'));+ }/*** Return a view to edit a custom field** @author [A. Gianotto] [<[email protected]>]- * @param int $id+ *+ * @param int $id+ ** @since [v4.0]*/- public function edit(Request $request, CustomField $field) : View | RedirectResponse+ public function edit(Request $request, CustomField $field): View|RedirectResponse{$this->authorize('update', CustomField::class);$fieldsets = CustomFieldset::get();@@ -202,52 +210,53 @@ class CustomFieldsController extends Controller}return view('custom_fields.fields.edit', [- 'field' => $field,- 'customFormat' => $customFormat,- 'fieldsets' => $fieldsets,+ 'field' => $field,+ 'customFormat' => $customFormat,+ 'fieldsets' => $fieldsets,'predefinedFormats' => Helper::predefined_formats(),]);}-/*** Store the updated field** @todo Allow encrypting/decrypting if encryption status changes** @author [A. Gianotto] [<[email protected]>]- * @param int $id+ *+ * @param int $id+ ** @since [v4.0]- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @throws AuthorizationException*/- public function update(CustomFieldRequest $request, CustomField $field) : RedirectResponse+ public function update(CustomFieldRequest $request, CustomField $field): RedirectResponse{$this->authorize('update', CustomField::class);- $show_in_email = $request->input("show_in_email", 0);- $display_in_user_view = $request->input("display_in_user_view", 0);+ $show_in_email = $request->input('show_in_email', 0);+ $display_in_user_view = $request->input('display_in_user_view', 0);// Override the display settings if the field is encrypted- if ($request->input("field_encrypted") == '1') {+ if ($request->input('field_encrypted') == '1') {$show_in_email = '0';$display_in_user_view = '0';}-- $field->name = trim($request->input("name"));- $field->element = $request->input("element");- $field->field_values = $request->input("field_values");- $field->created_by = auth()->id();- $field->help_text = $request->input("help_text");++ $field->name = trim($request->input('name'));+ $field->element = $request->input('element');+ $field->field_values = $request->input('field_values');+ $field->created_by = auth()->id();+ $field->help_text = $request->input('help_text');$field->show_in_email = $show_in_email;- $field->is_unique = $request->input("is_unique", 0);+ $field->is_unique = $request->input('is_unique', 0);$field->display_in_user_view = $display_in_user_view;- $field->auto_add_to_fieldsets = $request->input("auto_add_to_fieldsets", 0);- $field->show_in_listview = $request->input("show_in_listview", 0);- $field->show_in_requestable_list = $request->input("show_in_requestable_list", 0);- $field->display_checkin = $request->input("display_checkin", 0);- $field->display_checkout = $request->input("display_checkout", 0);- $field->display_audit = $request->input("display_audit", 0);+ $field->auto_add_to_fieldsets = $request->input('auto_add_to_fieldsets', 0);+ $field->show_in_listview = $request->input('show_in_listview', 0);+ $field->show_in_requestable_list = $request->input('show_in_requestable_list', 0);+ $field->display_checkin = $request->input('display_checkin', 0);+ $field->display_checkout = $request->input('display_checkout', 0);+ $field->display_audit = $request->input('display_audit', 0);if ($request->input('format') == 'CUSTOM REGEX') {$field->format = $request->input('custom_format');@@ -255,7 +264,7 @@ class CustomFieldsController extends Controller$field->format = $request->input('format');}- if ($field->element == 'checkbox' || $field->element == 'radio'){+ if ($field->element == 'checkbox' || $field->element == 'radio') {$field->format = 'ANY';}diff --git a/app/Http/Controllers/CustomFieldsetsController.php b/app/Http/Controllers/CustomFieldsetsController.phpindex c634d957f5..ee4f07d3f7 100644--- a/app/Http/Controllers/CustomFieldsetsController.php+++ b/app/Http/Controllers/CustomFieldsetsController.php@@ -5,10 +5,11 @@ namespace App\Http\Controllers;use App\Models\AssetModel;use App\Models\CustomField;use App\Models\CustomFieldset;+use Illuminate\Auth\Access\AuthorizationException;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;use Illuminate\Support\Facades\Validator;-use Illuminate\Http\RedirectResponse;-use \Illuminate\Contracts\View\View;/*** This controller handles all actions related to Custom Asset Fields for@@ -16,26 +17,29 @@ use \Illuminate\Contracts\View\View;** @todo Improve documentation here.* @todo Check for raw DB queries and try to convert them to query builder statements+ ** @version v2.0+ ** @author [Brady Wetherington] [<[email protected]>]*/class CustomFieldsetsController extends Controller{-- public function index() : RedirectResponse+ public function index(): RedirectResponse{- return redirect()->route("fields.index")- ->with("error", trans('admin/custom_fields/message.fieldset.does_not_exist'));+ return redirect()->route('fields.index')+ ->with('error', trans('admin/custom_fields/message.fieldset.does_not_exist'));}/*** Validates and stores a new custom field.** @author [Brady Wetherington] [<[email protected]>]- * @param int $id+ *+ * @param int $id+ ** @since [v1.8]*/- public function show(CustomFieldset $fieldset) : View | RedirectResponse+ public function show(CustomFieldset $fieldset): View|RedirectResponse{$cfset = CustomFieldset::with('fields')->where('id', '=', $fieldset->id)@@ -68,31 +72,32 @@ class CustomFieldsetsController extends Controller* Returns a view with a form for creating a new custom fieldset.** @author [Brady Wetherington] [<[email protected]>]+ ** @since [v1.8]*/- public function create() : View+ public function create(): View{$this->authorize('create', CustomField::class);- return view('custom_fields.fieldsets.view')->with('custom_fieldset', new CustomFieldset());+ return view('custom_fields.fieldsets.view')->with('custom_fieldset', new CustomFieldset);}/*** Validates and stores a new custom fieldset.** @author [Brady Wetherington] [<[email protected]>]+ ** @since [v1.8]- * @param Request $request- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @throws AuthorizationException*/- public function store(Request $request) : RedirectResponse+ public function store(Request $request): RedirectResponse{$this->authorize('create', CustomField::class);$fieldset = new CustomFieldset([- 'name' => $request->input('name'),- 'created_by' => auth()->id(),+ 'name' => $request->input('name'),+ 'created_by' => auth()->id(),]);$validator = Validator::make($request->all(), $fieldset->rules);@@ -121,12 +126,15 @@ class CustomFieldsetsController extends Controller* Presents edit form for fieldset** @author [A. Gianotto] [<[email protected]>]+ ** @param int $id+ ** @since [v6.0.14]*/- public function edit(CustomFieldset $fieldset) : View | RedirectResponse+ public function edit(CustomFieldset $fieldset): View|RedirectResponse{$this->authorize('create', CustomField::class);+return view('custom_fields.fieldsets.view')->with('custom_fieldset', $fieldset);}@@ -134,10 +142,12 @@ class CustomFieldsetsController extends Controller* Saves updated fieldset data** @author [A. Gianotto] [<[email protected]>]+ ** @param int $id+ ** @since [v6.0.14]*/- public function update(Request $request, CustomFieldset $fieldset) : RedirectResponse+ public function update(Request $request, CustomFieldset $fieldset): RedirectResponse{$this->authorize('create', CustomField::class);@@ -155,10 +165,12 @@ class CustomFieldsetsController extends Controller* Validates a custom fieldset and then deletes if it has no models associated.** @author [Brady Wetherington] [<[email protected]>]- * @param int $id+ *+ * @param int $id+ ** @since [v1.8]*/- public function destroy($id) : RedirectResponse+ public function destroy($id): RedirectResponse{$fieldset = CustomFieldset::find($id);@@ -182,9 +194,10 @@ class CustomFieldsetsController extends Controller* Associate the custom field with a custom fieldset.** @author [Brady Wetherington] [<[email protected]>]+ ** @since [v1.8]*/- public function associate(Request $request, $id) : RedirectResponse+ public function associate(Request $request, $id): RedirectResponse{$set = CustomFieldset::find($id);@@ -197,7 +210,7 @@ class CustomFieldsetsController extends Controller}}- $results = $set->fields()->attach($request->input('field_id'), ['required' => ($request->input('required') == 'on'), 'order' => (int)$request->input('order', 1)]);+ $results = $set->fields()->attach($request->input('field_id'), ['required' => ($request->input('required') == 'on'), 'order' => (int) $request->input('order', 1)]);return redirect()->route('fieldsets.show', [$id])->with('success', trans('admin/custom_fields/message.field.create.assoc_success'));}@@ -209,9 +222,10 @@ class CustomFieldsetsController extends Controller* Set the field in a fieldset to required** @author [A. Gianotto] [<[email protected]>]+ ** @since [v5.0]*/- public function makeFieldRequired($fieldset_id, $field_id) : RedirectResponse+ public function makeFieldRequired($fieldset_id, $field_id): RedirectResponse{$this->authorize('update', CustomField::class);$field = CustomField::findOrFail($field_id);@@ -227,9 +241,10 @@ class CustomFieldsetsController extends Controller* Set the field in a fieldset to optional** @author [A. Gianotto] [<[email protected]>]+ ** @since [v5.0]*/- public function makeFieldOptional($fieldset_id, $field_id) : RedirectResponse+ public function makeFieldOptional($fieldset_id, $field_id): RedirectResponse{$this->authorize('update', CustomField::class);$field = CustomField::findOrFail($field_id);diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.phpindex a2ccb62475..51f242efcb 100755--- a/app/Http/Controllers/DashboardController.php+++ b/app/Http/Controllers/DashboardController.php@@ -2,17 +2,23 @@namespace App\Http\Controllers;-use Illuminate\Support\Facades\Artisan;+use App\Models\Accessory;+use App\Models\Asset;+use App\Models\Company;+use App\Models\Component;+use App\Models\Consumable;+use App\Models\License;+use Illuminate\Contracts\View\View;use Illuminate\Http\RedirectResponse;-use \Illuminate\Contracts\View\View;+use Illuminate\Support\Facades\Artisan;use Illuminate\Support\Facades\Session;-/*** This controller handles all actions related to the Admin Dashboard* for the Snipe-IT Asset Management application.** @author A. Gianotto <[email protected]>+ ** @version v1.0*/class DashboardController extends Controller@@ -22,20 +28,21 @@ class DashboardController extends Controller* the user's checked-out assets.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]*/- public function index() : View | RedirectResponse+ public function index(): View|RedirectResponse{// Show the pageif (auth()->user()->hasAccess('admin')) {$asset_stats = null;- $counts['asset'] = \App\Models\Asset::count();- $counts['accessory'] = \App\Models\Accessory::count();- $counts['license'] = \App\Models\License::assetcount();- $counts['consumable'] = \App\Models\Consumable::count();- $counts['component'] = \App\Models\Component::count();- $counts['user'] = \App\Models\Company::scopeCompanyables(auth()->user())->count();+ $counts['asset'] = Asset::count();+ $counts['accessory'] = Accessory::count();+ $counts['license'] = License::assetcount();+ $counts['consumable'] = Consumable::count();+ $counts['component'] = Component::count();+ $counts['user'] = Company::scopeCompanyables(auth()->user())->count();$counts['grand_total'] = $counts['asset'] + $counts['accessory'] + $counts['license'] + $counts['consumable'];if ((! file_exists(storage_path().'/oauth-private.key')) || (! file_exists(storage_path().'/oauth-public.key'))) {diff --git a/app/Http/Controllers/DepartmentsController.php b/app/Http/Controllers/DepartmentsController.phpindex 618567d699..3d05755094 100644--- a/app/Http/Controllers/DepartmentsController.php+++ b/app/Http/Controllers/DepartmentsController.php@@ -3,13 +3,13 @@namespace App\Http\Controllers;use App\Http\Requests\ImageUploadRequest;-use App\Models\Department;use App\Models\Company;-use Illuminate\Http\Request;+use App\Models\Department;+use Illuminate\Contracts\View\View;use Illuminate\Http\RedirectResponse;-use \Illuminate\Contracts\View\View;-use Illuminate\Support\Facades\Storage;+use Illuminate\Http\Request;use Illuminate\Support\Facades\Log;+use Illuminate\Support\Facades\Storage;class DepartmentsController extends Controller{@@ -24,11 +24,11 @@ class DepartmentsController extends Controller* the content for the assets listing, which is generated in getDatatable.** @author [A. Gianotto] [<[email protected]>]+ ** @see AssetController::getDatatable() method that generates the JSON response* @since [v4.0]- * @param Request $request*/- public function index(Request $request) : View+ public function index(Request $request): View{$this->authorize('index', Department::class);$company = null;@@ -43,10 +43,10 @@ class DepartmentsController extends Controller* Store a newly created resource in storage.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]- * @param ImageUploadRequest $request*/- public function store(ImageUploadRequest $request) : RedirectResponse+ public function store(ImageUploadRequest $request): RedirectResponse{$this->authorize('create', Department::class);$department = new Department;@@ -55,7 +55,7 @@ class DepartmentsController extends Controller$department->manager_id = ($request->filled('manager_id') ? $request->input('manager_id') : null);$department->location_id = ($request->filled('location_id') ? $request->input('location_id') : null);$department->company_id = ($request->filled('company_id') ? $request->input('company_id') : null);- $department->tag_color = $request->input('tag_color');+ $department->tag_color = $request->input('tag_color');$department->notes = $request->input('notes');$department = $request->handleImages($department);@@ -71,12 +71,15 @@ class DepartmentsController extends Controller* the content for the department detail page.** @author [A. Gianotto] [<[email protected]>]- * @param int $id+ *+ * @param int $id+ ** @since [v4.0]*/- public function show(Department $department) : View | RedirectResponse+ public function show(Department $department): View|RedirectResponse{$this->authorize('view', $department);+return view('departments/view', compact('department'));}@@ -84,10 +87,11 @@ class DepartmentsController extends Controller* Returns a form view used to create a new department.** @author [A. Gianotto] [<[email protected]>]+ ** @see DepartmentsController::postCreate() method that validates and stores the data* @since [v4.0]*/- public function create() : View+ public function create(): View{$this->authorize('create', Department::class);@@ -98,10 +102,12 @@ class DepartmentsController extends Controller* Validates and deletes selected department.** @author [A. Gianotto] [<[email protected]>]- * @param int $locationId+ *+ * @param int $locationId+ ** @since [v4.0]*/- public function destroy($id) : RedirectResponse+ public function destroy($id): RedirectResponse{if (is_null($department = Department::find($id))) {return redirect()->to(route('departments.index'))->with('error', trans('admin/departments/message.not_found'));@@ -129,13 +135,17 @@ class DepartmentsController extends Controller* Makes a form view to edit Department information.** @author [A. Gianotto] [<[email protected]>]+ ** @see LocationsController::postCreate() method that validates and stores- * @param int $departmentId+ *+ * @param int $departmentId+ ** @since [v1.0]*/- public function edit(Department $department) : View | RedirectResponse+ public function edit(Department $department): View|RedirectResponse{$this->authorize('update', $department);+return view('departments/edit')->with('item', $department);}@@ -143,11 +153,14 @@ class DepartmentsController extends Controller* Save updated Department information.** @author [A. Gianotto] [<[email protected]>]+ ** @see LocationsController::postCreate() method that validates and stores- * @param int $departmentId+ *+ * @param int $departmentId+ ** @since [v1.0]*/- public function update(ImageUploadRequest $request, Department $department) : RedirectResponse+ public function update(ImageUploadRequest $request, Department $department): RedirectResponse{$this->authorize('update', $department);@@ -158,7 +171,7 @@ class DepartmentsController extends Controller$department->company_id = ($request->filled('company_id') ? $request->input('company_id') : null);$department->phone = $request->input('phone');$department->fax = $request->input('fax');- $department->tag_color = $request->input('tag_color');+ $department->tag_color = $request->input('tag_color');$department->notes = $request->input('notes');$department = $request->handleImages($department);diff --git a/app/Http/Controllers/DepreciationsController.php b/app/Http/Controllers/DepreciationsController.phpindex 2c98e240b9..6ceec0048c 100755--- a/app/Http/Controllers/DepreciationsController.php+++ b/app/Http/Controllers/DepreciationsController.php@@ -3,10 +3,10 @@namespace App\Http\Controllers;use App\Models\Depreciation;-use Illuminate\Http\Request;-use Illuminate\Support\Facades\Auth;+use Illuminate\Contracts\View\View;use Illuminate\Http\RedirectResponse;-use \Illuminate\Contracts\View\View;+use Illuminate\Http\Request;+/*** This controller handles all actions related to Depreciations for* the Snipe-IT Asset Management application.@@ -20,12 +20,14 @@ class DepreciationsController extends Controller* the content for the depreciation listing, which is generated in getDatatable.** @author [A. Gianotto] [<[email protected]]+ ** @see DepreciationsController::getDatatable() method that generates the JSON response* @since [v1.0]*/- public function index() : View+ public function index(): View{$this->authorize('view', Depreciation::class);+return view('depreciations/index');}@@ -33,10 +35,11 @@ class DepreciationsController extends Controller* Returns a view that displays a form to create a new depreciation.** @author [A. Gianotto] [<[email protected]]+ ** @see DepreciationsController::postCreate()* @since [v1.0]*/- public function create() : View+ public function create(): View{$this->authorize('create', Depreciation::class);@@ -48,16 +51,16 @@ class DepreciationsController extends Controller* Validates and stores the new depreciation data.** @author [A. Gianotto] [<[email protected]]+ ** @see DepreciationsController::postCreate()* @since [v1.0]- * @param Request $request*/- public function store(Request $request) : RedirectResponse+ public function store(Request $request): RedirectResponse{$this->authorize('create', Depreciation::class);// create a new instance- $depreciation = new Depreciation();+ $depreciation = new Depreciation;// Depreciation data$depreciation->name = $request->input('name');$depreciation->months = $request->input('months');@@ -91,14 +94,18 @@ class DepreciationsController extends Controller* Returns a view that displays a form to update a depreciation.** @author [A. Gianotto] [<[email protected]]+ ** @see DepreciationsController::postEdit()- * @param int $depreciationId+ *+ * @param int $depreciationId+ ** @since [v1.0]*/- public function edit(Depreciation $depreciation) : RedirectResponse | View+ public function edit(Depreciation $depreciation): RedirectResponse|View{$this->authorize('update', $depreciation);+return view('depreciations/edit')->with('item', $depreciation);}@@ -106,17 +113,19 @@ class DepreciationsController extends Controller* Validates and stores the updated depreciation data.** @author [A. Gianotto] [<[email protected]]+ ** @see DepreciationsController::getEdit()- * @param Request $request- * @param int $depreciationId+ *+ * @param int $depreciationId+ ** @since [v1.0]*/- public function update(Request $request, Depreciation $depreciation) : RedirectResponse+ public function update(Request $request, Depreciation $depreciation): RedirectResponse{$this->authorize('update', $depreciation);- $depreciation->name = $request->input('name');- $depreciation->months = $request->input('months');+ $depreciation->name = $request->input('name');+ $depreciation->months = $request->input('months');$request->validate(['depreciation_min' => [@@ -148,10 +157,12 @@ class DepreciationsController extends Controller* This is a hard-delete. We do not currently soft-delete depreciations.** @author [A. Gianotto] [<[email protected]]+ ** @since [v1.0]- * @param int $depreciationId+ *+ * @param int $depreciationId*/- public function destroy($depreciationId) : RedirectResponse+ public function destroy($depreciationId): RedirectResponse{// Check if the depreciation existsif (is_null($depreciation = Depreciation::withCount('models as models_count')->find($depreciationId))) {@@ -166,6 +177,7 @@ class DepreciationsController extends Controller}$depreciation->delete();+// Redirect to the depreciations management pagereturn redirect()->route('depreciations.index')->with('success', trans('admin/depreciations/message.delete.success'));}@@ -174,11 +186,14 @@ class DepreciationsController extends Controller* Returns a view that displays a form to display depreciation listing** @author [A. Gianotto] [<[email protected]]+ ** @see DepreciationsController::postEdit()- * @param int $depreciationId+ *+ * @param int $depreciationId+ ** @since [v1.0]*/- public function show(Depreciation $depreciation) : View | RedirectResponse+ public function show(Depreciation $depreciation): View|RedirectResponse{$depreciation = Depreciation::withCount('assets as assets_count')->withCount('models as models_count')@@ -194,6 +209,5 @@ class DepreciationsController extends Controllerreturn redirect()->route('depreciations.index')->with('error', trans('admin/depreciations/message.does_not_exist'));-}}diff --git a/app/Http/Controllers/GoogleAuthController.php b/app/Http/Controllers/GoogleAuthController.phpindex d873491c5b..5082a69c84 100644--- a/app/Http/Controllers/GoogleAuthController.php+++ b/app/Http/Controllers/GoogleAuthController.php@@ -2,13 +2,13 @@namespace App\Http\Controllers;-use Illuminate\Http\RedirectResponse;+use App\Models\Setting;use App\Models\User;+use Illuminate\Http\RedirectResponse;use Illuminate\Support\Facades\Auth;+use Illuminate\Support\Facades\Log;use Laravel\Socialite\Facades\Socialite;use Laravel\Socialite\Two\InvalidStateException;-use App\Models\Setting;-use Illuminate\Support\Facades\Log;class GoogleAuthController extends Controller{@@ -30,38 +30,39 @@ class GoogleAuthController extends Controllerreturn Socialite::driver('google')->redirect();}- public function handleGoogleCallback() : RedirectResponse+ public function handleGoogleCallback(): RedirectResponse{try {$socialUser = Socialite::driver('google')->user();Log::debug('Google user found in Google Workspace');} catch (InvalidStateException $exception) {Log::debug('Google user NOT found in Google Workspace');+return redirect()->route('login')->withErrors(['username' => [- trans('auth/general.google_login_failed')+ trans('auth/general.google_login_failed'),],]);}-$user = User::where('username', $socialUser->getEmail())->first();-if ($user) {Log::debug('Google user '.$socialUser->getEmail().' found in Snipe-IT');$user->update([- 'avatar' => $socialUser->avatar,+ 'avatar' => $socialUser->avatar,]);Auth::login($user, true);+return redirect()->route('home');}Log::debug('Google user '.$socialUser->getEmail().' NOT found in Snipe-IT');+return redirect()->route('login')->withErrors([@@ -71,4 +72,4 @@ class GoogleAuthController extends Controller]);}-}\ No newline at end of file+}diff --git a/app/Http/Controllers/GroupsController.php b/app/Http/Controllers/GroupsController.phpindex 4b1affc848..2ce427d74c 100755--- a/app/Http/Controllers/GroupsController.php+++ b/app/Http/Controllers/GroupsController.php@@ -4,10 +4,10 @@ namespace App\Http\Controllers;use App\Helpers\Helper;use App\Models\Group;-use Illuminate\Http\Request;+use App\Models\User;+use Illuminate\Contracts\View\View;use Illuminate\Http\RedirectResponse;-use \Illuminate\Contracts\View\View;-use \App\Models\User;+use Illuminate\Http\Request;/*** This controller handles all actions related to User Groups for@@ -22,6 +22,7 @@ class GroupsController extends Controller* the content for the user group listing, which is generated in getDatatable.** @author [A. Gianotto] [<[email protected]]+ ** @see GroupsController::getDatatable() method that generates the JSON response* @since [v1.0]*/@@ -34,10 +35,11 @@ class GroupsController extends Controller* Returns a view that displays a form to create a new User Group.** @author [A. Gianotto] [<[email protected]]+ ** @see GroupsController::postCreate()* @since [v1.0]*/- public function create(Request $request) : View+ public function create(Request $request): View{$group = new Group;// Get all the available permissions@@ -68,13 +70,14 @@ class GroupsController extends Controller* Validates and stores the new User Group data.** @author [A. Gianotto] [<[email protected]]+ ** @see GroupsController::getCreate()* @since [v1.0]*/- public function store(Request $request) : RedirectResponse+ public function store(Request $request): RedirectResponse{// create a new group instance- $group = new Group();+ $group = new Group;$group->name = $request->input('name');if ($request->filled('permission')) {@@ -90,9 +93,10 @@ class GroupsController extends Controllerif ($group->save()) {if ($request->filled('users_to_sync')) {- $associated_users = explode(',',$request->input('users_to_sync'));+ $associated_users = explode(',', $request->input('users_to_sync'));$group->users()->sync($associated_users);}+return redirect()->route('groups.index')->with('success', trans('admin/groups/message.success.create'));}@@ -103,16 +107,19 @@ class GroupsController extends Controller* Returns a view that presents a form to edit a User Group.** @author [A. Gianotto] [<[email protected]]+ ** @see GroupsController::postEdit()- * @param int $id+ *+ * @param int $id+ ** @since [v1.0]*/- public function edit(Group $group) : View | RedirectResponse+ public function edit(Group $group): View|RedirectResponse{$permissions = config('permissions');$groupPermissions = $group->decodePermissions();- if ((!is_array($groupPermissions)) || (!$groupPermissions)) {+ if ((! is_array($groupPermissions)) || (! $groupPermissions)) {$groupPermissions = [];}@@ -150,11 +157,14 @@ class GroupsController extends Controller* Validates and stores the updated User Group data.** @author [A. Gianotto] [<[email protected]]+ ** @see GroupsController::getEdit()- * @param int $id+ *+ * @param int $id+ ** @since [v1.0]*/- public function update(Request $request, Group $group) : RedirectResponse+ public function update(Request $request, Group $group): RedirectResponse{$group->name = $request->input('name');@@ -166,12 +176,11 @@ class GroupsController extends Controller$group->notes = $request->input('notes');-if (! config('app.lock_passwords')) {if ($group->save()) {if ($request->has('users_to_sync')) {- $associated_users = explode(',',$request->input('users_to_sync'));+ $associated_users = explode(',', $request->input('users_to_sync'));$group->users()->sync($associated_users);}@@ -188,17 +197,21 @@ class GroupsController extends Controller* Validates and deletes the User Group.** @author [A. Gianotto] [<[email protected]]+ ** @see GroupsController::getEdit()- * @param int $id+ *+ * @param int $id+ ** @since [v1.0]*/- public function destroy($id) : RedirectResponse+ public function destroy($id): RedirectResponse{if (! config('app.lock_passwords')) {if (! $group = Group::find($id)) {return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', ['id' => $id]));}$group->delete();+return redirect()->route('groups.index')->with('success', trans('admin/groups/message.success.delete'));}@@ -210,11 +223,13 @@ class GroupsController extends Controller* the content for the group detail page.** @author [A. Gianotto] [<[email protected]>]- * @param $id+ *+ * @param $id+ ** @since [v4.0.11]*/- public function show(Group $group) : View | RedirectResponse+ public function show(Group $group): View|RedirectResponse{- return view('groups/view', compact('group'));+ return view('groups/view', compact('group'));}}diff --git a/app/Http/Controllers/HealthController.php b/app/Http/Controllers/HealthController.phpindex f3893df909..0747177216 100644--- a/app/Http/Controllers/HealthController.php+++ b/app/Http/Controllers/HealthController.php@@ -2,6 +2,7 @@namespace App\Http\Controllers;+use Illuminate\Http\JsonResponse;use Illuminate\Routing\Controller as BaseController;use Illuminate\Support\Facades\DB;@@ -11,18 +12,15 @@ use Illuminate\Support\Facades\DB;** @version v1.0*- * @return \Illuminate\Http\JsonResponse-+ * @return JsonResponse*/class HealthController extends BaseController{-public function __construct(){$this->middleware('health');}-/*** Returns a fixed JSON content ({ "status": "ok"}) which indicate the app is up and running*/@@ -42,24 +40,21 @@ class HealthController extends BaseController}-if (is_writable(storage_path('logs'))) {$filesystem_status = 'ok';} else {$filesystem_status = 'Could not write to storage/logs';}- if (($filesystem_status!='ok') || ($db_status!='ok')) {+ if (($filesystem_status != 'ok') || ($db_status != 'ok')) {return response()->json([- 'status' =>- [- 'database' => $db_status,- 'filesystem' => $filesystem_status,- ]+ 'status' => [+ 'database' => $db_status,+ 'filesystem' => $filesystem_status,+ ],], 500);}-return response()->json(['status' => 'ok',]);diff --git a/app/Http/Controllers/Kits/CheckoutKitController.php b/app/Http/Controllers/Kits/CheckoutKitController.phpindex e71bc99006..4cb247d0e2 100644--- a/app/Http/Controllers/Kits/CheckoutKitController.php+++ b/app/Http/Controllers/Kits/CheckoutKitController.php@@ -8,6 +8,8 @@ use App\Models\Asset;use App\Models\PredefinedKit;use App\Models\User;use App\Services\PredefinedKitCheckoutService;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;use Illuminate\Support\Arr;@@ -20,6 +22,7 @@ use Illuminate\Support\Arr;class CheckoutKitController extends Controller{public $kitService;+use CheckInOutRequest;public function __construct(PredefinedKitCheckoutService $kitService)@@ -31,11 +34,13 @@ class CheckoutKitController extends Controller* Show Bulk Checkout Page** @author [D. Minaev.] [<[email protected]>]- * @return \Illuminate\Contracts\View\View View to checkout+ *+ * @return View View to checkout*/public function showCheckout(PredefinedKit $kit){$this->authorize('checkout', Asset::class);+return view('kits/checkout')->with('kit', $kit);}@@ -43,7 +48,8 @@ class CheckoutKitController extends Controller* Validate and process the new Predefined Kit data.** @author [D. Minaev.] [<[email protected]>]- * @return \Illuminate\Http\RedirectResponse+ *+ * @return RedirectResponse*/public function store(Request $request, $kit_id){@@ -52,7 +58,7 @@ class CheckoutKitController extends Controllerreturn redirect()->back()->with('error', trans('admin/users/message.user_not_found'));}- $kit = new PredefinedKit();+ $kit = new PredefinedKit;$kit->id = $kit_id;$checkout_result = $this->kitService->checkout($request, $kit, $user);diff --git a/app/Http/Controllers/Kits/PredefinedKitsController.php b/app/Http/Controllers/Kits/PredefinedKitsController.phpindex 96e4ec4b0a..6c6be77124 100644--- a/app/Http/Controllers/Kits/PredefinedKitsController.php+++ b/app/Http/Controllers/Kits/PredefinedKitsController.php@@ -5,8 +5,9 @@ namespace App\Http\Controllers\Kits;use App\Http\Controllers\Controller;use App\Http\Requests\ImageUploadRequest;use App\Models\PredefinedKit;-use App\Models\PredefinedLicence;-use App\Models\PredefinedModel;+use Illuminate\Auth\Access\AuthorizationException;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;/**@@ -19,8 +20,10 @@ class PredefinedKitsController extends Controller{/*** @author [D. Minaev] [<[email protected]>]- * @return \Illuminate\Contracts\View\View- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return View+ *+ * @throws AuthorizationException*/public function index(){@@ -33,8 +36,10 @@ class PredefinedKitsController extends Controller* Returns a form view to create a new kit.** @author [D. Minaev] [<[email protected]>]- * @throws \Illuminate\Auth\Access\AuthorizationException+ ** @return mixed+ *+ * @throws AuthorizationException*/public function create(){@@ -47,7 +52,8 @@ class PredefinedKitsController extends Controller* Validate and process the new Predefined Kit data.** @author [D. Minaev] [<[email protected]>]- * @return \Illuminate\Http\RedirectResponse+ *+ * @return RedirectResponse*/public function store(ImageUploadRequest $request){@@ -72,18 +78,20 @@ class PredefinedKitsController extends Controller* Returns a view containing the Predefined Kit edit form.** @author [D. Minaev] [<[email protected]>]+ ** @since [v1.0]- * @param int $kit_id- * @return \Illuminate\Contracts\View\View+ *+ * @param int $kit_id+ * @return View*/public function edit(PredefinedKit $kit){$this->authorize('update', PredefinedKit::class);- return view('kits/edit')- ->with('item', $kit)- ->with('models', $kit->models)- ->with('licenses', $kit->licenses);+ return view('kits/edit')+ ->with('item', $kit)+ ->with('models', $kit->models)+ ->with('licenses', $kit->licenses);}@@ -92,9 +100,11 @@ class PredefinedKitsController extends Controller* Predefined Kit form based on the kit ID passed.** @author [D. Minaev] [<[email protected]>]+ ** @since [v1.0]- * @param int $kit_id- * @return \Illuminate\Http\RedirectResponse+ *+ * @param int $kit_id+ * @return RedirectResponse*/public function update(ImageUploadRequest $request, PredefinedKit $kit){@@ -113,9 +123,11 @@ class PredefinedKitsController extends Controller* Also delete all contained helping items** @author [D. Minaev] [<[email protected]>]+ ** @since [v1.0]- * @param int $kit_id- * @return \Illuminate\Http\RedirectResponse+ *+ * @param int $kit_id+ * @return RedirectResponse*/public function destroy($kit_id){@@ -141,9 +153,11 @@ class PredefinedKitsController extends Controller* Get the kit information to present to the kit view page** @author [D. Minaev] [<[email protected]>]+ ** @since [v1.0]- * @param int $modelId- * @return \Illuminate\Contracts\View\View+ *+ * @param int $modelId+ * @return View*/public function show(PredefinedKit $kit){@@ -154,8 +168,9 @@ class PredefinedKitsController extends Controller* Returns a view containing the Predefined Kit edit form.** @author [D. Minaev] [<[email protected]>]- * @param int $kit_id- * @return \Illuminate\Contracts\View\View+ *+ * @param int $kit_id+ * @return View*/public function editModel($kit_id, $model_id){@@ -176,8 +191,9 @@ class PredefinedKitsController extends Controller* Get the kit information to present to the kit view page** @author [D. Minaev] [<[email protected]>]- * @param int $modelId- * @return \Illuminate\Contracts\View\View+ *+ * @param int $modelId+ * @return View*/public function updateModel(Request $request, $kit_id, $model_id){@@ -206,8 +222,9 @@ class PredefinedKitsController extends Controller* Remove the model from set** @author [D. Minaev] [<[email protected]>]- * @param int $modelId- * @return \Illuminate\Contracts\View\View+ *+ * @param int $modelId+ * @return View*/public function detachModel($kit_id, $model_id){@@ -228,9 +245,10 @@ class PredefinedKitsController extends Controller* Returns a view containing attached license edit form.** @author [D. Minaev] [<[email protected]>]- * @param int $kit_id- * @param int $license_id- * @return \Illuminate\Contracts\View\View+ *+ * @param int $kit_id+ * @param int $license_id+ * @return View*/public function editLicense($kit_id, $license_id){@@ -253,9 +271,10 @@ class PredefinedKitsController extends Controller* Update attached licese** @author [D. Minaev] [<[email protected]>]- * @param int $kit_id- * @param int $license_id- * @return \Illuminate\Contracts\View\View+ *+ * @param int $kit_id+ * @param int $license_id+ * @return View*/public function updateLicense(Request $request, $kit_id, $license_id){@@ -284,9 +303,10 @@ class PredefinedKitsController extends Controller* Remove the license from set** @author [D. Minaev] [<[email protected]>]- * @param int $kit_id- * @param int $license_id- * @return \Illuminate\Contracts\View\View+ *+ * @param int $kit_id+ * @param int $license_id+ * @return View*/public function detachLicense($kit_id, $license_id){@@ -307,9 +327,10 @@ class PredefinedKitsController extends Controller* Returns a view containing attached accessory edit form.** @author [D. Minaev] [<[email protected]>]- * @param int $kit_id- * @param int $accessoryId- * @return \Illuminate\Contracts\View\View+ *+ * @param int $kit_id+ * @param int $accessoryId+ * @return View*/public function editAccessory($kit_id, $accessory_id){@@ -332,9 +353,10 @@ class PredefinedKitsController extends Controller* Update attached accessory** @author [D. Minaev] [<[email protected]>]- * @param int $kit_id- * @param int $accessory_id- * @return \Illuminate\Contracts\View\View+ *+ * @param int $kit_id+ * @param int $accessory_id+ * @return View*/public function updateAccessory(Request $request, $kit_id, $accessory_id){@@ -363,8 +385,9 @@ class PredefinedKitsController extends Controller* Remove the accessory from set** @author [D. Minaev] [<[email protected]>]- * @param int $accessory_id- * @return \Illuminate\Contracts\View\View+ *+ * @param int $accessory_id+ * @return View*/public function detachAccessory($kit_id, $accessory_id){@@ -385,9 +408,10 @@ class PredefinedKitsController extends Controller* Returns a view containing attached consumable edit form.** @author [D. Minaev] [<[email protected]>]- * @param int $kit_id- * @param int $consumable_id- * @return \Illuminate\Contracts\View\View+ *+ * @param int $kit_id+ * @param int $consumable_id+ * @return View*/public function editConsumable($kit_id, $consumable_id){@@ -410,9 +434,10 @@ class PredefinedKitsController extends Controller* Update attached consumable** @author [D. Minaev] [<[email protected]>]- * @param int $kit_id- * @param int $consumableId- * @return \Illuminate\Contracts\View\View+ *+ * @param int $kit_id+ * @param int $consumableId+ * @return View*/public function updateConsumable(Request $request, $kit_id, $consumable_id){@@ -441,8 +466,9 @@ class PredefinedKitsController extends Controller* Remove the consumable from set** @author [D. Minaev] [<[email protected]>]- * @param int $consumable_id- * @return \Illuminate\Contracts\View\View+ *+ * @param int $consumable_id+ * @return View*/public function detachConsumable($kit_id, $consumable_id){diff --git a/app/Http/Controllers/LabelsController.php b/app/Http/Controllers/LabelsController.phpindex 8f25f00e41..adcc964de9 100755--- a/app/Http/Controllers/LabelsController.php+++ b/app/Http/Controllers/LabelsController.php@@ -20,7 +20,6 @@ class LabelsController extends Controller/*** Returns the Label view with test data*- * @param string $labelName* @author Grant Le Roux <[email protected]>*/public function show(string $labelName)@@ -28,7 +27,7 @@ class LabelsController extends Controller$labelName = str_replace('/', '\\', $labelName);$template = Label::find($labelName);- $exampleAsset = new Asset();+ $exampleAsset = new Asset;$exampleAsset->id = 999999;$exampleAsset->name = 'JEN-867-5309';@@ -50,18 +49,18 @@ class LabelsController extends Controller$exampleAsset->defaultLoc = new Location(['name' => trans('admin/labels/table.example_defaultloc'), 'phone' => '1-555-555-5555']);$exampleAsset->location = new Location(['name' => trans('admin/labels/table.example_location'), 'phone' => '1-555-555-5555']);- $exampleAsset->model = new AssetModel();+ $exampleAsset->model = new AssetModel;$exampleAsset->model->id = 999999;$exampleAsset->model->name = trans('admin/labels/table.example_model');$exampleAsset->model->model_number = 'MDL5678';- $exampleAsset->model->manufacturer = new Manufacturer();+ $exampleAsset->model->manufacturer = new Manufacturer;$exampleAsset->model->manufacturer->id = 999999;$exampleAsset->model->manufacturer->name = trans('admin/labels/table.example_manufacturer');$exampleAsset->model->manufacturer->support_email = '[email protected]';$exampleAsset->model->manufacturer->support_phone = '1-555-555-5555';$exampleAsset->model->manufacturer->support_url = 'https://example.com';$exampleAsset->supplier = new Supplier(['name' => trans('admin/labels/table.example_company')]);- $exampleAsset->model->category = new Category();+ $exampleAsset->model->category = new Category;$exampleAsset->model->category->id = 999999;$exampleAsset->model->category->name = trans('admin/labels/table.example_category');@@ -70,13 +69,13 @@ class LabelsController extends Controllercollect(explode(';', Setting::getSettings()->label2_fields))->filter()->each(function ($item) use ($customFieldColumns, $exampleAsset) {- $pair = explode('=', $item);-+ $pair = explode('=', $item);+if (array_key_exists(1, $pair)) {- if ($customFieldColumns->contains($pair[1])) {- $exampleAsset->{$pair[1]} = "{{$pair[0]}}";- }+ if ($customFieldColumns->contains($pair[1])) {+ $exampleAsset->{$pair[1]} = "{{$pair[0]}}";}+ }});$settings = Setting::getSettings();@@ -87,7 +86,7 @@ class LabelsController extends Controller}}- return (new LabelView())+ return (new LabelView)->with('assets', collect([$exampleAsset]))->with('settings', $settings)->with('template', $template)diff --git a/app/Http/Controllers/Licenses/LicenseCheckinController.php b/app/Http/Controllers/Licenses/LicenseCheckinController.phpindex e36106947c..ff03cb04d4 100644--- a/app/Http/Controllers/Licenses/LicenseCheckinController.php+++ b/app/Http/Controllers/Licenses/LicenseCheckinController.php@@ -5,16 +5,16 @@ namespace App\Http\Controllers\Licenses;use App\Events\CheckoutableCheckedIn;use App\Helpers\Helper;use App\Http\Controllers\Controller;+use App\Models\Asset;use App\Models\License;use App\Models\LicenseSeat;use App\Models\User;-use App\Models\Asset;+use Illuminate\Auth\Access\AuthorizationException;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;-use Illuminate\Support\Facades\Auth;-use Illuminate\Support\Facades\Input;-use Illuminate\Support\Facades\Session;-use Illuminate\Support\Facades\Validator;use Illuminate\Support\Facades\Log;+use Illuminate\Support\Facades\Validator;class LicenseCheckinController extends Controller{@@ -22,17 +22,21 @@ class LicenseCheckinController extends Controller* Makes the form view to check a license seat back into inventory.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param int $seatId- * @param string $backTo- * @return \Illuminate\Contracts\View\View- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param int $seatId+ * @param string $backTo+ * @return View+ *+ * @throws AuthorizationException*/public function create(LicenseSeat $licenseSeat, $backTo = null){// Check if the asset exists$license = License::find($licenseSeat->license_id);$this->authorize('checkout', $license);+return view('licenses/checkin', compact('licenseSeat'))->with('backto', $backTo);}@@ -40,12 +44,15 @@ class LicenseCheckinController extends Controller* Validates and stores the license checkin action.** @author [A. Gianotto] [<[email protected]>]+ ** @see LicenseCheckinController::create() method that provides the form view* @since [v1.0]- * @param int $seatId- * @param string $backTo- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param int $seatId+ * @param string $backTo+ * @return RedirectResponse+ *+ * @throws AuthorizationException*/public function store(Request $request, $seatId = null, $backTo = null){@@ -64,11 +71,9 @@ class LicenseCheckinController extends Controller$this->authorize('checkout', $license);--// Declare the rules for the form validation$rules = [- 'notes' => 'string|nullable',+ 'notes' => 'string|nullable',];// Create a new validator instance from our validation rules@@ -80,7 +85,7 @@ class LicenseCheckinController extends Controllerreturn redirect()->back()->withInput()->withErrors($validator);}- if($licenseSeat->assigned_to != null){+ if ($licenseSeat->assigned_to != null) {$return_to = User::withTrashed()->find($licenseSeat->assigned_to);if ($return_to) {session()->put('checkedInFrom', $return_to->id);@@ -98,7 +103,7 @@ class LicenseCheckinController extends Controller}session()->put(['redirect_option' => $request->input('redirect_option')]);- if ($request->input('redirect_option') === 'target'){+ if ($request->input('redirect_option') === 'target') {session()->put(['checkout_to_type' => 'user']);}@@ -106,7 +111,6 @@ class LicenseCheckinController extends Controllerif ($licenseSeat->save()) {event(new CheckoutableCheckedIn($licenseSeat, $return_to, auth()->user(), $licenseSeat->notes));-return Helper::getRedirectOption($request, $license->id, 'Licenses')->with('success', trans('admin/licenses/message.checkin.success'));}@@ -119,13 +123,16 @@ class LicenseCheckinController extends Controller* Bulk checkin all license seats** @author [A. Gianotto] [<[email protected]>]+ ** @see LicenseCheckinController::create() method that provides the form view* @since [v6.1.1]- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return RedirectResponse+ *+ * @throws AuthorizationException*/-- public function bulkCheckin(Request $request, $licenseId) {+ public function bulkCheckin(Request $request, $licenseId)+ {$license = License::findOrFail($licenseId);$this->authorize('checkin', $license);@@ -166,8 +173,7 @@ class LicenseCheckinController extends Controller}}- return redirect()->back()->with('success', trans_choice('admin/licenses/general.bulk.checkin_all.success', 2, ['count' => $count] ));+ return redirect()->back()->with('success', trans_choice('admin/licenses/general.bulk.checkin_all.success', 2, ['count' => $count]));}-}diff --git a/app/Http/Controllers/Licenses/LicenseCheckoutController.php b/app/Http/Controllers/Licenses/LicenseCheckoutController.phpindex 4f56219e60..569de2b502 100644--- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php+++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php@@ -6,12 +6,14 @@ use App\Events\CheckoutableCheckedOut;use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Http\Requests\LicenseCheckoutRequest;-use App\Models\Accessory;use App\Models\Asset;use App\Models\License;use App\Models\LicenseSeat;use App\Models\User;-use Illuminate\Support\Facades\Auth;+use Illuminate\Auth\Access\AuthorizationException;+use Illuminate\Contracts\View\View;+use Illuminate\Http\Exceptions\HttpResponseException;+use Illuminate\Http\RedirectResponse;use Illuminate\Support\Facades\Log;class LicenseCheckoutController extends Controller@@ -23,10 +25,13 @@ class LicenseCheckoutController extends Controller* only the seats associated with them.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param $id- * @return \Illuminate\Contracts\View\View |\Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param $id+ * @return View |RedirectResponse+ *+ * @throws AuthorizationException*/public function create(License $license){@@ -63,11 +68,12 @@ class LicenseCheckoutController extends Controller* Validates and stores the license checkout action.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param LicenseCheckoutRequest $request- * @param $licenseId- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return RedirectResponse+ *+ * @throws AuthorizationException*/public function store(LicenseCheckoutRequest $request, $licenseId, $seatId = null){@@ -75,7 +81,6 @@ class LicenseCheckoutController extends Controllerreturn redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));}-$this->authorize('checkout', $license);// Make sure there is at least one available to checkout@@ -105,16 +110,12 @@ class LicenseCheckoutController extends Controllersession()->put(['redirect_option' => $request->input('redirect_option'), 'checkout_to_type' => 'user']);}--if ($checkoutTarget) {return Helper::getRedirectOption($request, $license->id, 'Licenses')->with('success', trans('admin/licenses/message.checkout.success'));}--return redirect()->route('licenses.index')->with('error', trans('Something went wrong handling this checkout.'));}@@ -124,15 +125,14 @@ class LicenseCheckoutController extends Controllerif (! $licenseSeat) {if ($seatId) {- throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.unavailable')));+ throw new HttpResponseException(redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.unavailable')));}-- throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.not_enough_seats')));- }+ throw new HttpResponseException(redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.not_enough_seats')));+ }if (! $licenseSeat->license->is($license)) {- throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.mismatch')));+ throw new HttpResponseException(redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.mismatch')));}return $licenseSeat;@@ -151,6 +151,7 @@ class LicenseCheckoutController extends Controller}if ($licenseSeat->save()) {event(new CheckoutableCheckedOut($licenseSeat, $target, auth()->user(), request('notes')));+return $target;}@@ -167,6 +168,7 @@ class LicenseCheckoutController extends Controllerif ($licenseSeat->save()) {event(new CheckoutableCheckedOut($licenseSeat, $target, auth()->user(), request('notes')));+return $target;}@@ -177,13 +179,16 @@ class LicenseCheckoutController extends Controller* Bulk checkin all license seats** @author [A. Gianotto] [<[email protected]>]+ ** @see LicenseCheckinController::create() method that provides the form view* @since [v6.1.1]- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return RedirectResponse+ *+ * @throws AuthorizationException*/-- public function bulkCheckout($licenseId) {+ public function bulkCheckout($licenseId)+ {Log::debug('Checking out '.$licenseId.' via bulk');$license = License::findOrFail($licenseId);@@ -202,7 +207,6 @@ class LicenseCheckoutController extends Controllerreturn redirect()->back()->with('error', trans('admin/licenses/general.bulk.checkout_all.error_no_seats'));}-$assigned_count = 0;foreach ($users as $user) {@@ -210,6 +214,7 @@ class LicenseCheckoutController extends Controller// Check to make sure this user doesn't already have this license checked out to themif ($user->licenses->where('id', '=', $licenseId)->count()) {Log::debug($user->username.' already has this license checked out to them. Skipping... ');+continue;}@@ -225,17 +230,16 @@ class LicenseCheckoutController extends ControllerLog::debug('License '.$license->name.' seat '.$licenseSeat->id.' checked out to '.$user->username);}- if ($avail_count == 0) {+ if ($avail_count == 0) {return redirect()->back()->with('warning', trans('admin/licenses/general.bulk.checkout_all.warn_not_enough_seats', ['count' => $assigned_count]));}}- if ($assigned_count == 0) {+ if ($assigned_count == 0) {return redirect()->back()->with('warning', trans('admin/licenses/general.bulk.checkout_all.warn_no_avail_users', ['count' => $assigned_count]));}- return redirect()->back()->with('success', trans_choice('admin/licenses/general.bulk.checkout_all.success', 2, ['count' => $assigned_count] ));-+ return redirect()->back()->with('success', trans_choice('admin/licenses/general.bulk.checkout_all.success', 2, ['count' => $assigned_count]));}}diff --git a/app/Http/Controllers/Licenses/LicensesController.php b/app/Http/Controllers/Licenses/LicensesController.phpindex 18454aa4e1..20f74b6893 100755--- a/app/Http/Controllers/Licenses/LicensesController.php+++ b/app/Http/Controllers/Licenses/LicensesController.php@@ -6,10 +6,11 @@ use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Models\Company;use App\Models\License;-use App\Models\LicenseSeat;use App\Models\User;+use Illuminate\Auth\Access\AuthorizationException;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;-use Illuminate\Support\Facades\Auth;use Illuminate\Support\Facades\DB;use Symfony\Component\HttpFoundation\StreamedResponse;@@ -26,10 +27,13 @@ class LicensesController extends Controller* the content for the licenses listing, which is generated in getDatatable.** @author [A. Gianotto] [<[email protected]>]+ ** @see LicensesController::getDatatable() method that generates the JSON response* @since [v1.0]- * @return \Illuminate\Contracts\View\View- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return View+ *+ * @throws AuthorizationException*/public function index(){@@ -42,10 +46,13 @@ class LicensesController extends Controller* Returns a form view that allows an admin to create a new licence.** @author [A. Gianotto] [<[email protected]>]+ ** @see AccessoriesController::getDatatable() method that generates the JSON response* @since [v1.0]- * @return \Illuminate\Contracts\View\View- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return View+ *+ * @throws AuthorizationException*/public function create(){@@ -67,42 +74,44 @@ class LicensesController extends Controller* license form.** @author [A. Gianotto] [<[email protected]>]+ ** @see LicensesController::getCreate() method that provides the form view* @since [v1.0]- * @param Request $request- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return RedirectResponse+ *+ * @throws AuthorizationException*/public function store(Request $request){$this->authorize('create', License::class);// create a new model instance- $license = new License();+ $license = new License;// Save the license data- $license->company_id = Company::getIdForCurrentUser($request->input('company_id'));- $license->depreciation_id = $request->input('depreciation_id');- $license->expiration_date = $request->input('expiration_date');- $license->license_email = $request->input('license_email');- $license->license_name = $request->input('license_name');- $license->maintained = $request->input('maintained', 0);- $license->manufacturer_id = $request->input('manufacturer_id');- $license->name = $request->input('name');- $license->notes = $request->input('notes');- $license->order_number = $request->input('order_number');- $license->purchase_cost = $request->input('purchase_cost');- $license->purchase_date = $request->input('purchase_date');- $license->purchase_order = $request->input('purchase_order');- $license->purchase_order = $request->input('purchase_order');- $license->reassignable = $request->input('reassignable', 0);- $license->seats = $request->input('seats');- $license->serial = $request->input('serial');- $license->supplier_id = $request->input('supplier_id');- $license->category_id = $request->input('category_id');- $license->termination_date = $request->input('termination_date');- $license->created_by = auth()->id();- $license->min_amt = $request->input('min_amt');-- if($request->input('redirect_option') === 'back'){+ $license->company_id = Company::getIdForCurrentUser($request->input('company_id'));+ $license->depreciation_id = $request->input('depreciation_id');+ $license->expiration_date = $request->input('expiration_date');+ $license->license_email = $request->input('license_email');+ $license->license_name = $request->input('license_name');+ $license->maintained = $request->input('maintained', 0);+ $license->manufacturer_id = $request->input('manufacturer_id');+ $license->name = $request->input('name');+ $license->notes = $request->input('notes');+ $license->order_number = $request->input('order_number');+ $license->purchase_cost = $request->input('purchase_cost');+ $license->purchase_date = $request->input('purchase_date');+ $license->purchase_order = $request->input('purchase_order');+ $license->purchase_order = $request->input('purchase_order');+ $license->reassignable = $request->input('reassignable', 0);+ $license->seats = $request->input('seats');+ $license->serial = $request->input('serial');+ $license->supplier_id = $request->input('supplier_id');+ $license->category_id = $request->input('category_id');+ $license->termination_date = $request->input('termination_date');+ $license->created_by = auth()->id();+ $license->min_amt = $request->input('min_amt');++ if ($request->input('redirect_option') === 'back') {session()->put(['redirect_option' => 'index']);} else {session()->put(['redirect_option' => $request->input('redirect_option')]);@@ -121,10 +130,13 @@ class LicensesController extends Controller* update license information.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param int $licenseId- * @return \Illuminate\Contracts\View\View- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param int $licenseId+ * @return View+ *+ * @throws AuthorizationException*/public function edit(License $license){@@ -143,45 +155,45 @@ class LicensesController extends Controller->with('maintained_list', $maintained_list);}-/*** Validates and stores the license form data submitted from the edit* license form.** @author [A. Gianotto] [<[email protected]>]+ ** @see LicensesController::getEdit() method that provides the form view* @since [v1.0]- * @param Request $request- * @param int $licenseId- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param int $licenseId+ * @return RedirectResponse+ *+ * @throws AuthorizationException*/public function update(Request $request, License $license){-$this->authorize('update', $license);- $license->company_id = Company::getIdForCurrentUser($request->input('company_id'));- $license->depreciation_id = $request->input('depreciation_id');- $license->expiration_date = $request->input('expiration_date');- $license->license_email = $request->input('license_email');- $license->license_name = $request->input('license_name');- $license->maintained = $request->input('maintained',0);- $license->name = $request->input('name');- $license->notes = $request->input('notes');- $license->order_number = $request->input('order_number');- $license->purchase_cost = $request->input('purchase_cost');- $license->purchase_date = $request->input('purchase_date');- $license->purchase_order = $request->input('purchase_order');- $license->reassignable = $request->input('reassignable', 0);- $license->serial = $request->input('serial');- $license->termination_date = $request->input('termination_date');- $license->seats = e($request->input('seats'));- $license->manufacturer_id = $request->input('manufacturer_id');- $license->supplier_id = $request->input('supplier_id');- $license->category_id = $request->input('category_id');- $license->min_amt = $request->input('min_amt');+ $license->company_id = Company::getIdForCurrentUser($request->input('company_id'));+ $license->depreciation_id = $request->input('depreciation_id');+ $license->expiration_date = $request->input('expiration_date');+ $license->license_email = $request->input('license_email');+ $license->license_name = $request->input('license_name');+ $license->maintained = $request->input('maintained', 0);+ $license->name = $request->input('name');+ $license->notes = $request->input('notes');+ $license->order_number = $request->input('order_number');+ $license->purchase_cost = $request->input('purchase_cost');+ $license->purchase_date = $request->input('purchase_date');+ $license->purchase_order = $request->input('purchase_order');+ $license->reassignable = $request->input('reassignable', 0);+ $license->serial = $request->input('serial');+ $license->termination_date = $request->input('termination_date');+ $license->seats = e($request->input('seats'));+ $license->manufacturer_id = $request->input('manufacturer_id');+ $license->supplier_id = $request->input('supplier_id');+ $license->category_id = $request->input('category_id');+ $license->min_amt = $request->input('min_amt');session()->put(['redirect_option' => $request->input('redirect_option')]);@@ -189,6 +201,7 @@ class LicensesController extends Controllerreturn Helper::getRedirectOption($request, $license->id, 'Licenses')->with('success', trans('admin/licenses/message.update.success'));}+// If we can't adjust the number of seats, the error is flashed to the session by the event handler in License.phpreturn redirect()->back()->withInput()->withErrors($license->getErrors());}@@ -198,10 +211,13 @@ class LicensesController extends Controller* if it can, marks it as deleted.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param int $licenseId- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param int $licenseId+ * @return RedirectResponse+ *+ * @throws AuthorizationException*/public function destroy(License $license){@@ -227,6 +243,7 @@ class LicensesController extends Controllerreturn redirect()->route('licenses.index')->with('success', trans('admin/licenses/message.delete.success'));// Redirect to the license management page}+// There are still licenses in use.return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.assoc_users'));}@@ -235,10 +252,13 @@ class LicensesController extends Controller* Makes the license detail page.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param int $licenseId- * @return \Illuminate\Contracts\View\View- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param int $licenseId+ * @return View+ *+ * @throws AuthorizationException*/public function show(License $license){@@ -250,17 +270,17 @@ class LicensesController extends Controller$available_seats_count = $license->availCount()->count();$unreassignable_seats_count = License::unReassignableCount($license);- if(!$license->reassignable){- $checkedout_seats_count = ($total_seats_count - $available_seats_count - $unreassignable_seats_count );- }- else {+ if (! $license->reassignable) {+ $checkedout_seats_count = ($total_seats_count - $available_seats_count - $unreassignable_seats_count);+ } else {$checkedout_seats_count = ($total_seats_count - $available_seats_count);}- if($license->isInactive()){+ if ($license->isInactive()) {session()->flash('warning', (trans('admin/licenses/message.checkout.license_is_inactive')));}$this->authorize('view', $license);+return view('licenses.view', compact('license'))->with('users_count', $users_count)->with('total_seats_count', $total_seats_count)@@ -270,16 +290,16 @@ class LicensesController extends Controller}-/*** Returns a view with prepopulated data for clone** @author [A. Gianotto] [<[email protected]>]- * @param int $licenseId- * @return \Illuminate\Http\RedirectResponse | \Illuminate\Contracts\View\View- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param int $licenseId+ *+ * @throws AuthorizationException*/- public function getClone($licenseId = null) : \Illuminate\Contracts\View\View | \Illuminate\Http\RedirectResponse+ public function getClone($licenseId = null): View|RedirectResponse{if (is_null($license_to_clone = License::find($licenseId))) {return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist'));@@ -292,25 +312,28 @@ class LicensesController extends Controller'1' => 'Yes','0' => 'No',];- //clone the orig+ // clone the orig$license = clone $license_to_clone;$license->id = null;$license->serial = null;// Show the pagereturn view('licenses/edit')- ->with('depreciation_list', Helper::depreciationList())- ->with('item', $license)- ->with('maintained_list', $maintained_list);+ ->with('depreciation_list', Helper::depreciationList())+ ->with('item', $license)+ ->with('maintained_list', $maintained_list);}/*** Exports Licenses to CSV** @author [G. Martinez]+ ** @since [v6.3]+ ** @return StreamedResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @throws AuthorizationException*/public function getExportLicensesCsv(){@@ -322,11 +345,11 @@ class LicensesController extends Controller// Open output stream$handle = fopen('php://output', 'w');$licenses = License::with('company',- 'manufacturer',- 'category',- 'supplier',- 'adminuser',- 'assignedusers');+ 'manufacturer',+ 'category',+ 'supplier',+ 'adminuser',+ 'assignedusers');if (request()->filled('category_id')) {$licenses = $licenses->where('category_id', request()->input('category_id'));}@@ -369,7 +392,7 @@ class LicensesController extends Controller// Add a new row with data$values = [$license->id,- $license->company ? $license->company->name: '',+ $license->company ? $license->company->name : '',$license->name,$license->serial,$license->purchase_date,@@ -378,20 +401,20 @@ class LicensesController extends Controller$license->free_seat_count,$license->seats,($license->adminuser ? $license->adminuser->display_name : trans('admin/reports/general.deleted_user')),- $license->depreciation ? $license->depreciation->name: '',+ $license->depreciation ? $license->depreciation->name : '',$license->updated_at,$license->deleted_at,$license->email,- ( $license->depreciate == '1') ? trans('general.yes') : trans('general.no'),- ($license->supplier) ? $license->supplier->name: '',+ ($license->depreciate == '1') ? trans('general.yes') : trans('general.no'),+ ($license->supplier) ? $license->supplier->name : '',$license->expiration_date,$license->purchase_order,$license->termination_date,- ( $license->maintained == '1') ? trans('general.yes') : trans('general.no'),- $license->manufacturer ? $license->manufacturer->name: '',- $license->category ? $license->category->name: '',+ ($license->maintained == '1') ? trans('general.yes') : trans('general.no'),+ $license->manufacturer ? $license->manufacturer->name : '',+ $license->category ? $license->category->name : '',$license->min_amt,- ( $license->reassignable == '1') ? trans('general.yes') : trans('general.no'),+ ($license->reassignable == '1') ? trans('general.yes') : trans('general.no'),$license->notes,$license->created_at,];diff --git a/app/Http/Controllers/LocationsController.php b/app/Http/Controllers/LocationsController.phpindex 4dcf9a56f5..2802a5e0a1 100755--- a/app/Http/Controllers/LocationsController.php+++ b/app/Http/Controllers/LocationsController.php@@ -10,11 +10,12 @@ use App\Models\Company;use App\Models\Location;use App\Models\Setting;use App\Models\User;-use Illuminate\Support\Facades\Storage;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;use Illuminate\Support\Facades\Log;-use Illuminate\Http\RedirectResponse;-use \Illuminate\Contracts\View\View;+use Illuminate\Support\Facades\Storage;+/*** This controller handles all actions related to Locations for* the Snipe-IT Asset Management application.@@ -28,13 +29,15 @@ class LocationsController extends Controller* the content for the locations listing, which is generated in getDatatable.** @author [A. Gianotto] [<[email protected]>]+ ** @see LocationsController::getDatatable() method that generates the JSON response* @since [v1.0]*/- public function index() : View+ public function index(): View{// Grab all the locations$this->authorize('view', Location::class);+// Show the pagereturn view('locations/index');}@@ -43,10 +46,11 @@ class LocationsController extends Controller* Returns a form view used to create a new location.** @author [A. Gianotto] [<[email protected]>]+ ** @see LocationsController::postCreate() method that validates and stores the data* @since [v1.0]*/- public function create() : View+ public function create(): View{$this->authorize('create', Location::class);@@ -58,16 +62,17 @@ class LocationsController extends Controller* Validates and stores a new location.** @todo Check if a Form Request would work better here.+ ** @author [A. Gianotto] [<[email protected]>]+ ** @see LocationsController::getCreate() method that makes the form* @since [v1.0]- * @param ImageUploadRequest $request*/- public function store(ImageUploadRequest $request) : RedirectResponse+ public function store(ImageUploadRequest $request): RedirectResponse{$this->authorize('create', Location::class);-- $location = new Location();++ $location = new Location;$location->name = $request->input('name');$location->parent_id = $request->input('parent_id', null);$location->currency = $request->input('currency', '$');@@ -82,7 +87,7 @@ class LocationsController extends Controller$location->created_by = auth()->id();$location->phone = request('phone');$location->fax = request('fax');- $location->tag_color = $request->input('tag_color');+ $location->tag_color = $request->input('tag_color');$location->notes = $request->input('notes');$location->company_id = Company::getIdForCurrentUser($request->input('company_id'));@@ -92,7 +97,7 @@ class LocationsController extends Controller// check if parent is set and has a different companyif ($location->parent_id && Location::find($location->parent_id)->company_id != $location->company_id) {return redirect()->back()->withInput()->withInput()->with('error', 'different company than parent');- }+ }} else {$location->company_id = $request->input('company_id');}@@ -121,13 +126,17 @@ class LocationsController extends Controller* Makes a form view to edit location information.** @author [A. Gianotto] [<[email protected]>]+ ** @see LocationsController::postCreate() method that validates and stores- * @param int $locationId+ *+ * @param int $locationId+ ** @since [v1.0]*/- public function edit(Location $location) : View | RedirectResponse+ public function edit(Location $location): View|RedirectResponse{$this->authorize('update', Location::class);+return view('locations/edit')->with('item', $location);}@@ -135,12 +144,14 @@ class LocationsController extends Controller* Validates and stores updated location data from edit form.** @author [A. Gianotto] [<[email protected]>]+ ** @see LocationsController::getEdit() method that makes the form view- * @param ImageUploadRequest $request- * @param int $locationId+ *+ * @param int $locationId+ ** @since [v1.0]*/- public function update(ImageUploadRequest $request, Location $location) : RedirectResponse+ public function update(ImageUploadRequest $request, Location $location): RedirectResponse{$this->authorize('update', Location::class);@@ -157,7 +168,7 @@ class LocationsController extends Controller$location->fax = request('fax');$location->ldap_ou = $request->input('ldap_ou');$location->manager_id = $request->input('manager_id');- $location->tag_color = $request->input('tag_color');+ $location->tag_color = $request->input('tag_color');$location->notes = $request->input('notes');// Only scope the location if the setting is enabled@@ -166,7 +177,7 @@ class LocationsController extends Controller// check if there are related objects with different companyif (Helper::test_locations_fmcs(false, $location->id, $location->company_id)) {return redirect()->back()->withInput()->withInput()->with('error', 'error scoped locations');- }+ }} else {$location->company_id = $request->input('company_id');}@@ -184,25 +195,27 @@ class LocationsController extends Controller* Validates and deletes selected location.** @author [A. Gianotto] [<[email protected]>]- * @param int $locationId+ *+ * @param int $locationId+ ** @since [v1.0]*/- public function destroy($locationId) : RedirectResponse+ public function destroy($locationId): RedirectResponse{$this->authorize('delete', Location::class);$location = Location::withCount('assignedAssets as assigned_assets_count')- ->withCount('assets as assets_count')- ->withCount('assignedAccessories as assigned_accessories_count')- ->withCount('accessories as accessories_count')- ->withCount('rtd_assets as rtd_assets_count')- ->withCount('children as children_count')- ->withCount('users as users_count')- ->withCount('consumables as consumables_count')- ->withCount('components as components_count')- ->find($locationId);-- if (!$location) {+ ->withCount('assets as assets_count')+ ->withCount('assignedAccessories as assigned_accessories_count')+ ->withCount('accessories as accessories_count')+ ->withCount('rtd_assets as rtd_assets_count')+ ->withCount('children as children_count')+ ->withCount('users as users_count')+ ->withCount('consumables as consumables_count')+ ->withCount('components as components_count')+ ->find($locationId);++ if (! $location) {return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.does_not_exist'));}@@ -216,6 +229,7 @@ class LocationsController extends Controller}}$location->delete();+return redirect()->to(route('locations.index'))->with('success', trans('admin/locations/message.delete.success'));} else {return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.assoc_users'));@@ -228,10 +242,12 @@ class LocationsController extends Controller* the content for the locations detail page.** @author [A. Gianotto] [<[email protected]>]- * @param int $id+ *+ * @param int $id+ ** @since [v1.0]*/- public function show(Location $location) : View | RedirectResponse+ public function show(Location $location): View|RedirectResponse{$this->authorize('view', Location::class);@@ -250,7 +266,7 @@ class LocationsController extends Controllerreturn redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));}- public function print_assigned($id) : View | RedirectResponse+ public function print_assigned($id): View|RedirectResponse{$this->authorize('view', Location::class);@@ -261,7 +277,7 @@ class LocationsController extends Controller->with('assignedAssets', $location->assignedAssets)->with('accessories', $location->accessories)->with('assignedAccessories', $location->assignedAccessories)- ->with('users',$location->users)+ ->with('users', $location->users)->with('location', $location)->with('consumables', $location->consumables)->with('components', $location->components)@@ -271,7 +287,7 @@ class LocationsController extends Controllerreturn redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));}- public function print_all_assigned($id) : View | RedirectResponse+ public function print_all_assigned($id): View|RedirectResponse{$this->authorize('view', Location::class);if ($location = Location::where('id', $id)->first()) {@@ -281,24 +297,26 @@ class LocationsController extends Controller->with('assignedAssets', $location->assignedAssets)->with('accessories', $location->accessories)->with('assignedAccessories', $location->assignedAccessories)- ->with('users',$location->users)+ ->with('users', $location->users)->with('location', $location)->with('consumables', $location->consumables)->with('components', $location->components)->with('children', $location->children);}+return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));}-/*** Returns a view that presents a form to clone a location.** @author [A. Gianotto] [<[email protected]>]- * @param int $locationId+ *+ * @param int $locationId+ ** @since [v6.0.14]*/- public function getClone($locationId = null) : View | RedirectResponse+ public function getClone($locationId = null): View|RedirectResponse{$this->authorize('create', Location::class);@@ -318,15 +336,16 @@ class LocationsController extends Controller->with('item', $location);}-/*** Restore a given Asset Model (mark as un-deleted)** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param int $id+ *+ * @param int $id*/- public function postRestore(Location $location) : RedirectResponse+ public function postRestore(Location $location): RedirectResponse{$this->authorize('delete', $location);@@ -335,7 +354,7 @@ class LocationsController extends Controller}if ($location->restore()) {- $logaction = new Actionlog();+ $logaction = new Actionlog;$logaction->item_type = Location::class;$logaction->item_id = $location->id;$logaction->created_at = date('Y-m-d H:i:s');@@ -353,9 +372,10 @@ class LocationsController extends Controller* Returns a view that allows the user to bulk delete locations** @author [A. Gianotto] [<[email protected]>]+ ** @since [v6.3.1]*/- public function postBulkDelete(Request $request) : View | RedirectResponse+ public function postBulkDelete(Request $request): View|RedirectResponse{$this->authorize('update', Location::class);@@ -374,13 +394,14 @@ class LocationsController extends Controller->withCount('components as components_count')->withCount('users as users_count')->get();- $valid_count = 0;- foreach ($locations as $location) {- if ($location->isDeletable()) {- $valid_count++;- }+ $valid_count = 0;+ foreach ($locations as $location) {+ if ($location->isDeletable()) {+ $valid_count++;}- return view('locations/bulk-delete', compact('locations'))->with('valid_count', $valid_count);+ }++ return view('locations/bulk-delete', compact('locations'))->with('valid_count', $valid_count);}return redirect()->route('models.index')@@ -391,10 +412,10 @@ class LocationsController extends Controller* Checks that locations can be deleted and deletes them if they can** @author [A. Gianotto] [<[email protected]>]+ ** @since [v6.3.1]-*/- public function postBulkDeleteStore(Request $request) : RedirectResponse+ public function postBulkDeleteStore(Request $request): RedirectResponse{$this->authorize('delete', Location::class);@@ -444,9 +465,8 @@ class LocationsController extends Controller->with('warning', trans('general.bulk.delete.partial',['success' => $success_count, 'error' => $error_count, 'object_type' => trans('general.locations')]));- }}-+ }// Nothing was selected - return to the indexreturn redirect()diff --git a/app/Http/Controllers/MaintenancesController.php b/app/Http/Controllers/MaintenancesController.phpindex b3f287e6e7..40a39e5626 100644--- a/app/Http/Controllers/MaintenancesController.php+++ b/app/Http/Controllers/MaintenancesController.php@@ -5,12 +5,10 @@ namespace App\Http\Controllers;use App\Http\Requests\ImageUploadRequest;use App\Models\Asset;use App\Models\Maintenance;-use App\Models\Company;-use Illuminate\Support\Facades\Auth;use Carbon\Carbon;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;-use \Illuminate\Contracts\View\View;-use \Illuminate\Http\RedirectResponse;/*** This controller handles all actions related to Asset Maintenance for@@ -20,14 +18,14 @@ use \Illuminate\Http\RedirectResponse;*/class MaintenancesController extends Controller{-/**- * Returns a view that invokes the ajax tables which actually contains- * the content for the asset maintenances listing.- */- public function index() : View+ * Returns a view that invokes the ajax tables which actually contains+ * the content for the asset maintenances listing.+ */+ public function index(): View{$this->authorize('view', Asset::class);+return view('maintenances.index');}@@ -35,12 +33,16 @@ class MaintenancesController extends Controller* Returns a form view to create a new asset maintenance.** @see MaintenancesController::postCreate() method that stores the data+ ** @author Vincent Sposato <[email protected]>+ ** @version v1.0+ ** @since [v1.8]+ ** @return mixed*/- public function create() : View+ public function create(): View{$this->authorize('update', Asset::class);$asset = null;@@ -49,22 +51,25 @@ class MaintenancesController extends Controller// We have to set this so that the correct property is set in the select2 ajax dropdown$asset->asset_id = $asset->id;}-+return view('maintenances/edit')- ->with('maintenanceType', Maintenance::getImprovementOptions())- ->with('asset', $asset)- ->with('item', new Maintenance);+ ->with('maintenanceType', Maintenance::getImprovementOptions())+ ->with('asset', $asset)+ ->with('item', new Maintenance);}/**- * Validates and stores the new asset maintenance- *- * @see MaintenancesController::getCreate() method for the form- * @author Vincent Sposato <[email protected]>- * @version v1.0- * @since [v1.8]- */- public function store(ImageUploadRequest $request) : RedirectResponse+ * Validates and stores the new asset maintenance+ *+ * @see MaintenancesController::getCreate() method for the form+ *+ * @author Vincent Sposato <[email protected]>+ *+ * @version v1.0+ *+ * @since [v1.8]+ */+ public function store(ImageUploadRequest $request): RedirectResponse{$this->authorize('update', Asset::class);@@ -73,7 +78,7 @@ class MaintenancesController extends Controller// Loop through the selected assetsforeach ($assets as $asset) {- $maintenance = new Maintenance();+ $maintenance = new Maintenance;$maintenance->supplier_id = $request->input('supplier_id');$maintenance->is_warranty = $request->input('is_warranty');$maintenance->cost = $request->input('cost');@@ -100,7 +105,7 @@ class MaintenancesController extends Controller$maintenance = $request->handleImages($maintenance);// Was the asset maintenance created?- if (!$maintenance->save()) {+ if (! $maintenance->save()) {return redirect()->back()->withInput()->withErrors($maintenance->getErrors());}}@@ -111,14 +116,17 @@ class MaintenancesController extends Controller}/**- * Returns a form view to edit a selected asset maintenance.- *- * @see MaintenancesController::postEdit() method that stores the data- * @author Vincent Sposato <[email protected]>- * @version v1.0- * @since [v1.8]- */- public function edit(Maintenance $maintenance) : View | RedirectResponse+ * Returns a form view to edit a selected asset maintenance.+ *+ * @see MaintenancesController::postEdit() method that stores the data+ *+ * @author Vincent Sposato <[email protected]>+ *+ * @version v1.0+ *+ * @since [v1.8]+ */+ public function edit(Maintenance $maintenance): View|RedirectResponse{$this->authorize('update', Asset::class);$this->authorize('update', $maintenance->asset);@@ -134,20 +142,24 @@ class MaintenancesController extends Controller* Validates and stores an update to an asset maintenance** @see MaintenancesController::postEdit() method that stores the data+ ** @author Vincent Sposato <[email protected]>- * @param Request $request- * @param int $maintenanceId+ *+ * @param Request $request+ * @param int $maintenanceId+ ** @version v1.0+ ** @since [v1.8]*/- public function update(ImageUploadRequest $request, Maintenance $maintenance) : View | RedirectResponse+ public function update(ImageUploadRequest $request, Maintenance $maintenance): View|RedirectResponse{$this->authorize('update', Asset::class);$this->authorize('update', $maintenance->asset);$maintenance->supplier_id = $request->input('supplier_id');$maintenance->is_warranty = $request->input('is_warranty', 0);- $maintenance->cost = $request->input('cost');+ $maintenance->cost = $request->input('cost');$maintenance->notes = $request->input('notes');$maintenance->asset_maintenance_type = $request->input('asset_maintenance_type');$maintenance->name = $request->input('name');@@ -155,10 +167,8 @@ class MaintenancesController extends Controller$maintenance->completion_date = $request->input('completion_date');$maintenance->url = $request->input('url');-// Todo - put this in a getter/setter?- if (($maintenance->completion_date == null))- {+ if (($maintenance->completion_date == null)) {if (($maintenance->asset_maintenance_time !== 0)|| (! is_null($maintenance->asset_maintenance_time))) {@@ -178,40 +188,47 @@ class MaintenancesController extends Controllerif ($maintenance->save()) {return redirect()->route('maintenances.index')- ->with('success', trans('admin/maintenances/message.edit.success'));+ ->with('success', trans('admin/maintenances/message.edit.success'));}return redirect()->back()->withInput()->withErrors($maintenance->getErrors());}/**- * Delete an asset maintenance- *- * @author Vincent Sposato <[email protected]>- * @param int $maintenanceId- * @version v1.0- * @since [v1.8]- */- public function destroy(Maintenance $maintenance) : RedirectResponse+ * Delete an asset maintenance+ *+ * @author Vincent Sposato <[email protected]>+ *+ * @param int $maintenanceId+ *+ * @version v1.0+ *+ * @since [v1.8]+ */+ public function destroy(Maintenance $maintenance): RedirectResponse{$this->authorize('update', Asset::class);$this->authorize('update', $maintenance->asset);// Delete the asset maintenance$maintenance->delete();+// Redirect to the asset_maintenance management pagereturn redirect()->route('maintenances.index')- ->with('success', trans('admin/maintenances/message.delete.success'));+ ->with('success', trans('admin/maintenances/message.delete.success'));}/**- * View an asset maintenance- *- * @author Vincent Sposato <[email protected]>- * @param int $maintenanceId- * @version v1.0- * @since [v1.8]- */- public function show(Maintenance $maintenance) : View | RedirectResponse+ * View an asset maintenance+ *+ * @author Vincent Sposato <[email protected]>+ *+ * @param int $maintenanceId+ *+ * @version v1.0+ *+ * @since [v1.8]+ */+ public function show(Maintenance $maintenance): View|RedirectResponse{return view('maintenances.view')->with('maintenance', $maintenance);}diff --git a/app/Http/Controllers/ManufacturersController.php b/app/Http/Controllers/ManufacturersController.phpindex b5e33a1cff..e5f18fdf78 100755--- a/app/Http/Controllers/ManufacturersController.php+++ b/app/Http/Controllers/ManufacturersController.php@@ -3,23 +3,14 @@namespace App\Http\Controllers;use App\Actions\Manufacturers\DeleteManufacturerAction;-use App\Exceptions\ItemStillHasAccessories;-use App\Exceptions\ItemStillHasAssets;use App\Exceptions\ItemStillHasChildren;-use App\Exceptions\ItemStillHasComponents;-use App\Exceptions\ItemStillHasConsumables;-use App\Exceptions\ItemStillHasLicenses;-use App\Helpers\Helper;use App\Http\Requests\ImageUploadRequest;use App\Models\Actionlog;use App\Models\Manufacturer;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;use Illuminate\Support\Facades\Artisan;-use Illuminate\Support\Facades\Auth;-use Illuminate\Support\Facades\Storage;-use Illuminate\Support\Facades\Log;-use Illuminate\Http\RedirectResponse;-use \Illuminate\Contracts\View\View;/*** This controller handles all actions related to Manufacturers for@@ -34,13 +25,15 @@ class ManufacturersController extends Controller* the content for the manufacturers listing, which is generated in getDatatable.** @author [A. Gianotto] [<[email protected]>]+ ** @see Api\ManufacturersController::index() method that generates the JSON response* @since [v1.0]*/- public function index() : View+ public function index(): View{$this->authorize('index', Manufacturer::class);$manufacturer_count = Manufacturer::withTrashed()->count();+return view('manufacturers/index')->with('manufacturer_count', $manufacturer_count);}@@ -49,10 +42,11 @@ class ManufacturersController extends Controller* the content for the manufacturers listing, which is generated in getDatatable.** @author [A. Gianotto] [<[email protected]>]+ ** @see Api\ManufacturersController::index() method that generates the JSON response* @since [v1.0]*/- public function seed() : RedirectResponse+ public function seed(): RedirectResponse{$this->authorize('index', Manufacturer::class);@@ -60,6 +54,7 @@ class ManufacturersController extends Controllerif ($manufacturers_count == 0) {Artisan::call('db:seed', ['--class' => 'Database\\Seeders\\ManufacturerSeeder', '--force' => true]);+return redirect()->route('manufacturers.index')->with('success', trans('general.seeding.manufacturers.success'));}@@ -70,10 +65,11 @@ class ManufacturersController extends Controller* Returns a view that displays a form to create a new manufacturer.** @author [A. Gianotto] [<[email protected]>]+ ** @see ManufacturersController::store()* @since [v1.0]*/- public function create() : View+ public function create(): View{$this->authorize('create', Manufacturer::class);@@ -84,11 +80,11 @@ class ManufacturersController extends Controller* Validates and stores the data for a new manufacturer.** @author [A. Gianotto] [<[email protected]>]+ ** @see ManufacturersController::create()* @since [v1.0]- * @param ImageUploadRequest $request*/- public function store(ImageUploadRequest $request) : RedirectResponse+ public function store(ImageUploadRequest $request): RedirectResponse{$this->authorize('create', Manufacturer::class);$manufacturer = new Manufacturer;@@ -101,7 +97,7 @@ class ManufacturersController extends Controller$manufacturer->support_email = $request->input('support_email');$manufacturer->notes = $request->input('notes');$manufacturer = $request->handleImages($manufacturer);- $manufacturer->tag_color = $request->input('tag_color');+ $manufacturer->tag_color = $request->input('tag_color');if ($manufacturer->save()) {return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.create.success'));@@ -114,13 +110,17 @@ class ManufacturersController extends Controller* Returns a view that displays a form to edit a manufacturer.** @author [A. Gianotto] [<[email protected]>]+ ** @see ManufacturersController::update()- * @param int $manufacturerId+ *+ * @param int $manufacturerId+ ** @since [v1.0]*/- public function edit(Manufacturer $manufacturer) : View | RedirectResponse+ public function edit(Manufacturer $manufacturer): View|RedirectResponse{$this->authorize('update', Manufacturer::class);+return view('manufacturers/edit')->with('item', $manufacturer);}@@ -128,12 +128,15 @@ class ManufacturersController extends Controller* Validates and stores the updated manufacturer data.** @author [A. Gianotto] [<[email protected]>]+ ** @see ManufacturersController::getEdit()- * @param Request $request- * @param int $manufacturerId+ *+ * @param Request $request+ * @param int $manufacturerId+ ** @since [v1.0]*/- public function update(ImageUploadRequest $request, Manufacturer $manufacturer) : RedirectResponse+ public function update(ImageUploadRequest $request, Manufacturer $manufacturer): RedirectResponse{$this->authorize('update', Manufacturer::class);@@ -143,7 +146,7 @@ class ManufacturersController extends Controller$manufacturer->warranty_lookup_url = $request->input('warranty_lookup_url');$manufacturer->support_phone = $request->input('support_phone');$manufacturer->support_email = $request->input('support_email');- $manufacturer->tag_color = $request->input('tag_color');+ $manufacturer->tag_color = $request->input('tag_color');$manufacturer->notes = $request->input('notes');// Set the model's image property to null if the image is being deleted@@ -164,7 +167,9 @@ class ManufacturersController extends Controller* Deletes a manufacturer.** @author [A. Gianotto] [<[email protected]>]- * @param int $manufacturerId+ *+ * @param int $manufacturerId+ ** @since [v1.0]*/public function destroy(Manufacturer $manufacturer): RedirectResponse@@ -176,6 +181,7 @@ class ManufacturersController extends Controllerreturn redirect()->route('manufacturers.index')->with('error', trans('general.bulk_delete_associations.general_assoc_warning', ['item' => trans('general.manufacturer')]));} catch (\Exception $e) {report($e);+return redirect()->route('manufacturers.index')->with('error', trans('general.something_went_wrong'));}@@ -188,12 +194,15 @@ class ManufacturersController extends Controller* This data contains a listing of all assets that belong to that manufacturer.** @author [A. Gianotto] [<[email protected]>]- * @param int $manufacturerId+ *+ * @param int $manufacturerId+ ** @since [v1.0]*/- public function show(Manufacturer $manufacturer) : View | RedirectResponse+ public function show(Manufacturer $manufacturer): View|RedirectResponse{$this->authorize('view', Manufacturer::class);+return view('manufacturers/view', compact('manufacturer'));}@@ -201,10 +210,12 @@ class ManufacturersController extends Controller* Restore a given Manufacturer (mark as un-deleted)** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.1.15]- * @param int $manufacturers_id+ *+ * @param int $manufacturers_id*/- public function restore($id) : RedirectResponse+ public function restore($id): RedirectResponse{$this->authorize('delete', Manufacturer::class);@@ -215,7 +226,7 @@ class ManufacturersController extends Controller}if ($manufacturer->restore()) {- $logaction = new Actionlog();+ $logaction = new Actionlog;$logaction->item_type = Manufacturer::class;$logaction->item_id = $manufacturer->id;$logaction->created_at = date('Y-m-d H:i:s');@@ -227,6 +238,7 @@ class ManufacturersController extends Controllerif ($deleted_manufacturers > 0) {return redirect()->back()->with('success', trans('admin/manufacturers/message.success.restored'));}+return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.restore.success'));}diff --git a/app/Http/Controllers/ModalController.php b/app/Http/Controllers/ModalController.phpindex 78b26371ac..60146bcf4d 100644--- a/app/Http/Controllers/ModalController.php+++ b/app/Http/Controllers/ModalController.php@@ -3,28 +3,31 @@namespace App\Http\Controllers;use App\Helpers\Helper;+use Illuminate\Contracts\View\View;class ModalController extends Controller{-- /**+ /*** Load the modal views after confirming they are in the allowed_types array.- * The allowed types away just prevents shithead skiddies from fuzzing the urls+ * The allowed types away just prevents shithead skiddies from fuzzing the urls* with automated scripts and junking up the logs. - snipe- *+ ** @version v5.3.7-pre+ ** @author [Brady Wetherington] [<[email protected]>]* @author [A. Gianotto] [<[email protected]]- * @return \Illuminate\Contracts\View\View+ *+ * @return View*/- public function show ($type, $itemId = null) {+ public function show($type, $itemId = null)+ {// These values should correspond to a file in resources/views/modals/$allowed_types = ['category',- 'kit-model',- 'kit-license',- 'kit-consumable',+ 'kit-model',+ 'kit-license',+ 'kit-consumable','kit-accessory','location','manufacturer',@@ -36,21 +39,21 @@ class ModalController extends Controller'add-note',];-if (in_array($type, $allowed_types)) {- $view = view("modals.{$type}");+ $view = view("modals.{$type}");- if ($type == "statuslabel") {+ if ($type == 'statuslabel') {$view->with('statuslabel_types', Helper::statusTypeList());}if (in_array($type, ['kit-model', 'kit-license', 'kit-consumable', 'kit-accessory'])) {$view->with('kitId', $itemId);}+return $view;}- abort(404,'Page not found');-+ abort(404, 'Page not found');+}}diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.phpindex 712644d953..cf2edeb85b 100755--- a/app/Http/Controllers/ProfileController.php+++ b/app/Http/Controllers/ProfileController.php@@ -3,19 +3,18 @@namespace App\Http\Controllers;use App\Http\Requests\ImageUploadRequest;-use App\Http\Transformers\ProfileTransformer;use App\Models\Actionlog;use App\Models\Asset;use App\Models\Setting;use App\Models\User;use App\Notifications\CurrentInventory;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;+use Illuminate\Http\Request;use Illuminate\Http\Response;use Illuminate\Support\Facades\Auth;use Illuminate\Support\Facades\Gate;-use Illuminate\Http\Request;use Illuminate\Support\Facades\Hash;-use Illuminate\Http\RedirectResponse;-use \Illuminate\Contracts\View\View;use Illuminate\Support\Facades\Storage;use Symfony\Component\HttpFoundation\BinaryFileResponse;@@ -31,12 +30,14 @@ class ProfileController extends Controller* Returns a view with the user's profile form for editing** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]*/- public function getIndex() : View+ public function getIndex(): View{$user = auth()->user();+return view('account/profile', compact('user'));}@@ -44,9 +45,10 @@ class ProfileController extends Controller* Validates and stores the user's update data.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]*/- public function postIndex(ImageUploadRequest $request) : RedirectResponse+ public function postIndex(ImageUploadRequest $request): RedirectResponse{$user = auth()->user();@@ -59,7 +61,6 @@ class ProfileController extends Controller$user->phone = $request->input('phone');}-$user->enable_sounds = $request->input('enable_sounds', false);$user->enable_confetti = $request->input('enable_confetti', false);$user->link_light_color = $request->input('link_light_color', '#296282');@@ -67,7 +68,6 @@ class ProfileController extends Controller$user->nav_link_color = $request->input('nav_link_color', '#FFFFFF');$user->locale = $request->input('locale');-if ((Gate::allows('self.two_factor')) && ((Setting::getSettings()->two_factor_enabled == '1') && (! config('app.lock_passwords')))) {$user->two_factor_optin = $request->input('two_factor_optin', '0');}@@ -79,7 +79,6 @@ class ProfileController extends Controller// Handle the avatar upload and/or delete if necessaryapp('\App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'avatar', 'avatars', 'avatar');-if ($user->save()) {return redirect()->route('profile')->with('success', trans('account/general.profile_updated'));}@@ -87,7 +86,6 @@ class ProfileController extends Controllerreturn redirect()->back()->withInput()->withErrors($user->getErrors());}-/*** Returns a page with the API token generation interface.*@@ -95,12 +93,13 @@ class ProfileController extends Controller* in the routes file if you want to be able to cache the routes.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]*/public function api(): View{// Make sure the self.api permission has been granted- if (!Gate::allows('self.api')) {+ if (! Gate::allows('self.api')) {abort(403);}@@ -109,22 +108,22 @@ class ProfileController extends Controller/*** User change email page.- **/- public function password() : View | RedirectResponse+ public function password(): View|RedirectResponse{$user = auth()->user();- if ($user->ldap_import=='1') {+ if ($user->ldap_import == '1') {return redirect()->route('account')->with('error', trans('admin/users/message.error.password_ldap'));}+return view('account/change-password', compact('user'));}/*** Users change password form processing page.*/- public function passwordSave(Request $request) : RedirectResponse+ public function passwordSave(Request $request): RedirectResponse{if (config('app.lock_passwords')) {return redirect()->route('account.password.index')->with('error', trans('admin/users/table.lock_passwords'));@@ -136,8 +135,8 @@ class ProfileController extends Controller}$rules = [- 'current_password' => 'required',- 'password' => Setting::passwordComplexityRulesSaving('store').'|confirmed',+ 'current_password' => 'required',+ 'password' => Setting::passwordComplexityRulesSaving('store').'|confirmed',];$validator = \Validator::make($request->all(), $rules);@@ -171,14 +170,15 @@ class ProfileController extends Controller$user->password = Hash::make($request->input('password'));// We have to use saveQuietly here because for some reason this method was calling the User Oserver twice :($user->saveQuietly();-+// Log the user out of other devicesAuth::logoutOtherDevices($request->input('password'));+return redirect()->route('account')->with('success', trans('passwords.password_change'));}- return redirect()->back()->withInput()->withErrors($validator);+ return redirect()->back()->withInput()->withErrors($validator);}@@ -190,9 +190,10 @@ class ProfileController extends Controller* resources/views/layouts/default.blade.php** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]*/- public function getMenuState(Request $request) : void+ public function getMenuState(Request $request): void{if ($request->input('state') == 'open') {$request->session()->put('menu_state', 'open');@@ -201,16 +202,16 @@ class ProfileController extends Controller}}-/*** Print inventory** @author A. Gianotto+ ** @since [v6.0.12]*/- public function printInventory() : View+ public function printInventory(): View{- $show_users = User::where('id',auth()->user()->id)->get();+ $show_users = User::where('id', auth()->user()->id)->get();return view('users/print')->with('assets', auth()->user()->assets())@@ -225,12 +226,13 @@ class ProfileController extends Controller* Emails user a list of assigned assets** @author A. Gianotto+ ** @since [v6.0.12]*/- public function emailAssetList() : RedirectResponse+ public function emailAssetList(): RedirectResponse{- if (!$user = User::find(auth()->id())) {+ if (! $user = User::find(auth()->id())) {return redirect()->back()->with('error', trans('admin/users/message.user_not_found', ['id' => auth()->id()]));}@@ -247,9 +249,7 @@ class ProfileController extends Controllerreturn redirect()->back()->with('success', trans('admin/users/general.user_notified'));}--- public function getStoredEula($filename) : Response | BinaryFileResponse | RedirectResponse+ public function getStoredEula($filename): Response|BinaryFileResponse|RedirectResponse{$logentry = Actionlog::where('filename', $filename)->first();@@ -258,7 +258,7 @@ class ProfileController extends Controller// Also allow if the user (manager) able to view both users and assets$allowed_to_view_users_assets = Gate::allows('view', User::class) && Gate::allows('view', Asset::class);- if (auth()->id() != $logentry->target_id && !$allowed_to_view_users_assets) {+ if (auth()->id() != $logentry->target_id && ! $allowed_to_view_users_assets) {return redirect()->route('account')->with('error', trans('general.generic_model_not_found', ['model' => 'file']));}@@ -270,7 +270,7 @@ class ProfileController extends Controllerreturn response()->download(config('app.private_uploads').'/eula-pdfs/'.$filename);}- return redirect()->back()->with('error', trans('general.file_does_not_exist'));+ return redirect()->back()->with('error', trans('general.file_does_not_exist'));}}diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.phpindex d5bc88c009..4dd5537ada 100644--- a/app/Http/Controllers/ReportsController.php+++ b/app/Http/Controllers/ReportsController.php@@ -3,44 +3,41 @@namespace App\Http\Controllers;use App\Helpers\Helper;+use App\Http\Requests\CustomAssetReportRequest;use App\Mail\CheckoutAccessoryMail;use App\Mail\CheckoutAssetMail;use App\Mail\CheckoutComponentMail;use App\Mail\CheckoutConsumableMail;use App\Mail\CheckoutLicenseMail;use App\Models\Accessory;-use App\Models\AccessoryCheckout;use App\Models\Actionlog;use App\Models\Asset;use App\Models\AssetModel;use App\Models\Category;use App\Models\Checkoutable;+use App\Models\CheckoutAcceptance;use App\Models\Component;use App\Models\Consumable;-use App\Models\LicenseSeat;-use App\Models\Maintenance;-use App\Models\CheckoutAcceptance;-use App\Models\Company;use App\Models\CustomField;use App\Models\Depreciation;use App\Models\License;+use App\Models\LicenseSeat;+use App\Models\Maintenance;use App\Models\ReportTemplate;use App\Models\Setting;use Carbon\Carbon;-use Illuminate\Database\Eloquent\Model;+use Illuminate\Contracts\View\View;use Illuminate\Database\Eloquent\Relations\MorphTo;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;use Illuminate\Http\Response;use Illuminate\Mail\Mailable;+use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Mail;-use \Illuminate\Contracts\View\View;+use League\Csv\EscapeFormula;use League\Csv\Reader;+use League\Csv\Writer;use Symfony\Component\HttpFoundation\StreamedResponse;-use League\Csv\EscapeFormula;-use App\Http\Requests\CustomAssetReportRequest;-use Illuminate\Support\Facades\Log;-use Illuminate\Http\RedirectResponse;-use function Livewire\before;/*** This controller handles all actions related to Reports for@@ -59,13 +56,13 @@ class ReportsController extends Controller}/**- * Returns a view that displays the accessories report.- *- * @author [A. Gianotto] [<[email protected]>]- * @since [v1.0]- * @return \Illuminate\Contracts\View\View- */- public function getAccessoryReport() : View+ * Returns a view that displays the accessories report.+ *+ * @author [A. Gianotto] [<[email protected]>]+ *+ * @since [v1.0]+ */+ public function getAccessoryReport(): View{$this->authorize('reports.view');@@ -73,15 +70,16 @@ class ReportsController extends Controller}/**- * Exports the accessories to CSV- *- * @deprecated Server-side exports have been replaced by datatables export since v2.- * @author [A. Gianotto] [<[email protected]>]- * @see ManufacturersController::getDatatable() method that generates the JSON response- * @since [v1.0]- * @return \Illuminate\Http\Response- */- public function exportAccessoryReport() : Response+ * Exports the accessories to CSV+ *+ * @deprecated Server-side exports have been replaced by datatables export since v2.+ *+ * @author [A. Gianotto] [<[email protected]>]+ *+ * @see ManufacturersController::getDatatable() method that generates the JSON response+ * @since [v1.0]+ */+ public function exportAccessoryReport(): Response{$this->authorize('reports.view');$accessories = Accessory::orderBy('created_at', 'DESC')->get();@@ -116,33 +114,37 @@ class ReportsController extends Controller}/**- * Show depreciation report for assets.- *- * @author [A. Gianotto] [<[email protected]>]- * @since [v1.0]- */- public function getDeprecationReport() : View+ * Show depreciation report for assets.+ *+ * @author [A. Gianotto] [<[email protected]>]+ *+ * @since [v1.0]+ */+ public function getDeprecationReport(): View{$this->authorize('reports.view');$depreciations = Depreciation::get();- return view('reports/depreciation')->with('depreciations',$depreciations);++ return view('reports/depreciation')->with('depreciations', $depreciations);}/**- * Exports the depreciations to CSV- *- * @deprecated Server-side exports have been replaced by datatables export since v2.- * @author [A. Gianotto] [<[email protected]>]- * @since [v1.0]- */- public function exportDeprecationReport() : Response+ * Exports the depreciations to CSV+ *+ * @deprecated Server-side exports have been replaced by datatables export since v2.+ *+ * @author [A. Gianotto] [<[email protected]>]+ *+ * @since [v1.0]+ */+ public function exportDeprecationReport(): Response{$this->authorize('reports.view');// Grab all the assets$assets = Asset::with('model', 'assignedTo', 'assetstatus', 'defaultLoc', 'assetlog')- ->orderBy('created_at', 'DESC')->get();+ ->orderBy('created_at', 'DESC')->get();- $csv = \League\Csv\Writer::createFromFileObject(new \SplTempFileObject());+ $csv = Writer::createFromFileObject(new \SplTempFileObject);$csv->setOutputBOM(Reader::BOM_UTF16_BE);$rows = [];@@ -160,7 +162,7 @@ class ReportsController extends Controllertrans('admin/hardware/table.diff'),];- //we insert the CSV header+ // we insert the CSV header$csv->insertOne($header);// Create a row per asset@@ -202,30 +204,31 @@ class ReportsController extends Controller}$csv->output('depreciation-report-'.date('Y-m-d').'.csv');- die;+ exit;}-/*** Displays audit report.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]*/- public function audit() : View+ public function audit(): View{$this->authorize('reports.view');+return view('reports/audit');}-/**- * Displays activity report.- *- * @author [A. Gianotto] [<[email protected]>]- * @since [v1.0]- */- public function getActivityReport() : View+ * Displays activity report.+ *+ * @author [A. Gianotto] [<[email protected]>]+ *+ * @since [v1.0]+ */+ public function getActivityReport(): View{$this->authorize('reports.view');@@ -236,9 +239,10 @@ class ReportsController extends Controller* Exports the activity report to CSV** @author [A. Gianotto] [<[email protected]>]+ ** @since [v5.0.7]*/- public function postActivityReport(Request $request) : StreamedResponse+ public function postActivityReport(Request $request): StreamedResponse{ini_set('max_execution_time', 12000);$this->authorize('reports.view');@@ -279,42 +283,42 @@ class ReportsController extends Controller->orderBy('created_at', 'DESC')->chunk(500, function ($actionlogs) use ($handle) {$executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'];- Log::debug('Walking results: '.$executionTime);- $count = 0;+ Log::debug('Walking results: '.$executionTime);+ $count = 0;- foreach ($actionlogs as $actionlog) {- $count++;- $target_name = '';+ foreach ($actionlogs as $actionlog) {+ $count++;+ $target_name = '';- if ($actionlog->target) {- $target_name = $actionlog->target->display_name;- }+ if ($actionlog->target) {+ $target_name = $actionlog->target->display_name;+ }- if ($actionlog->item){- $item_name = e($actionlog->item->display_name);- } else {- $item_name = '';- }+ if ($actionlog->item) {+ $item_name = e($actionlog->item->display_name);+ } else {+ $item_name = '';+ }- $row = [- $actionlog->created_at,- ($actionlog->adminuser) ? $actionlog->adminuser->display_name : '',- $actionlog->present()->actionType(),- e($actionlog->itemType()),- ($actionlog->itemType() == 'user') ? $actionlog->filename : $item_name,- ($actionlog->item) ? $actionlog->item->serial : null,- (($actionlog->item) && ($actionlog->item->model)) ? htmlspecialchars($actionlog->item->model->name, ENT_NOQUOTES) : null,- (($actionlog->item) && ($actionlog->item->model)) ? $actionlog->item->model->model_number : null,- $target_name,- ($actionlog->note) ? e($actionlog->note) : '',- $actionlog->remote_ip,- $actionlog->user_agent,- $actionlog->action_source,- $actionlog->log_meta,- ];- fputcsv($handle, $row);- }- });+ $row = [+ $actionlog->created_at,+ ($actionlog->adminuser) ? $actionlog->adminuser->display_name : '',+ $actionlog->present()->actionType(),+ e($actionlog->itemType()),+ ($actionlog->itemType() == 'user') ? $actionlog->filename : $item_name,+ ($actionlog->item) ? $actionlog->item->serial : null,+ (($actionlog->item) && ($actionlog->item->model)) ? htmlspecialchars($actionlog->item->model->name, ENT_NOQUOTES) : null,+ (($actionlog->item) && ($actionlog->item->model)) ? $actionlog->item->model->model_number : null,+ $target_name,+ ($actionlog->note) ? e($actionlog->note) : '',+ $actionlog->remote_ip,+ $actionlog->user_agent,+ $actionlog->action_source,+ $actionlog->log_meta,+ ];+ fputcsv($handle, $row);+ }+ });// Close the output streamfclose($handle);@@ -325,35 +329,36 @@ class ReportsController extends Controller'Content-Disposition' => 'attachment; filename="activity-report-'.date('Y-m-d-his').'.csv"',]);-return $response;}-/*** Displays license report** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]*/- public function getLicenseReport() : View+ public function getLicenseReport(): View{$this->authorize('reports.view');$licenses = License::with('depreciation')->orderBy('created_at', 'DESC')- ->with('company')- ->get();+ ->with('company')+ ->get();return view('reports/licenses', compact('licenses'));}/**- * Exports the licenses to CSV- *- * @deprecated Server-side exports have been replaced by datatables export since v2.- * @author [A. Gianotto] [<[email protected]>]- * @since [v1.0]- */- public function exportLicenseReport() : Response+ * Exports the licenses to CSV+ *+ * @deprecated Server-side exports have been replaced by datatables export since v2.+ *+ * @author [A. Gianotto] [<[email protected]>]+ *+ * @since [v1.0]+ */+ public function exportLicenseReport(): Response{$this->authorize('reports.view');$licenses = License::orderBy('created_at', 'DESC')->get();@@ -388,8 +393,7 @@ class ReportsController extends Controller$rows[] = implode(',', $row);}-- $csv = implode("\n", $rows);+ $csv = implode("\n", $rows);$response = response()->make($csv, 200);$response->header('Content-Type', 'text/csv');$response->header('Content-disposition', 'attachment;filename=report.csv');@@ -398,13 +402,14 @@ class ReportsController extends Controller}/**- * Returns a form that allows the user to generate a custom CSV report.- *- * @author [A. Gianotto] [<[email protected]>]- * @see ReportsController::postCustomReport() method that generates the CSV- * @since [v1.0]- */- public function getCustomReport(Request $request) : View+ * Returns a form that allows the user to generate a custom CSV report.+ *+ * @author [A. Gianotto] [<[email protected]>]+ *+ * @see ReportsController::postCustomReport() method that generates the CSV+ * @since [v1.0]+ */+ public function getCustomReport(Request $request): View{$this->authorize('reports.view');$customfields = CustomField::get();@@ -431,12 +436,13 @@ class ReportsController extends Controller* Exports the custom report to CSV** @author [A. Gianotto] [<[email protected]>]+ ** @see ReportsController::getCustomReport() method that generates form view* @since [v1.0]*/- public function postCustom(CustomAssetReportRequest $request) : StreamedResponse+ public function postCustom(CustomAssetReportRequest $request): StreamedResponse{- ini_set('max_execution_time', env('REPORT_TIME_LIMIT', 12000)); //12000 seconds = 200 minutes+ ini_set('max_execution_time', env('REPORT_TIME_LIMIT', 12000)); // 12000 seconds = 200 minutes$this->authorize('reports.view');$this->disableDebugbar();@@ -454,7 +460,7 @@ class ReportsController extends Controller$header = [];- if($request->filled('is_shared')) {+ if ($request->filled('is_shared')) {$header[] = trans('admin/reports/general.share_template');}@@ -536,7 +542,7 @@ class ReportsController extends Controllerif ($request->filled('rtd_location')) {$header[] = trans('admin/hardware/form.default_location');}-+if ($request->filled('rtd_location_address')) {$header[] = trans('general.address');$header[] = trans('general.address');@@ -606,7 +612,7 @@ class ReportsController extends Controllerif ($request->filled('target_notes')) {$header[] = trans('admin/reports/general.custom_export.target_notes');}-+if ($request->filled('status')) {$header[] = trans('general.status');}@@ -651,7 +657,6 @@ class ReportsController extends Controller$header[] = trans('general.url');}-foreach ($customfields as $customfield) {if ($request->input($customfield->db_column_name()) == '1') {$header[] = $customfield->name;@@ -664,17 +669,15 @@ class ReportsController extends Controller$executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'];Log::debug('Added headers: '.$executionTime);- if($request->filled('is_shared')) {- //to fill with logic for the report template and NOT the assets retrieved by the query- //do we scope here or??+ if ($request->filled('is_shared')) {+ // to fill with logic for the report template and NOT the assets retrieved by the query+ // do we scope here or??}--- $assets = Asset::select('assets.*')->with(+ $assets = Asset::select('assets.*')->with('location', 'assetstatus', 'company', 'defaultLoc', 'assignedTo','model.category', 'model.manufacturer', 'supplier');-+if ($request->filled('by_location_id')) {$assets->whereIn('assets.location_id', $request->input('by_location_id'));}@@ -723,7 +726,7 @@ class ReportsController extends Controllerif ($request->filled('purchase_cost_end')) {$assets->whereBetween('assets.purchase_cost', [$request->input('purchase_cost_start'), $request->input('purchase_cost_end')]);} else {- $assets->where('assets.purchase_cost', ">", $request->input('purchase_cost_start'));+ $assets->where('assets.purchase_cost', '>', $request->input('purchase_cost_start'));}}@@ -736,27 +739,27 @@ class ReportsController extends Controllerif (($request->filled('checkout_date_start')) && ($request->filled('checkout_date_end'))) {$checkout_start = Carbon::parse($request->input('checkout_date_start'))->startOfDay();- $checkout_end = Carbon::parse($request->input('checkout_date_end',now()))->endOfDay();+ $checkout_end = Carbon::parse($request->input('checkout_date_end', now()))->endOfDay();- $actionlogassets = Actionlog::where('action_type','=', 'checkout')- ->where('item_type', 'LIKE', '%Asset%',)- ->whereBetween('action_date',[$checkout_start, $checkout_end])- ->pluck('item_id');+ $actionlogassets = Actionlog::where('action_type', '=', 'checkout')+ ->where('item_type', 'LIKE', '%Asset%')+ ->whereBetween('action_date', [$checkout_start, $checkout_end])+ ->pluck('item_id');- $assets->whereIn('assets.id',$actionlogassets);+ $assets->whereIn('assets.id', $actionlogassets);}if (($request->filled('checkin_date_start'))) {$checkin_start = Carbon::parse($request->input('checkin_date_start'))->startOfDay();- // use today's date is `checkin_date_end` is not provided+ // use today's date is `checkin_date_end` is not provided$checkin_end = Carbon::parse($request->input('checkin_date_end', now()))->endOfDay();- $assets->whereBetween('assets.last_checkin', [$checkin_start, $checkin_end ]);+ $assets->whereBetween('assets.last_checkin', [$checkin_start, $checkin_end]);}- //last checkin is exporting, but currently is a date and not a datetime in the custom report ONLY.+ // last checkin is exporting, but currently is a date and not a datetime in the custom report ONLY.if (($request->filled('expected_checkin_start')) && ($request->filled('expected_checkin_end'))) {- $assets->whereBetween('assets.expected_checkin', [$request->input('expected_checkin_start'), $request->input('expected_checkin_end')]);+ $assets->whereBetween('assets.expected_checkin', [$request->input('expected_checkin_start'), $request->input('expected_checkin_end')]);}if (($request->filled('asset_eol_date_start')) && ($request->filled('asset_eol_date_end'))) {@@ -764,10 +767,10 @@ class ReportsController extends Controller}if (($request->filled('last_audit_start')) && ($request->filled('last_audit_end'))) {- $last_audit_start = Carbon::parse($request->input('last_audit_start'))->startOfDay();- $last_audit_end = Carbon::parse($request->input('last_audit_end'))->endOfDay();+ $last_audit_start = Carbon::parse($request->input('last_audit_start'))->startOfDay();+ $last_audit_end = Carbon::parse($request->input('last_audit_end'))->endOfDay();- $assets->whereBetween('assets.last_audit_date', [$last_audit_start, $last_audit_end]);+ $assets->whereBetween('assets.last_audit_date', [$last_audit_start, $last_audit_end]);}if (($request->filled('next_audit_start')) && ($request->filled('next_audit_end'))) {@@ -778,9 +781,9 @@ class ReportsController extends Controller$assets->whereBetween('assets.updated_at', [$request->input('last_updated_start'), $request->input('last_updated_end')]);}- if(($request->filled('last_updated_before'))){+ if (($request->filled('last_updated_before'))) {$last_updated_window = Carbon::parse(today()->subDays($request->input('last_updated_before')));- $assets->where('assets.updated_at', '<' , $last_updated_window);+ $assets->where('assets.updated_at', '<', $last_updated_window);}if ($request->filled('exclude_archived')) {@@ -795,12 +798,12 @@ class ReportsController extends Controller}$assets->orderBy('assets.id', 'ASC')->chunk(500, function ($assets) use ($handle, $customfields, $request) {-+$executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'];Log::debug('Walking results: '.$executionTime);$count = 0;- $formatter = new EscapeFormula("`");+ $formatter = new EscapeFormula('`');foreach ($assets as $asset) {$count++;@@ -871,7 +874,7 @@ class ReportsController extends Controllerif ($request->filled('supplier')) {$row[] = ($asset->supplier) ? $asset->supplier->name : '';}-+if ($request->filled('location')) {$row[] = ($asset->location) ? $asset->location->display_name : '';}@@ -1018,7 +1021,6 @@ class ReportsController extends Controller}}-if ($request->filled('status')) {$row[] = ($asset->assetstatus) ? $asset->assetstatus->name.' ('.$asset->present()->statusMeta.')' : '';}@@ -1062,7 +1064,7 @@ class ReportsController extends Controller}if ($request->filled('url')) {- $row[] = config('app.url').'/hardware/'.$asset->id ;+ $row[] = config('app.url').'/hardware/'.$asset->id;}foreach ($customfields as $customfield) {@@ -1072,12 +1074,11 @@ class ReportsController extends Controller}}-// CSV_ESCAPE_FORMULAS is set to false in the .envif (config('app.escape_formulas') === false) {fputcsv($handle, $row);- // CSV_ESCAPE_FORMULAS is set to true or is not set in the .env+ // CSV_ESCAPE_FORMULAS is set to true or is not set in the .env} else {fputcsv($handle, $formatter->escapeRecord($row));}@@ -1103,9 +1104,10 @@ class ReportsController extends Controller* getImprovementsReport** @author Vincent Sposato <[email protected]>+ ** @version v1.0*/- public function getMaintenancesReport() : View+ public function getMaintenancesReport(): View{$this->authorize('reports.view');@@ -1116,15 +1118,16 @@ class ReportsController extends Controller* exportImprovementsReport** @author Vincent Sposato <[email protected]>+ ** @version v1.0*/- public function exportMaintenancesReport() : Response+ public function exportMaintenancesReport(): Response{$this->authorize('reports.view');// Grab all the improvements$Maintenances = Maintenance::with('asset', 'supplier')- ->orderBy('created_at', 'DESC')- ->get();+ ->orderBy('created_at', 'DESC')+ ->get();$rows = [];@@ -1158,13 +1161,13 @@ class ReportsController extends Controller} else {$improvementTime = (int) $maintenance->asset_maintenance_time;}- $row[] = $improvementTime;- $row[] = trans('general.currency') . Helper::formatCurrencyOutput($maintenance->cost);+ $row[] = $improvementTime;+ $row[] = trans('general.currency').Helper::formatCurrencyOutput($maintenance->cost);$rows[] = implode(',', $row);}// spit out a csv- $csv = implode("\n", $rows);+ $csv = implode("\n", $rows);$response = response()->make($csv, 200);$response->header('Content-Type', 'text/csv');$response->header('Content-disposition', 'attachment;filename=report.csv');@@ -1176,9 +1179,10 @@ class ReportsController extends Controller* getAssetAcceptanceReport** @author Vincent Sposato <[email protected]>+ ** @version v1.0*/- public function getAssetAcceptanceReport($deleted = false) : View+ public function getAssetAcceptanceReport($deleted = false): View{$this->authorize('reports.view');$showDeleted = $deleted == 'deleted';@@ -1188,18 +1192,17 @@ class ReportsController extends Controller'checkoutable' => function (MorphTo $query) {$query->withTrashed()->morphWith([Asset::class => ['model.category', 'assignedTo', 'company'],- Accessory::class => ['category','checkouts', 'company'],+ Accessory::class => ['category', 'checkouts', 'company'],LicenseSeat::class => ['user', 'license'],Component::class => ['assignedTo', 'company'],Consumable::class => ['company'],]);},- 'assignedTo' => function($query){- $query->withTrashed();- }+ 'assignedTo' => function ($query) {+ $query->withTrashed();+ },])->orderByDesc('checkout_acceptances.created_at');-if ($showDeleted) {$query->withTrashed();}@@ -1208,16 +1211,17 @@ class ReportsController extends Controller->filter(fn ($unaccepted) => $unaccepted->checkoutable)->map(fn ($unaccepted) => Checkoutable::fromAcceptance($unaccepted));- return view('reports/unaccepted_assets', compact('itemsForReport','showDeleted' ));+ return view('reports/unaccepted_assets', compact('itemsForReport', 'showDeleted'));}/*** sentAssetAcceptanceReminder*- * @param integer|null $acceptanceId+ * @param int|null $acceptanceId+ ** @version v1.0*/- public function sentAssetAcceptanceReminder(Request $request) : RedirectResponse+ public function sentAssetAcceptanceReminder(Request $request): RedirectResponse{$this->authorize('reports.view');$id = $request->input('acceptance_id');@@ -1225,41 +1229,43 @@ class ReportsController extends Controller->with(['checkoutable' => function (MorphTo $query) {$query->withTrashed()->morphWith([- Asset::class => ['model.category', 'assignedTo', 'company', 'checkouts'],- Accessory::class => ['category', 'company', 'checkouts'],+ Asset::class => ['model.category', 'assignedTo', 'company', 'checkouts'],+ Accessory::class => ['category', 'company', 'checkouts'],LicenseSeat::class => ['user', 'license', 'checkouts'],- Component::class => ['assignedTo', 'company', 'checkouts'],- Consumable::class => ['company', 'checkouts'],+ Component::class => ['assignedTo', 'company', 'checkouts'],+ Consumable::class => ['company', 'checkouts'],]);},'assignedTo' => fn ($q) => $q->withTrashed(),])->pending();$acceptance = $query->find($id);- if (!$acceptance) {+ if (! $acceptance) {Log::debug('No pending acceptances');+// Redirect to the unaccepted items report page with errorreturn redirect()->route('reports/unaccepted_assets')->with('error', trans('general.bad_data'));}- $item = $acceptance->checkoutable;- $assignee = $acceptance->assignedTo ?? $item->assignedTo ?? null;- $email = $assignee?->email;- $locale = $assignee?->locale;+ $item = $acceptance->checkoutable;+ $assignee = $acceptance->assignedTo ?? $item->assignedTo ?? null;+ $email = $assignee?->email;+ $locale = $assignee?->locale;Log::debug(print_r($acceptance, true));- if (is_null($acceptance->created_at)){+ if (is_null($acceptance->created_at)) {Log::debug('No acceptance created_at');+return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.bad_data'));} else {- if($item instanceof LicenseSeat){+ if ($item instanceof LicenseSeat) {$logItem_res = $item->license->checkouts()->with('adminuser')->where('created_at', '=', $acceptance->created_at)->get();- }- else{+ } else {$logItem_res = $item->checkouts()->with('adminuser')->where('created_at', '=', $acceptance->created_at)->get();- }- if ($logItem_res->isEmpty()){+ }+ if ($logItem_res->isEmpty()) {Log::debug('Acceptance date mismatch');+return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.bad_data'));}$logItem = $logItem_res[0];@@ -1273,7 +1279,8 @@ class ReportsController extends Controllerreturn redirect()->route('reports/unaccepted_assets')->with('success', trans('admin/reports/general.reminder_sent'));}- private function getCheckoutMailType(CheckoutAcceptance $acceptance, $logItem) : Mailable++ private function getCheckoutMailType(CheckoutAcceptance $acceptance, $logItem): Mailable{$lookup = [Accessory::class => CheckoutAccessoryMail::class,@@ -1282,7 +1289,7 @@ class ReportsController extends ControllerConsumable::class => CheckoutConsumableMail::class,Component::class => CheckoutComponentMail::class,];- $mailable= $lookup[get_class($acceptance->checkoutable)];+ $mailable = $lookup[get_class($acceptance->checkoutable)];return new $mailable($acceptance->checkoutable,@@ -1293,22 +1300,24 @@ class ReportsController extends ControllerfirstTimeSending: false,);}+/*** sentAssetAcceptanceReminder*- * @param integer|null $acceptanceId+ * @param int|null $acceptanceId+ ** @version v1.0*/- public function deleteAssetAcceptance($acceptanceId = null) : RedirectResponse+ public function deleteAssetAcceptance($acceptanceId = null): RedirectResponse{$this->authorize('reports.view');- if (!$acceptance = CheckoutAcceptance::pending()->find($acceptanceId)) {+ if (! $acceptance = CheckoutAcceptance::pending()->find($acceptanceId)) {// Redirect to the unaccepted assets report page with errorreturn redirect()->route('reports/unaccepted_assets')->with('error', trans('general.bad_data'));}- if($acceptance->delete()) {+ if ($acceptance->delete()) {return redirect()->route('reports/unaccepted_assets')->with('success', trans('admin/reports/general.acceptance_deleted'));} else {return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.deletion_failed'));@@ -1319,38 +1328,38 @@ class ReportsController extends Controller* Exports the AssetAcceptance report to CSV** @author Vincent Sposato <[email protected]>+ ** @version v1.0*/- public function postAssetAcceptanceReport($deleted = false) : Response+ public function postAssetAcceptanceReport($deleted = false): Response{$this->authorize('reports.view');- $showDeleted = request('deleted') === 'deleted';;+ $showDeleted = request('deleted') === 'deleted';/*** Get all assets with pending checkout acceptances*/+ $acceptances = CheckoutAcceptance::pending()+ ->with([+ 'checkoutable' => function (MorphTo $acceptance) {+ $acceptance->withTrashed()->morphWith([+ Asset::class => ['model.category', 'assignedTo', 'company'],+ Accessory::class => ['category', 'checkouts', 'company'],+ LicenseSeat::class => ['user', 'license'],+ Component::class => ['assignedTo', 'company'],+ Consumable::class => ['company'],+ ]);+ },+ 'assignedTo',+ ])->orderByDesc('checkout_acceptances.created_at');- $acceptances = CheckoutAcceptance::pending()- ->with([- 'checkoutable' => function (MorphTo $acceptance) {- $acceptance->withTrashed()->morphWith([- Asset::class => ['model.category', 'assignedTo', 'company'],- Accessory::class => ['category','checkouts', 'company'],- LicenseSeat::class => ['user', 'license'],- Component::class => ['assignedTo', 'company'],- Consumable::class => ['company'],- ]);- },- 'assignedTo',- ])->orderByDesc('checkout_acceptances.created_at');-- if ($showDeleted) {- $acceptances->withTrashed();- }+ if ($showDeleted) {+ $acceptances->withTrashed();+ }$itemsForReport = $acceptances->get()- ->filter(fn ($unaccepted) => $unaccepted->checkoutable)- ->map(fn ($unaccepted) => Checkoutable::fromAcceptance($unaccepted));+ ->filter(fn ($unaccepted) => $unaccepted->checkoutable)+ ->map(fn ($unaccepted) => Checkoutable::fromAcceptance($unaccepted));$rows = [];@@ -1370,23 +1379,23 @@ class ReportsController extends Controllerforeach ($itemsForReport as $item) {- if ($item != null){-- $row = [ ];- $row[] = str_replace(',', '', $item->acceptance->created_at);- $row[] = str_replace(',', '', $item->type);- $row[] = str_replace(',', '', $item->plain_text_company);- $row[] = str_replace(',', '', $item->plain_text_category);- $row[] = str_replace(',', '', $item->plain_text_model);- $row[] = str_replace(',', '', $item->plain_text_name);- $row[] = str_replace(',', '', $item->asset_tag);- $row[] = str_replace(',', '', ($item->acceptance->assignedto) ? $item->acceptance->assignedto->display_name : trans('admin/reports/general.deleted_user'));+ if ($item != null) {++ $row = [];+ $row[] = str_replace(',', '', $item->acceptance->created_at);+ $row[] = str_replace(',', '', $item->type);+ $row[] = str_replace(',', '', $item->plain_text_company);+ $row[] = str_replace(',', '', $item->plain_text_category);+ $row[] = str_replace(',', '', $item->plain_text_model);+ $row[] = str_replace(',', '', $item->plain_text_name);+ $row[] = str_replace(',', '', $item->asset_tag);+ $row[] = str_replace(',', '', ($item->acceptance->assignedto) ? $item->acceptance->assignedto->display_name : trans('admin/reports/general.deleted_user'));$rows[] = implode(',', $row);}}// spit out a csv- $csv = implode("\n", $rows);+ $csv = implode("\n", $rows);$response = response()->make($csv, 200);$response->header('Content-Type', 'text/csv');$response->header('Content-disposition', 'attachment;filename=report.csv');@@ -1397,20 +1406,21 @@ class ReportsController extends Controller/*** getCheckedOutAssetsRequiringAcceptance*- * @param $modelsInCategoriesThatRequireAcceptance** @return array+ ** @author Vincent Sposato <[email protected]>+ ** @version v1.0*/- protected function getCheckedOutAssetsRequiringAcceptance($modelsInCategoriesThatRequireAcceptance) : View+ protected function getCheckedOutAssetsRequiringAcceptance($modelsInCategoriesThatRequireAcceptance): View{$this->authorize('reports.view');$assets = Asset::deployed()- ->inModelList($modelsInCategoriesThatRequireAcceptance)- ->select('id')- ->get()- ->toArray();+ ->inModelList($modelsInCategoriesThatRequireAcceptance)+ ->select('id')+ ->get()+ ->toArray();return array_pluck($assets, 'id');}@@ -1418,45 +1428,45 @@ class ReportsController extends Controller/*** getModelsInCategoriesThatRequireAcceptance*- * @param $assetCategoriesRequiringAcceptance- * @return array* @author Vincent Sposato <[email protected]>+ ** @version v1.0*/- protected function getModelsInCategoriesThatRequireAcceptance($assetCategoriesRequiringAcceptance) : array+ protected function getModelsInCategoriesThatRequireAcceptance($assetCategoriesRequiringAcceptance): array{$this->authorize('reports.view');return array_pluck(AssetModel::inCategory($assetCategoriesRequiringAcceptance)- ->select('id')- ->get()- ->toArray(), 'id');+ ->select('id')+ ->get()+ ->toArray(), 'id');}/*** getCategoriesThatRequireAcceptance*- * @return array* @author Vincent Sposato <[email protected]>+ ** @version v1.0*/- protected function getCategoriesThatRequireAcceptance() : array+ protected function getCategoriesThatRequireAcceptance(): array{$this->authorize('reports.view');return array_pluck(Category::requiresAcceptance()- ->select('id')- ->get()- ->toArray(), 'id');+ ->select('id')+ ->get()+ ->toArray(), 'id');}/*** getAssetsCheckedOutRequiringAcceptance** @author Vincent Sposato <[email protected]>+ ** @version v1.0*/- protected function getAssetsCheckedOutRequiringAcceptance() : array+ protected function getAssetsCheckedOutRequiringAcceptance(): array{$this->authorize('reports.view');diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.phpindex 248d8866c3..ebc6c8d352 100644--- a/app/Http/Controllers/SettingsController.php+++ b/app/Http/Controllers/SettingsController.php@@ -17,6 +17,7 @@ use App\Models\Group;use App\Models\Setting;use App\Models\User;use App\Notifications\MailTest;+use Illuminate\Contracts\View\View;use Illuminate\Http\JsonResponse;use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;@@ -30,7 +31,6 @@ use Illuminate\Support\Facades\Validator;use Illuminate\Support\Str;use Illuminate\Validation\Rule;use Symfony\Component\HttpFoundation\BinaryFileResponse;-use \Illuminate\Contracts\View\View;/*** This controller handles all actions related to Settings for@@ -40,7 +40,6 @@ use \Illuminate\Contracts\View\View;*/class SettingsController extends Controller{-/*** Return a view that shows some of the key settings.*@@ -48,14 +47,13 @@ class SettingsController extends Controller** @since [v1.0]*/- public function index() : View+ public function index(): View{$settings = Setting::getSettings();return view('settings/index', compact('settings'));}-/*** Return a form to allow a super admin to update settings.*@@ -63,9 +61,10 @@ class SettingsController extends Controller** @since [v1.0]*/- public function getSettings() : View+ public function getSettings(): View{$setting = Setting::getSettings();+return view('settings/general', compact('setting'));}@@ -76,8 +75,7 @@ class SettingsController extends Controller** @since [v1.0]*/- public function postSettings(Request $request) : RedirectResponse-+ public function postSettings(Request $request): RedirectResponse{if (is_null($setting = Setting::getSettings())) {return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));@@ -94,7 +92,7 @@ class SettingsController extends Controller$setting->scope_locations_fmcs = $request->input('scope_locations_fmcs', '0');// Backward compatibility for locations makes no sense without FullMultipleCompanySupport- if (!$setting->full_multiple_companies_support) {+ if (! $setting->full_multiple_companies_support) {$setting->scope_locations_fmcs = '0';}@@ -129,7 +127,6 @@ class SettingsController extends Controller$setting->require_checkinout_notes = $request->input('require_checkinout_notes', 0);$setting->manager_view_enabled = $request->input('manager_view_enabled', 0);-if ($request->input('per_page') != '') {$setting->per_page = $request->input('per_page');} else {@@ -144,7 +141,6 @@ class SettingsController extends Controllerreturn redirect()->back()->withInput()->withErrors($setting->getErrors());}-/*** Return a form to allow a super admin to update settings.*@@ -152,7 +148,7 @@ class SettingsController extends Controller** @since [v1.0]*/- public function getBranding() : View+ public function getBranding(): View{$setting = Setting::getSettings();@@ -166,7 +162,7 @@ class SettingsController extends Controller** @since [v1.0]*/- public function postBranding(ImageUploadRequest $request) : RedirectResponse+ public function postBranding(ImageUploadRequest $request): RedirectResponse{// Something has gone horribly wrong - no settings record exists!if (is_null($setting = Setting::getSettings())) {@@ -185,7 +181,7 @@ class SettingsController extends Controller// Only allow the site name, images, and CSS to be changed if lock_passwords is false// Because public demos make people act like dicks- if (!config('app.lock_passwords')) {+ if (! config('app.lock_passwords')) {if ($request->has('site_name')) {$request->validate(['site_name' => 'required']);@@ -195,7 +191,7 @@ class SettingsController extends Controller$setting->link_light_color = $request->input('link_light_color', '#296282');$setting->link_dark_color = $request->input('link_dark_color', '#5fa4cc');$setting->nav_link_color = $request->input('nav_link_color', '#FFFFFF');-+$setting->site_name = $request->input('site_name', 'Snipe-IT');$setting->custom_css = $request->input('custom_css');@@ -215,7 +211,7 @@ class SettingsController extends Controller$setting->email_logo = null;}- // Label logo upload+ // Label logo upload$setting = $request->handleImages($setting, 600, 'label_logo', '', 'label_logo');if ($request->input('clear_label_logo') == '1') {@@ -225,30 +221,29 @@ class SettingsController extends Controller// Acceptance PDF upload$setting = $request->handleImages($setting, 600, 'acceptance_pdf_logo', '', 'acceptance_pdf_logo');- if ('1' == $request->input('clear_acceptance_pdf_logo')) {+ if ($request->input('clear_acceptance_pdf_logo') == '1') {$setting = $request->deleteExistingImage($setting, '', 'acceptance_pdf_logo');$setting->acceptance_pdf_logo = null;}// Favicon upload$setting = $request->handleImages($setting, 100, 'favicon', '', 'favicon');- if ('1' == $request->input('clear_favicon')) {+ if ($request->input('clear_favicon') == '1') {$setting = $request->deleteExistingImage($setting, '', 'favicon');$setting->favicon = null;}-// Default avatar upload$setting = $request->handleImages($setting, 500, 'default_avatar', 'avatars', 'default_avatar');- if ($request->input('clear_default_avatar') == '1') {+ if ($request->input('clear_default_avatar') == '1') {// Don't delete the file, just update the field if this is the default- if ($setting->default_avatar!='default.png') {+ if ($setting->default_avatar != 'default.png') {$setting = $request->deleteExistingImage($setting, 'avatars', 'default_avatar');}$setting->default_avatar = null;}- if ($request->input('restore_default_avatar') == '1') {+ if ($request->input('restore_default_avatar') == '1') {$setting->default_avatar = 'default.png';}}@@ -261,7 +256,6 @@ class SettingsController extends Controllerreturn redirect()->back()->withInput()->withErrors($setting->getErrors());}-/*** Return a form to allow a super admin to update settings.*@@ -269,7 +263,7 @@ class SettingsController extends Controller** @since [v1.0]*/- public function getSecurity() : View+ public function getSecurity(): View{$setting = Setting::getSettings();@@ -283,7 +277,7 @@ class SettingsController extends Controller** @since [v1.0]*/- public function postSecurity(StoreSecuritySettings $request) : RedirectResponse+ public function postSecurity(StoreSecuritySettings $request): RedirectResponse{$this->validate($request, ['pwd_secure_complexity' => 'array',@@ -294,15 +288,15 @@ class SettingsController extends Controller'numbers','symbols','case_diff',- ])- ]+ ]),+ ],]);if (is_null($setting = Setting::getSettings())) {return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));}if (! config('app.lock_passwords')) {- if ('' == $request->input('two_factor_enabled')) {+ if ($request->input('two_factor_enabled') == '') {$setting->two_factor_enabled = null;} else {$setting->two_factor_enabled = $request->input('two_factor_enabled');@@ -319,7 +313,6 @@ class SettingsController extends Controller$setting->pwd_secure_min = (int) $request->input('pwd_secure_min');$setting->pwd_secure_complexity = '';-if ($request->filled('pwd_secure_complexity')) {$setting->pwd_secure_complexity = implode('|', $request->input('pwd_secure_complexity'));}@@ -339,7 +332,7 @@ class SettingsController extends Controller** @since [v1.0]*/- public function getLocalization() : View+ public function getLocalization(): View{$setting = Setting::getSettings();@@ -353,7 +346,7 @@ class SettingsController extends Controller** @since [v1.0]*/- public function postLocalization(StoreLocalizationSettings $request) : RedirectResponse+ public function postLocalization(StoreLocalizationSettings $request): RedirectResponse{if (is_null($setting = Setting::getSettings())) {return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));@@ -384,7 +377,7 @@ class SettingsController extends Controller** @since [v1.0]*/- public function getAlerts() : View+ public function getAlerts(): View{$setting = Setting::getSettings();@@ -395,31 +388,31 @@ class SettingsController extends Controller* Return a form to allow a super admin to update settings.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]*/- public function postAlerts(StoreNotificationSettings $request) : RedirectResponse+ public function postAlerts(StoreNotificationSettings $request): RedirectResponse{if (is_null($setting = Setting::getSettings())) {return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));}-// Check if the audit interval has changed - if it has, check if we should update all of the assets audit datesif ((($request->input('audit_interval') != $setting->audit_interval)) && ($request->input('update_existing_dates') == 1)) {- // This could be a negative number if the user is trying to set the audit interval to a lower number than it was before- $audit_diff_months = ((int)$request->input('audit_interval') - (int)($setting->audit_interval));+ // This could be a negative number if the user is trying to set the audit interval to a lower number than it was before+ $audit_diff_months = ((int) $request->input('audit_interval') - (int) ($setting->audit_interval));- // Batch update the dates. We have to use this method to avoid time limit exceeded errors on very large datasets,- // but it DOES mean this change doesn't get logged in the action logs, since it skips the observer.- // @see https://stackoverflow.com/questions/54879160/laravel-observer-not-working-on-bulk-insert- $affected = Asset::whereNotNull('next_audit_date')- ->whereNull('deleted_at')- ->update(- ['next_audit_date' => DB::raw('DATE_ADD(next_audit_date, INTERVAL ' . $audit_diff_months . ' MONTH)')]- );+ // Batch update the dates. We have to use this method to avoid time limit exceeded errors on very large datasets,+ // but it DOES mean this change doesn't get logged in the action logs, since it skips the observer.+ // @see https://stackoverflow.com/questions/54879160/laravel-observer-not-working-on-bulk-insert+ $affected = Asset::whereNotNull('next_audit_date')+ ->whereNull('deleted_at')+ ->update(+ ['next_audit_date' => DB::raw('DATE_ADD(next_audit_date, INTERVAL '.$audit_diff_months.' MONTH)')]+ );- Log::debug($affected . ' assets affected by audit interval update');+ Log::debug($affected.' assets affected by audit interval update');}$alert_email = rtrim($request->input('alert_email'), ',');@@ -453,7 +446,7 @@ class SettingsController extends Controller** @since [v1.0]*/- public function getSlack() : View+ public function getSlack(): View{$setting = Setting::getSettings();@@ -467,7 +460,7 @@ class SettingsController extends Controller** @since [v1.0]*/- public function getAssetTags() : View+ public function getAssetTags(): View{$setting = Setting::getSettings();@@ -481,7 +474,7 @@ class SettingsController extends Controller** @since [v1.0]*/- public function postAssetTags(Request $request) : RedirectResponse+ public function postAssetTags(Request $request): RedirectResponse{if (is_null($setting = Setting::getSettings())) {return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));@@ -507,7 +500,7 @@ class SettingsController extends Controller** @since [v4.0]*/- public function getPhpInfo() : View | RedirectResponse+ public function getPhpInfo(): View|RedirectResponse{if (config('app.debug') === true) {return view('settings.phpinfo');@@ -521,9 +514,10 @@ class SettingsController extends Controller* Return a form to allow a super admin to update settings.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]*/- public function getLabels() : View+ public function getLabels(): View{$is_gd_installed = extension_loaded('gd');@@ -537,9 +531,10 @@ class SettingsController extends Controller* Saves settings from form.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]*/- public function postLabels(StoreLabelSettings $request) : RedirectResponse+ public function postLabels(StoreLabelSettings $request): RedirectResponse{if (is_null($setting = Setting::getSettings())) {return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));@@ -568,11 +563,11 @@ class SettingsController extends Controller$setting->labels_pageheight = $request->input('labels_pageheight');$setting->labels_display_company_name = $request->input('labels_display_company_name', '0');- //Barcodes+ // Barcodes$setting->qr_code = $request->input('qr_code', '0');- //1D-Barcode+ // 1D-Barcode$setting->alt_barcode_enabled = $request->input('alt_barcode_enabled', '0');- //QR-Code+ // QR-Code$setting->qr_text = $request->input('qr_text');if ($request->filled('labels_display_name')) {@@ -621,10 +616,11 @@ class SettingsController extends Controller** @since [v4.0]*/- public function getLdapSettings() : View+ public function getLdapSettings(): View{$setting = Setting::getSettings();$groups = Group::pluck('name', 'id');+return view('settings.ldap', compact('setting', 'groups'));}@@ -632,9 +628,10 @@ class SettingsController extends Controller* Saves settings from form.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]*/- public function postLdapSettings(StoreLdapSettings $request) : RedirectResponse+ public function postLdapSettings(StoreLdapSettings $request): RedirectResponse{if (is_null($setting = Setting::getSettings())) {return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));@@ -678,8 +675,8 @@ class SettingsController extends Controller$setting->ldap_country = $request->input('ldap_country');$setting->ldap_location = $request->input('ldap_location');$setting->ldap_dept = $request->input('ldap_dept');- $setting->ldap_client_tls_cert = $request->input('ldap_client_tls_cert');- $setting->ldap_client_tls_key = $request->input('ldap_client_tls_key');+ $setting->ldap_client_tls_cert = $request->input('ldap_client_tls_cert');+ $setting->ldap_client_tls_key = $request->input('ldap_client_tls_key');}if ($setting->save()) {@@ -694,11 +691,13 @@ class SettingsController extends Controller* Return a form to allow a super admin to update settings.** @author Johnson Yi <[email protected]>+ ** @since v5.0.0*/- public function getSamlSettings() : View+ public function getSamlSettings(): View{$setting = Setting::getSettings();+return view('settings.saml', compact('setting'));}@@ -706,10 +705,11 @@ class SettingsController extends Controller* Saves settings from form.** @author Johnson Yi <[email protected]>+ ** @since v5.0.0*/- public function postSamlSettings(SettingsSamlRequest $request) : RedirectResponse- {+ public function postSamlSettings(SettingsSamlRequest $request): RedirectResponse+ {if (is_null($setting = Setting::getSettings())) {return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));}@@ -741,22 +741,24 @@ class SettingsController extends Controller/*** Do we need this? Can we not just call getSettings() directly?*/- public static function getPDFBranding() : Setting+ public static function getPDFBranding(): Setting{$pdf_branding = Setting::getSettings();+return $pdf_branding;}-/*** Show Google login settings form** @author [A. Gianotto] [<[email protected]>]+ ** @since [v6.1.1]*/- public function getGoogleLoginSettings() : View+ public function getGoogleLoginSettings(): View{$setting = Setting::getSettings();+return view('settings.google', compact('setting'));}@@ -764,11 +766,12 @@ class SettingsController extends Controller* ShSaveow Google login settings form** @author [A. Gianotto] [<[email protected]>]+ ** @since [v6.1.1]*/- public function postGoogleLoginSettings(Request $request) : RedirectResponse+ public function postGoogleLoginSettings(Request $request): RedirectResponse{- if (!config('app.lock_passwords')) {+ if (! config('app.lock_passwords')) {$setting = Setting::getSettings();$setting->google_login = $request->input('google_login', 0);@@ -786,7 +789,6 @@ class SettingsController extends Controllerreturn redirect()->back()->with('error', trans('general.feature_disabled'));}-/*** Show the listing of backups.*@@ -794,7 +796,7 @@ class SettingsController extends Controller** @since [v1.8]*/- public function getBackups() : View+ public function getBackups(): View{$settings = Setting::getSettings();$path = 'app/backups';@@ -806,7 +808,7 @@ class SettingsController extends Controller// Skip dotfiles like .gitignore and .DS_STOREif ((substr(basename($backup_files[$f]), 0, 1) != '.')) {- //$lastmodified = Carbon::parse(Storage::lastModified($backup_files[$f]))->toDatetimeString();+ // $lastmodified = Carbon::parse(Storage::lastModified($backup_files[$f]))->toDatetimeString();$file_timestamp = Storage::lastModified($backup_files[$f]);$files_raw[] = [@@ -830,9 +832,10 @@ class SettingsController extends Controller* Process the backup.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.8]*/- public function postBackups() : RedirectResponse+ public function postBackups(): RedirectResponse{if (! config('app.lock_passwords')) {Artisan::call('snipeit:backup', ['--filename' => 'manual-backup-'.date('Y-m-d-H-i-s')]);@@ -861,15 +864,17 @@ class SettingsController extends Controller* Download the backup file.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.8]*/- public function downloadFile($filename = null) : RedirectResponse | BinaryFileResponse+ public function downloadFile($filename = null): RedirectResponse|BinaryFileResponse{$path = 'app/backups';if (! config('app.lock_passwords')) {if (Storage::exists($path.'/'.$filename)) {Log::warning('User '.auth()->user()->username.' is attempting to download backup file: '.$filename);+return StorageHelper::downloader($path.'/'.$filename);} else {// Redirect to the backup page@@ -885,20 +890,22 @@ class SettingsController extends Controller* Delete the backup file.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.8]*/- public function deleteFile($filename = null) : RedirectResponse+ public function deleteFile($filename = null): RedirectResponse{- if (config('app.allow_backup_delete')=='true') {+ if (config('app.allow_backup_delete') == 'true') {- if (!config('app.lock_passwords')) {+ if (! config('app.lock_passwords')) {$path = 'app/backups';- if (Storage::exists($path . '/' . $filename)) {+ if (Storage::exists($path.'/'.$filename)) {try {Log::warning('User '.auth()->user()->username.' is attempting to delete backup file: '.$filename);- Storage::delete($path . '/' . $filename);+ Storage::delete($path.'/'.$filename);+return redirect()->route('settings.backups.index')->with('success', trans('admin/settings/message.backup.file_deleted'));} catch (\Exception $e) {Log::debug($e);@@ -913,22 +920,22 @@ class SettingsController extends Controller// Hell to the noLog::warning('User ID '.auth()->id().' is attempting to delete backup file '.$filename.' and is not authorized to.');+return redirect()->route('settings.backups.index')->with('error', trans('general.backup_delete_not_allowed'));}-/*** Uploads a backup file** @author [A. Gianotto] [<[email protected]>]+ ** @since [v6.0]*/-- public function postUploadBackup(Request $request) : RedirectResponse+ public function postUploadBackup(Request $request): RedirectResponse{if (! config('app.lock_passwords')) {- if (!$request->hasFile('file')) {+ if (! $request->hasFile('file')) {return redirect()->route('settings.backups.index')->with('error', 'No file uploaded');} else {@@ -939,11 +946,11 @@ class SettingsController extends Controllerif ($validator->passes()) {- $upload_filename = 'uploaded-'.date('U').'-'.Str::slug(pathinfo($request->file('file')->getClientOriginalName(), PATHINFO_FILENAME)).'.zip';+ $upload_filename = 'uploaded-'.date('U').'-'.Str::slug(pathinfo($request->file('file')->getClientOriginalName(), PATHINFO_FILENAME)).'.zip';- Storage::putFileAs('app/backups', $request->file('file'), $upload_filename);+ Storage::putFileAs('app/backups', $request->file('file'), $upload_filename);- return redirect()->route('settings.backups.index')->with('success', 'File uploaded');+ return redirect()->route('settings.backups.index')->with('success', 'File uploaded');}return redirect()->route('settings.backups.index')->withErrors($validator);@@ -957,6 +964,7 @@ class SettingsController extends Controller* Restore the backup file.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v6.0]*/public function postRestore(Request $request, $filename = null): RedirectResponse@@ -972,28 +980,27 @@ class SettingsController extends Controller// TODO: run a backup-Artisan::call('db:wipe', ['--force' => true,]);- Log::warning('User '.auth()->user()->username.' is attempting to restore from: '. storage_path($path).'/'.$filename);+ Log::warning('User '.auth()->user()->username.' is attempting to restore from: '.storage_path($path).'/'.$filename);$restore_params = ['--force' => true,'--no-progress' => true,- 'filename' => storage_path($path) . '/' . $filename+ 'filename' => storage_path($path).'/'.$filename,];if ($request->input('clean')) {Log::debug("Attempting 'clean' - first, guessing prefix...");Artisan::call('snipeit:restore', ['--sanitize-guess-prefix' => true,- 'filename' => storage_path($path) . '/' . $filename+ 'filename' => storage_path($path).'/'.$filename,]);$guess_prefix_output = Artisan::output();Log::debug("Sanitize output is: $guess_prefix_output");- list($prefix, $_output) = explode("\n", $guess_prefix_output);+ [$prefix, $_output] = explode("\n", $guess_prefix_output);Log::debug("prefix is: '$prefix'");$restore_params['--sanitize-with-prefix'] = $prefix;}@@ -1014,12 +1021,12 @@ class SettingsController extends Controller$find_user = DB::table('users')->where('username', $user->username)->exists();- if (!$find_user){- Log::warning('Attempting to restore user: ' . $user->username);+ if (! $find_user) {+ Log::warning('Attempting to restore user: '.$user->username);$new_user = $user->replicate();$new_user->push();} else {- Log::debug('User: ' . $user->username .' already exists.');+ Log::debug('User: '.$user->username.' already exists.');}Log::debug('Logging all users out..');@@ -1044,12 +1051,12 @@ class SettingsController extends Controller** @since [v4.0]*/- public function getPurge() : View | RedirectResponse+ public function getPurge(): View|RedirectResponse{Log::warning('User '.auth()->user()->username.' (ID: '.auth()->id().') is attempting a PURGE');- if (config('app.allow_purge')=='true') {+ if (config('app.allow_purge') == 'true') {return view('settings.purge-form');}@@ -1060,20 +1067,21 @@ class SettingsController extends Controller* Purges soft-deletes.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v3.0]*/- public function postPurge(Request $request) : RedirectResponse+ public function postPurge(Request $request): RedirectResponse{Log::warning('User '.auth()->user()->username.' (ID'.auth()->id().') is attempting a PURGE');- if (config('app.allow_purge')=='true') {+ if (config('app.allow_purge') == 'true') {Log::debug('Purging is not allowed via the .env');- if (!config('app.lock_passwords')) {+ if (! config('app.lock_passwords')) {- if ($request->input('confirm_purge')=='DELETE') {+ if ($request->input('confirm_purge') == 'DELETE') {- Log::warning('User ID ' . auth()->id() . ' initiated a PURGE!');+ Log::warning('User ID '.auth()->id().' initiated a PURGE!');// Run a backup immediately before processingArtisan::call('backup:run');Artisan::call('snipeit:purge', ['--force' => 'true', '--no-interaction' => true]);@@ -1093,7 +1101,6 @@ class SettingsController extends ControllerLog::error('User '.auth()->user()->username.' (ID'.auth()->id().') is attempting to purge deleted data and is not authorized to.');-// Nope.return redirect()->route('settings.index')->with('error', trans('general.purge_not_allowed'));@@ -1106,9 +1113,10 @@ class SettingsController extends Controller* in the routes file if you want to be able to cache the routes.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v4.0]*/- public function api() : View+ public function api(): View{return view('settings.api');}@@ -1117,32 +1125,33 @@ class SettingsController extends Controller* Test the email configuration.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v3.0]*/- public function ajaxTestEmail() : JsonResponse+ public function ajaxTestEmail(): JsonResponse{try {- (new User())->forceFill([- 'name' => config('mail.from.name'),+ (new User)->forceFill([+ 'name' => config('mail.from.name'),'email' => config('mail.from.address'),- ])->notify(new MailTest());+ ])->notify(new MailTest);Log::debug('Attempting to send mail to '.config('mail.from.address'));+return response()->json(Helper::formatStandardApiResponse('success', null, trans('mail_sent.mail_sent')));} catch (\Exception $e) {- Log::error('Mail sent from '.config('mail.from.address') .' with errors '. $e->getMessage());+ Log::error('Mail sent from '.config('mail.from.address').' with errors '.$e->getMessage());Log::debug($e);+return response()->json(Helper::formatStandardApiResponse('success', null, $e->getMessage()));}}--/*** Get login attempts view** @author [A. Gianotto] [<[email protected]>]*/- public function getLoginAttempts() : View+ public function getLoginAttempts(): View{return view('settings.logins');}diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.phpindex a81da7b9ff..69b6f655ed 100644--- a/app/Http/Controllers/SetupController.php+++ b/app/Http/Controllers/SetupController.php@@ -6,7 +6,9 @@ use App\Http\Requests\SetupUserRequest;use App\Models\Setting;use App\Models\User;use App\Notifications\FirstAdminNotification;+use Illuminate\Contracts\View\View;use Illuminate\Http\RedirectResponse;+use Illuminate\Http\Response;use Illuminate\Support\Facades\App;use Illuminate\Support\Facades\Artisan;use Illuminate\Support\Facades\Auth;@@ -15,8 +17,6 @@ use Illuminate\Support\Facades\File;use Illuminate\Support\Facades\Http;use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\URL;-use \Illuminate\Contracts\View\View;-/*** This controller handles all actions related to Settings for@@ -34,9 +34,9 @@ class SetupController extends Controller** @since [v3.0]*- * @return \Illuminate\Contracts\View\View | \Illuminate\Http\Response+ * @return View | Response*/- public function getSetupIndex() : View+ public function getSetupIndex(): View{$start_settings['php_version_min'] = false;@@ -55,22 +55,22 @@ class SetupController extends Controller$start_settings['db_error'] = $e->getMessage();}- $start_settings['url_config'] = trim(config('app.url'), '/'). '/setup';- $start_settings['real_url'] = request()->url();+ $start_settings['url_config'] = trim(config('app.url'), '/').'/setup';+ $start_settings['real_url'] = request()->url();$start_settings['url_valid'] = $start_settings['url_config'] === $start_settings['real_url'];$start_settings['php_version_min'] = true;// Curl the .env file to make sure it's not accessible via a browser$start_settings['env_exposed'] = $this->dotEnvFileIsExposed();- if (App::Environment('production') && (true == config('app.debug'))) {+ if (App::Environment('production') && (config('app.debug') == true)) {$start_settings['debug_exposed'] = true;} else {$start_settings['debug_exposed'] = false;}$environment = app()->environment();- if ('production' != $environment) {+ if ($environment != 'production') {$start_settings['env'] = $environment;$start_settings['prod'] = false;} else {@@ -109,9 +109,9 @@ class SetupController extends Controller* Determine if the .env file accessible via a browser.** @return bool This method will return true when exceptions (such as curl exception) is thrown.- * Check the log files to see more details about the exception.+ * Check the log files to see more details about the exception.*/- protected function dotEnvFileIsExposed() : bool+ protected function dotEnvFileIsExposed(): bool{try {return Http::withoutVerifying()->timeout(10)@@ -120,6 +120,7 @@ class SetupController extends Controller->successful();} catch (\Exception $e) {Log::debug($e->getMessage());+return true;}}@@ -129,11 +130,11 @@ class SetupController extends Controller*/protected function storagePathIsWritable(): bool{- return File::isWritable(storage_path()) &&- File::isWritable(storage_path('framework')) &&- File::isWritable(storage_path('framework/cache')) &&+ return File::isWritable(storage_path()) &&+ File::isWritable(storage_path('framework')) &&+ File::isWritable(storage_path('framework/cache')) &&File::isWritable(storage_path('framework/sessions')) &&- File::isWritable(storage_path('framework/views')) &&+ File::isWritable(storage_path('framework/views')) &&File::isWritable(storage_path('logs'));}@@ -141,13 +142,13 @@ class SetupController extends Controller* Save the first admin user from Setup.** @author [A. Gianotto] [<[email protected]>]- * @since [v3.0]*+ * @since [v3.0]*/- public function postSaveFirstAdmin(SetupUserRequest $request) : RedirectResponse+ public function postSaveFirstAdmin(SetupUserRequest $request): RedirectResponse{- $user = new User();+ $user = new User;$user->first_name = $data['first_name'] = $request->input('first_name');$user->last_name = $request->input('last_name');$user->email = $data['email'] = $request->input('email');@@ -158,7 +159,7 @@ class SetupController extends Controller$user->password = bcrypt($request->input('password'));$data['password'] = $request->input('password');- $settings = new Setting();+ $settings = new Setting;$settings->full_multiple_companies_support = $request->input('full_multiple_companies_support', 0);$settings->site_name = $request->input('site_name');$settings->alert_email = $request->input('email');@@ -210,7 +211,7 @@ class SetupController extends Controller** @since [v3.0]*/- public function getSetupUser() : View+ public function getSetupUser(): View{return view('setup/user')->with('step', 3)@@ -225,7 +226,7 @@ class SetupController extends Controller** @since [v3.0]*/- public function getSetupDone() : View+ public function getSetupDone(): View{return view('setup/done')->with('success', trans('general.create_admin_success'))@@ -234,8 +235,6 @@ class SetupController extends Controller->with('section', trans('general.setup_done'));}--/*** Migrate the database tables, and return the output* to a view for Setup.@@ -260,11 +259,4 @@ class SetupController extends Controller->with('section', trans('general.setup_create_database'))->with('icon', 'fa-solid fa-database');}-------}diff --git a/app/Http/Controllers/StatuslabelsController.php b/app/Http/Controllers/StatuslabelsController.phpindex 6fd261206c..700679df30 100755--- a/app/Http/Controllers/StatuslabelsController.php+++ b/app/Http/Controllers/StatuslabelsController.php@@ -4,10 +4,9 @@ namespace App\Http\Controllers;use App\Helpers\Helper;use App\Models\Statuslabel;-use Illuminate\Http\Request;-use Illuminate\Support\Facades\Auth;+use Illuminate\Contracts\View\View;use Illuminate\Http\RedirectResponse;-use \Illuminate\Contracts\View\View;+use Illuminate\Http\Request;/*** This controller handles all actions related to Status Labels for@@ -20,23 +19,24 @@ class StatuslabelsController extends Controller/*** Show a list of all the statuslabels.*/- public function index() : View+ public function index(): View{$this->authorize('view', Statuslabel::class);+return view('statuslabels.index');}- public function show(Statuslabel $statuslabel) : View | RedirectResponse+ public function show(Statuslabel $statuslabel): View|RedirectResponse{$this->authorize('view', Statuslabel::class);+return view('statuslabels.view')->with('statuslabel', $statuslabel);}/*** Statuslabel create.- **/- public function create() : View+ public function create(): View{// Show the page$this->authorize('create', Statuslabel::class);@@ -48,14 +48,12 @@ class StatuslabelsController extends Controller/*** Statuslabel create form processing.- *- * @param Request $request*/- public function store(Request $request) : RedirectResponse+ public function store(Request $request): RedirectResponse{$this->authorize('create', Statuslabel::class);// create a new model instance- $statusLabel = new Statuslabel();+ $statusLabel = new Statuslabel;if ($request->missing('statuslabel_types')) {return redirect()->back()->withInput()->withErrors(['statuslabel_types' => trans('validation.statuslabel_type')]);@@ -85,9 +83,9 @@ class StatuslabelsController extends Controller/*** Statuslabel update.*- * @param int $statuslabelId+ * @param int $statuslabelId*/- public function edit(Statuslabel $statuslabel) : View | RedirectResponse+ public function edit(Statuslabel $statuslabel): View|RedirectResponse{$this->authorize('update', Statuslabel::class);@@ -101,9 +99,9 @@ class StatuslabelsController extends Controller/*** Statuslabel update form processing page.*- * @param int $statuslabelId+ * @param int $statuslabelId*/- public function update(Request $request, Statuslabel $statuslabel) : RedirectResponse+ public function update(Request $request, Statuslabel $statuslabel): RedirectResponse{$this->authorize('update', Statuslabel::class);@@ -134,9 +132,9 @@ class StatuslabelsController extends Controller/*** Delete the given Statuslabel.*- * @param int $statuslabelId+ * @param int $statuslabelId*/- public function destroy($statuslabelId) : RedirectResponse+ public function destroy($statuslabelId): RedirectResponse{$this->authorize('delete', Statuslabel::class);// Check if the Statuslabel existsdiff --git a/app/Http/Controllers/SuppliersController.php b/app/Http/Controllers/SuppliersController.phpindex 78e0cbfed2..1128743e7d 100755--- a/app/Http/Controllers/SuppliersController.php+++ b/app/Http/Controllers/SuppliersController.php@@ -4,16 +4,16 @@ namespace App\Http\Controllers;use App\Actions\Suppliers\DestroySupplierAction;use App\Exceptions\ItemStillHasAccessories;+use App\Exceptions\ItemStillHasAssets;use App\Exceptions\ItemStillHasComponents;use App\Exceptions\ItemStillHasConsumables;-use App\Exceptions\ItemStillHasMaintenances;-use App\Exceptions\ItemStillHasAssets;use App\Exceptions\ItemStillHasLicenses;+use App\Exceptions\ItemStillHasMaintenances;use App\Http\Requests\ImageUploadRequest;use App\Models\Supplier;+use Illuminate\Auth\Access\AuthorizationException;+use Illuminate\Contracts\View\View;use Illuminate\Http\RedirectResponse;-use \Illuminate\Contracts\View\View;-use Illuminate\Support\MessageBag;/*** This controller handles all actions related to Suppliers for@@ -26,31 +26,29 @@ class SuppliersController extends Controller/*** Show a list of all suppliers*- * @return \Illuminate\Contracts\View\View- * @throws \Illuminate\Auth\Access\AuthorizationException+ * @throws AuthorizationException*/- public function index() : View+ public function index(): View{$this->authorize('view', Supplier::class);+return view('suppliers/index');}/*** Supplier create.- **/- public function create() : View+ public function create(): View{$this->authorize('create', Supplier::class);+return view('suppliers/edit')->with('item', new Supplier);}/*** Supplier create form processing.- *- * @param ImageUploadRequest $request*/- public function store(ImageUploadRequest $request) : RedirectResponse+ public function store(ImageUploadRequest $request): RedirectResponse{$this->authorize('create', Supplier::class);// Create a new supplier@@ -67,7 +65,7 @@ class SuppliersController extends Controller$supplier->phone = request('phone');$supplier->fax = request('fax');$supplier->email = request('email');- $supplier->tag_color = $request->input('tag_color');+ $supplier->tag_color = $request->input('tag_color');$supplier->notes = request('notes');$supplier->url = $supplier->addhttp(request('url'));$supplier->created_by = auth()->id();@@ -83,20 +81,21 @@ class SuppliersController extends Controller/*** Supplier update.*- * @param int $supplierId+ * @param int $supplierId*/- public function edit(Supplier $supplier) : View | RedirectResponse+ public function edit(Supplier $supplier): View|RedirectResponse{$this->authorize('update', Supplier::class);- return view('suppliers/edit')->with('item', $supplier);++ return view('suppliers/edit')->with('item', $supplier);}/*** Supplier update form processing page.*- * @param int $supplierId+ * @param int $supplierId*/- public function update(ImageUploadRequest $request, Supplier $supplier) : RedirectResponse+ public function update(ImageUploadRequest $request, Supplier $supplier): RedirectResponse{$this->authorize('update', Supplier::class);// Save the data@@ -112,7 +111,7 @@ class SuppliersController extends Controller$supplier->fax = request('fax');$supplier->email = request('email');$supplier->url = $supplier->addhttp(request('url'));- $supplier->tag_color = $request->input('tag_color');+ $supplier->tag_color = $request->input('tag_color');$supplier->notes = request('notes');$supplier = $request->handleImages($supplier);@@ -126,7 +125,7 @@ class SuppliersController extends Controller/*** Delete the given supplier.*- * @param int $supplierId+ * @param int $supplierId*/public function destroy(Supplier $supplier): RedirectResponse{@@ -135,30 +134,31 @@ class SuppliersController extends ControllerDestroySupplierAction::run(supplier: $supplier);} catch (ItemStillHasAssets $e) {return redirect()->route('suppliers.index')->with('error', trans('general.bulk_delete_associations.assoc_assets', [- 'asset_count' => (int) $supplier->assets_count, 'item' => trans('general.supplier')+ 'asset_count' => (int) $supplier->assets_count, 'item' => trans('general.supplier'),]));} catch (ItemStillHasMaintenances $e) {return redirect()->route('suppliers.index')->with('error', trans('general.bulk_delete_associations.assoc_maintenances', [- 'asset_maintenances_count' => $supplier->asset_maintenances_count, 'item' => trans('general.supplier')+ 'asset_maintenances_count' => $supplier->asset_maintenances_count, 'item' => trans('general.supplier'),]));} catch (ItemStillHasLicenses $e) {return redirect()->route('suppliers.index')->with('error', trans('general.bulk_delete_associations.assoc_licenses', [- 'licenses_count' => (int) $supplier->licenses_count, 'item' => trans('general.supplier')+ 'licenses_count' => (int) $supplier->licenses_count, 'item' => trans('general.supplier'),]));} catch (ItemStillHasAccessories $e) {return redirect()->route('suppliers.index')->with('error', trans('general.bulk_delete_associations.assoc_accessories', [- 'accessories_count' => (int) $supplier->accessories_count, 'item' => trans('general.supplier')+ 'accessories_count' => (int) $supplier->accessories_count, 'item' => trans('general.supplier'),]));} catch (ItemStillHasConsumables $e) {return redirect()->route('suppliers.index')->with('error', trans('general.bulk_delete_associations.assoc_consumables', [- 'consumables_count' => (int) $supplier->consumables_count, 'item' => trans('general.supplier')+ 'consumables_count' => (int) $supplier->consumables_count, 'item' => trans('general.supplier'),]));} catch (ItemStillHasComponents $e) {return redirect()->route('suppliers.index')->with('error', trans('general.bulk_delete_associations.assoc_components', [- 'components_count' => (int) $supplier->components_count, 'item' => trans('general.supplier')+ 'components_count' => (int) $supplier->components_count, 'item' => trans('general.supplier'),]));} catch (\Exception $e) {report($e);+return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.error'));}@@ -168,12 +168,14 @@ class SuppliersController extends Controller/*** Get the asset information to present to the supplier view page*- * @param null $supplierId+ * @param null $supplierId+ ** @internal param int $assetId*/- public function show(Supplier $supplier) : View | RedirectResponse+ public function show(Supplier $supplier): View|RedirectResponse{$this->authorize('view', Supplier::class);+return view('suppliers/view', compact('supplier'));}}diff --git a/app/Http/Controllers/UploadedFilesController.php b/app/Http/Controllers/UploadedFilesController.phpindex 2575f8110d..5d84e8d738 100644--- a/app/Http/Controllers/UploadedFilesController.php+++ b/app/Http/Controllers/UploadedFilesController.php@@ -2,11 +2,11 @@namespace App\Http\Controllers;-use App\Helpers\Helper;use App\Helpers\StorageHelper;use App\Http\Requests\UploadFileRequest;use App\Models\Actionlog;use App\Models\Import;+use Illuminate\Http\JsonResponse;use Illuminate\Http\RedirectResponse;use Illuminate\Support\Facades\Storage;use Symfony\Component\HttpFoundation\BinaryFileResponse;@@ -18,31 +18,29 @@ use Symfony\Component\HttpFoundation\StreamedResponse;** @version v1.0*- * @return \Illuminate\Http\JsonResponse-+ * @return JsonResponse*/class UploadedFilesController extends Controller{--/*** Accepts a POST to upload a file to the server.*- * @param \App\Http\Requests\UploadFileRequest $request- * @param string $object_type the type of object to upload the file to- * @param int $id the ID of the object to store so we can check permisisons+ * @param string $object_type the type of object to upload the file to+ * @param int $id the ID of the object to store so we can check permisisons+ ** @since [v8.2.2]+ ** @author [A. Gianotto <[email protected]>]*/- public function store(UploadFileRequest $request, $object_type, $id) : RedirectResponse+ public function store(UploadFileRequest $request, $object_type, $id): RedirectResponse{// Check the permissions to make sure the user can view the object$object = self::$map_object_type[$object_type]::withTrashed()->find($id);$this->authorize('update', $object);- if (!$object) {- return redirect()->back()->withFragment('files')->with('error',trans('general.file_upload_status.invalid_object'));+ if (! $object) {+ return redirect()->back()->withFragment('files')->with('error', trans('general.file_upload_status.invalid_object'));}// If the file storage directory doesn't exist, create it@@ -50,7 +48,6 @@ class UploadedFilesController extends ControllerStorage::makeDirectory(self::$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) {@@ -64,46 +61,42 @@ class UploadedFilesController extends Controller->where('item_id', '=', $id)->whereIn('filename', $files)->get();- return redirect()->back()->withFragment('files')->with('success', trans_choice('general.file_upload_status.upload.success', count($files)));+ return redirect()->back()->withFragment('files')->with('success', trans_choice('general.file_upload_status.upload.success', count($files)));}// No files were submittedreturn redirect()->back()->withFragment('files')->with('error', trans('general.file_upload_status.nofiles'));}--/*** Check for permissions and display the file.* This isn't currently used, but is here for future use.*- * @param \App\Http\Requests\UploadFileRequest $request- * @param string $object_type the type of object to upload the file to- * @param int $id the ID of the object to delete from so we can check permisisons- * @param $file_id the ID of the file to show from the action_logs table+ * @param UploadFileRequest $request+ * @param string $object_type the type of object to upload the file to+ * @param int $id the ID of the object to delete from so we can check permisisons+ * @param $file_id the ID of the file to show from the action_logs table+ ** @since [v8.2.2]+ ** @author [A. Gianotto <[email protected]>]*/- public function show($object_type, $id, $file_id) : RedirectResponse | StreamedResponse | Storage | StorageHelper | BinaryFileResponse+ public 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);$this->authorize('view', $object);- if (!$object) {- return redirect()->back()->withFragment('files')->with('error',trans('general.file_upload_status.invalid_object'));+ if (! $object) {+ return redirect()->back()->withFragment('files')->with('error', trans('general.file_upload_status.invalid_object'));}-// 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', self::$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(self::$map_storage_path[$object_type].'/'.$log->filename)) {return redirect()->back()->withFragment('files')->with('error', trans('general.file_upload_status.file_not_found'));}@@ -111,6 +104,7 @@ class UploadedFilesController extends Controller$headers = ['Content-Disposition' => 'inline',];+return Storage::download(self::$map_storage_path[$object_type].'/'.$log->filename, $log->filename, $headers);}@@ -121,27 +115,28 @@ class UploadedFilesController extends Controller/*** Delete the associated file*- * @param \App\Http\Requests\UploadFileRequest $request- * @param string $object_type the type of object to upload the file to- * @param int $id the ID of the object to delete from so we can check permisisons- * @param $file_id the ID of the file to delete from the action_logs table+ * @param UploadFileRequest $request+ * @param string $object_type the type of object to upload the file to+ * @param int $id the ID of the object to delete from so we can check permisisons+ * @param $file_id the ID of the file to delete from the action_logs table+ ** @since [v8.2.2]+ ** @author [A. Gianotto <[email protected]>]*/- public function destroy($object_type, $id, $file_id) : RedirectResponse+ public function destroy($object_type, $id, $file_id): RedirectResponse{// Check the permissions to make sure the user can view the object$object = self::$map_object_type[$object_type]::withTrashed()->find($id);$this->authorize('update', $object);- if (!$object) {- return redirect()->back()->withFragment('files')->with('error',trans('general.file_upload_status.invalid_object'));+ if (! $object) {+ return redirect()->back()->withFragment('files')->with('error', trans('general.file_upload_status.invalid_object'));}-// 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', self::$map_object_type[$object_type])->where('item_id', $object->id)->first();if ($log) {@@ -161,22 +156,23 @@ class UploadedFilesController extends Controller}- public function downloadImport(Import $import) {+ public function downloadImport(Import $import)+ {$this->authorize('import');if ($import = Import::find($import->id)) {- if ((auth()->user()->id != $import->created_by) && (!auth()->user()->isSuperUser())) {+ if ((auth()->user()->id != $import->created_by) && (! auth()->user()->isSuperUser())) {return redirect()->back()->with('error', trans('general.file_upload_status.file_not_found'));}if (config('filesystems.default') == 's3_private') {- return redirect()->away(Storage::disk('s3_private')->temporaryUrl('private_uploads/imports/' . $import->file_path, now()->addMinutes(5)));+ return redirect()->away(Storage::disk('s3_private')->temporaryUrl('private_uploads/imports/'.$import->file_path, now()->addMinutes(5)));}- if (Storage::exists('private_uploads/imports/' . $import->file_path)) {- return response()->download(config('app.private_uploads') . '/imports/' . $import->file_path);+ if (Storage::exists('private_uploads/imports/'.$import->file_path)) {+ return response()->download(config('app.private_uploads').'/imports/'.$import->file_path);}}@@ -184,5 +180,4 @@ class UploadedFilesController extends Controllerreturn redirect()->back()->with('error', trans('general.file_upload_status.file_not_found'));}-}diff --git a/app/Http/Controllers/Users/BulkUsersController.php b/app/Http/Controllers/Users/BulkUsersController.phpindex e133325215..65b112be02 100644--- a/app/Http/Controllers/Users/BulkUsersController.php+++ b/app/Http/Controllers/Users/BulkUsersController.php@@ -6,23 +6,23 @@ use App\Events\UserMerged;use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Models\Accessory;-use App\Models\License;use App\Models\Actionlog;use App\Models\Asset;+use App\Models\ConsumableAssignment;use App\Models\Group;+use App\Models\License;use App\Models\LicenseSeat;-use App\Models\ConsumableAssignment;-use App\Models\Consumable;use App\Models\Setting;use App\Models\User;use App\Notifications\CurrentInventory;-use Carbon\Carbon;+use Illuminate\Auth\Access\AuthorizationException;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;use Illuminate\Support\Collection;-use Illuminate\Support\Facades\Auth;use Illuminate\Support\Facades\DB;-use Illuminate\Support\Facades\Password;use Illuminate\Support\Facades\Log;+use Illuminate\Support\Facades\Password;class BulkUsersController extends Controller{@@ -30,10 +30,12 @@ class BulkUsersController extends Controller* Returns a view that confirms the user's a bulk action will be applied to.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.7]- * @param Request $request- * @return \Illuminate\Contracts\View\View | \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return View | RedirectResponse+ *+ * @throws AuthorizationException*/public function edit(Request $request){@@ -45,17 +47,18 @@ class BulkUsersController extends Controller// Get the list of affected users$user_raw_array = request('ids');$users = User::whereIn('id', $user_raw_array)- ->with('assets', 'manager', 'userlog', 'licenses', 'consumables', 'accessories', 'managedLocations','uploads', 'acceptances')->get();+ ->with('assets', 'manager', 'userlog', 'licenses', 'consumables', 'accessories', 'managedLocations', 'uploads', 'acceptances')->get();// bulk edit, display the bulk edit formif ($request->input('bulk_actions') == 'edit') {$this->authorize('update', User::class);+return view('users/bulk-edit', compact('users'))->with('groups', Group::pluck('name', 'id'));- // bulk send assigned inventory+ // bulk send assigned inventory} elseif ($request->input('bulk_actions') == 'send_assigned') {- $this->authorize('update', User::class);+ $this->authorize('update', User::class);$users_without_email = 0;foreach ($users as $user) {@@ -72,34 +75,33 @@ class BulkUsersController extends Controllerreturn redirect()->back()->with('warning', trans_choice('admin/users/general.users_notified_warning', $users->count(), ['no_email' => $users_without_email]));}---- // bulk delete, display the bulk delete confirmation form+ // bulk delete, display the bulk delete confirmation form} elseif ($request->input('bulk_actions') == 'delete') {$this->authorize('delete', User::class);+return view('users/confirm-bulk-delete')->with('users', $users)->with('statuslabel_list', Helper::statusLabelList());- // merge, confirm they have at least 2 users selected and display the merge screen+ // merge, confirm they have at least 2 users selected and display the merge screen} elseif ($request->input('bulk_actions') == 'merge') {$this->authorize('delete', User::class);if (($request->filled('ids')) && (count($request->input('ids')) > 1)) {return view('users/confirm-merge')->with('users', $users);- // Not enough users selected, send them back+ // Not enough users selected, send them back} else {return redirect()->back()->with('error', trans('general.not_enough_users_selected', ['count' => 2]));}- // bulk password reset, just do the thing+ // bulk password reset, just do the thing} elseif ($request->input('bulk_actions') == 'bulkpasswordreset') {foreach ($users as $user) {if (($user->activated == '1') && ($user->email != '') && ($user->ldap_import != '1')) {$credentials = ['email' => $user->email];Password::sendResetLink($credentials/* , function (Message $message) {$message->subject($this->getEmailSubject()); // TODO - I'm not sure if we still need this, but this second parameter is no longer accepted in later Laravel versions.- } */ ); // TODO - so hopefully this doesn't give us generic password reset messages? But it at least _works_+ } */); // TODO - so hopefully this doesn't give us generic password reset messages? But it at least _works_}}+return redirect()->back()->with('success', trans('admin/users/message.password_resets_sent'));} elseif ($request->input('bulk_actions') == 'print') {@@ -124,7 +126,7 @@ class BulkUsersController extends Controller->withTrashed()->findMany($request->input('ids'));- $users->each(fn($user) => $this->authorize('view', $user));+ $users->each(fn ($user) => $this->authorize('view', $user));return view('users.print')->with('users', $users)@@ -139,10 +141,12 @@ class BulkUsersController extends Controller* Save bulk-edited users** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param Request $request- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return RedirectResponse+ *+ * @throws AuthorizationException*/public function update(Request $request){@@ -175,7 +179,6 @@ class BulkUsersController extends Controller->conditionallyAddItem('city')->conditionallyAddItem('autoassign_licenses');-// If the manager_id is one of the users being updated, generate a warning.if (array_search($request->input('manager_id'), $user_raw_array)) {$manager_conflict = true;@@ -187,35 +190,35 @@ class BulkUsersController extends Controller/*** Check to see if the user wants to actually blank out the values vs skip them*/- if ($request->input('null_location_id')=='1') {+ if ($request->input('null_location_id') == '1') {$this->update_array['location_id'] = null;}- if ($request->input('null_department_id')=='1') {+ if ($request->input('null_department_id') == '1') {$this->update_array['department_id'] = null;}- if ($request->input('null_manager_id')=='1') {+ if ($request->input('null_manager_id') == '1') {$this->update_array['manager_id'] = null;}- if ($request->input('null_company_id')=='1') {+ if ($request->input('null_company_id') == '1') {$this->update_array['company_id'] = null;}- if ($request->input('null_start_date')=='1') {+ if ($request->input('null_start_date') == '1') {$this->update_array['start_date'] = null;}- if ($request->input('null_end_date')=='1') {+ if ($request->input('null_end_date') == '1') {$this->update_array['end_date'] = null;}- if ($request->input('null_locale')=='1') {+ if ($request->input('null_locale') == '1') {$this->update_array['locale'] = null;}- if ($request->input('null_display_name')=='1') {+ if ($request->input('null_display_name') == '1') {$this->update_array['display_name'] = null;}@@ -226,7 +229,7 @@ class BulkUsersController extends ControllerUser::whereIn('id', $user_raw_array)->where('id', '!=', auth()->id())->update($this->update_array);- if (array_key_exists('location_id', $this->update_array)){+ if (array_key_exists('location_id', $this->update_array)) {Asset::where('assigned_type', User::class)->whereIn('assigned_to', $user_raw_array)->update(['location_id' => $this->update_array['location_id']]);@@ -248,13 +251,15 @@ class BulkUsersController extends Controller/*** Array to store update data per item+ ** @var array*/private $update_array = [];/*** Adds parameter to update array for an item if it exists in request- * @param string $field field name+ *+ * @param string $field field name* @return BulkUsersController Model for Chaining*/protected function conditionallyAddItem($field)@@ -270,10 +275,12 @@ class BulkUsersController extends Controller* Soft-delete bulk users** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param Request $request- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return RedirectResponse+ *+ * @throws AuthorizationException*/public function destroy(Request $request){@@ -299,7 +306,7 @@ class BulkUsersController extends Controller$licenses = DB::table('license_seats')->whereIn('assigned_to', $user_raw_array)->get();$consumableUserRows = DB::table('consumables_users')->whereIn('assigned_to', $user_raw_array)->get();- if ((($assets->count() > 0) && ((!$request->filled('status_id')) || ($request->input('status_id') == '')))) {+ if ((($assets->count() > 0) && ((! $request->filled('status_id')) || ($request->input('status_id') == '')))) {return redirect()->route('users.index')->with('error', 'No status selected');}@@ -308,8 +315,8 @@ class BulkUsersController extends Controller$this->logItemCheckinAndDelete($licenses, License::class);Asset::whereIn('id', $assets->pluck('id'))->update([- 'status_id' => e(request('status_id')),- 'assigned_to' => null,+ 'status_id' => e(request('status_id')),+ 'assigned_to' => null,'assigned_type' => null,'expected_checkin' => null,]);@@ -319,7 +326,7 @@ class BulkUsersController extends Controllerforeach ($users as $user) {$user->accessories()->sync([]);- if ($request->input('delete_user')=='1') {+ if ($request->input('delete_user') == '1') {if (auth()->user()->can('canEditAuthFields', $user) && auth()->user()->can('editableOnDemo')) {$user->delete();}@@ -327,26 +334,25 @@ class BulkUsersController extends Controller}$msg = trans('general.bulk_checkin_success');- if ($request->input('delete_user')=='1') {+ if ($request->input('delete_user') == '1') {$msg = trans('general.bulk_checkin_delete_success');}-return redirect()->route('users.index')->with('success', $msg);}/*** Generate an action log entry for each of a group of items.- * @param $items- * @param $itemType string name of items being passed.+ *+ * @param $itemType string name of items being passed.*/protected function logItemCheckinAndDelete($items, $itemType){foreach ($items as $item) {$item_id = $item->id;- $logAction = new Actionlog();+ $logAction = new Actionlog;- if ($itemType == License::class){+ if ($itemType == License::class) {$item_id = $item->license_id;}@@ -364,7 +370,7 @@ class BulkUsersController extends Controllerprivate function logAccessoriesCheckin(Collection $accessoryUserRows): void{foreach ($accessoryUserRows as $accessoryUserRow) {- $logAction = new Actionlog();+ $logAction = new Actionlog;$logAction->item_id = $accessoryUserRow->accessory_id;$logAction->item_type = Accessory::class;$logAction->target_id = $accessoryUserRow->assigned_to;@@ -379,10 +385,12 @@ class BulkUsersController extends Controller* Save bulk-edited users** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param Request $request- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return RedirectResponse+ *+ * @throws AuthorizationException*/public function merge(Request $request){@@ -393,33 +401,33 @@ class BulkUsersController extends Controller}$user_ids_to_merge = $request->input('ids_to_merge');- $user_ids_to_merge = array_diff($user_ids_to_merge, array($request->input('merge_into_id')));+ $user_ids_to_merge = array_diff($user_ids_to_merge, [$request->input('merge_into_id')]);- if ((!$request->filled('merge_into_id')) || (count($user_ids_to_merge) < 1)) {+ if ((! $request->filled('merge_into_id')) || (count($user_ids_to_merge) < 1)) {return redirect()->back()->with('error', trans('general.no_users_selected'));}// Get the users$merge_into_user = User::find($request->input('merge_into_id'));- $users_to_merge = User::whereIn('id', $user_ids_to_merge)->with('assets', 'manager', 'userlog', 'licenses', 'consumables', 'accessories', 'managedLocations','uploads', 'acceptances')->get();+ $users_to_merge = User::whereIn('id', $user_ids_to_merge)->with('assets', 'manager', 'userlog', 'licenses', 'consumables', 'accessories', 'managedLocations', 'uploads', 'acceptances')->get();$admin = User::find(auth()->id());// Walk usersforeach ($users_to_merge as $user_to_merge) {foreach ($user_to_merge->assets as $asset) {- Log::debug('Updating asset: '.$asset->asset_tag . ' to '.$merge_into_user->id);+ Log::debug('Updating asset: '.$asset->asset_tag.' to '.$merge_into_user->id);$asset->assigned_to = $request->input('merge_into_id');$asset->save();}foreach ($user_to_merge->licenses as $license) {- Log::debug('Updating license pivot: '.$license->id . ' to '.$merge_into_user->id);+ Log::debug('Updating license pivot: '.$license->id.' to '.$merge_into_user->id);$user_to_merge->licenses()->updateExistingPivot($license->id, ['assigned_to' => $merge_into_user->id]);}foreach ($user_to_merge->consumables as $consumable) {- Log::debug('Updating consumable pivot: '.$consumable->id . ' to '.$merge_into_user->id);+ Log::debug('Updating consumable pivot: '.$consumable->id.' to '.$merge_into_user->id);$user_to_merge->consumables()->updateExistingPivot($consumable->id, ['assigned_to' => $merge_into_user->id]);}@@ -457,6 +465,5 @@ class BulkUsersController extends Controllerreturn redirect()->route('users.index')->with('success', trans('general.merge_success', ['count' => $users_to_merge->count(), 'into_username' => $merge_into_user->username]));-}}diff --git a/app/Http/Controllers/Users/LDAPImportController.php b/app/Http/Controllers/Users/LDAPImportController.phpindex e535a171a0..56f88f0c74 100644--- a/app/Http/Controllers/Users/LDAPImportController.php+++ b/app/Http/Controllers/Users/LDAPImportController.php@@ -4,12 +4,17 @@ namespace App\Http\Controllers\Users;use App\Http\Controllers\Controller;use App\Models\User;+use Illuminate\Auth\Access\AuthorizationException;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;-use Illuminate\Support\Facades\Artisan; // Note that this is awful close to 'Users' the namespace above; be careful+use Illuminate\Support\Facades\Artisan;++ // Note that this is awful close to 'Users' the namespace above; be carefulclass LDAPImportController extends Controller{- /**+ /*** Return view for LDAP import.** @author Aladin Alaily@@ -17,16 +22,16 @@ class LDAPImportController extends Controller** @since 5.0.0*- * @return \Illuminate\Contracts\View\View+ * @return View*- * @throws \Illuminate\Auth\Access\AuthorizationException+ * @throws AuthorizationException*/public function create(){// I guess this prolly oughtta... I dunno. Do something?$this->authorize('update', User::class);try {- //$this->ldap->connect(); I don't think this actually exists in LdapAd.php, and we don't really 'persist' LDAP connections anyways...right?+ // $this->ldap->connect(); I don't think this actually exists in LdapAd.php, and we don't really 'persist' LDAP connections anyways...right?} catch (\Exception $e) {return redirect()->route('users.index')->with('error', $e->getMessage());}@@ -43,7 +48,7 @@ class LDAPImportController extends Controller** @since 5.0.0*- * @return \Illuminate\Http\RedirectResponse+ * @return RedirectResponse*/public function store(Request $request){@@ -55,7 +60,7 @@ class LDAPImportController extends Controller// Collect and parse JSON summary.$ldap_results_json = Artisan::output();$ldap_results = json_decode($ldap_results_json, true);- if (!$ldap_results) {+ if (! $ldap_results) {return redirect()->back()->withInput()->with('error', trans('general.no_results'));}diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.phpindex 1d58ebdf8b..7c4e1bce6b 100755--- a/app/Http/Controllers/Users/UsersController.php+++ b/app/Http/Controllers/Users/UsersController.php@@ -13,12 +13,15 @@ use App\Models\Company;use App\Models\Group;use App\Models\Setting;use App\Models\User;+use App\Notifications\CurrentInventory;use App\Notifications\WelcomeNotification;+use Illuminate\Auth\Access\AuthorizationException;+use Illuminate\Contracts\View\View;+use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Password;use Symfony\Component\HttpFoundation\StreamedResponse;-use App\Notifications\CurrentInventory;/*** This controller handles all actions related to Users for@@ -33,10 +36,13 @@ class UsersController extends Controller* the content for the users listing, which is generated in getDatatable().** @author [A. Gianotto] [<[email protected]>]+ ** @see UsersController::getDatatable() method that generates the JSON response* @since [v1.0]- * @return \Illuminate\Contracts\View\View- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return View+ *+ * @throws AuthorizationException*/public function index(){@@ -49,9 +55,12 @@ class UsersController extends Controller* Returns a view that displays the user creation form.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @return \Illuminate\Contracts\View\View- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return View+ *+ * @throws AuthorizationException*/public function create(Request $request){@@ -78,16 +87,18 @@ class UsersController extends Controller* Validate and store the new user data, or return an error.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param SaveUserRequest $request- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @return RedirectResponse+ *+ * @throws AuthorizationException*/public function store(SaveUserRequest $request){$this->authorize('create', User::class);$user = new User;- //Username, email, and password need to be handled specially because the need to respect config values on an edit.+ // Username, email, and password need to be handled specially because the need to respect config values on an edit.$user->email = trim($request->input('email'));$user->username = trim($request->input('username'));$user->display_name = $request->input('display_name');@@ -123,7 +134,7 @@ class UsersController extends Controller$permissions_array = $request->input('permission');// Strip out the individual superuser permission if the API user isn't a superadmin- if (!auth()->user()->isSuperUser()) {+ if (! auth()->user()->isSuperUser()) {if ((is_array($permissions_array)) && (array_key_exists('superuser', $permissions_array))) {unset($permissions_array['superuser']);@@ -131,7 +142,7 @@ class UsersController extends Controller}// Strip out the individual admin permission if the API user isn't an admin- if (!auth()->user()->isAdmin()) {+ if (! auth()->user()->isAdmin()) {if ((is_array($permissions_array)) && (array_key_exists('admin', $permissions_array))) {unset($permissions_array['admin']);@@ -143,13 +154,12 @@ class UsersController extends Controller// we have to invoke the form request here to handle image uploadsapp(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');- if ($request->input('redirect_option') === 'back'){+ if ($request->input('redirect_option') === 'back') {session()->put(['redirect_option' => 'index']);} else {session()->put(['redirect_option' => $request->input('redirect_option')]);}-if ($user->save()) {if (($user->activated == '1') && ($user->email != '') && ($request->input('send_welcome') == '1')) {@@ -157,10 +167,9 @@ class UsersController extends Controllertry {$user->notify(new WelcomeNotification($user));} catch (\Exception $e) {- Log::warning('Could not send welcome notification for user: ' . $e->getMessage());+ Log::warning('Could not send welcome notification for user: '.$e->getMessage());}-}if ($request->filled('groups')) {@@ -194,11 +203,15 @@ class UsersController extends Controller* Returns a view that displays the edit user form** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param $permissions- * @return \Illuminate\Contracts\View\View|\Illuminate\Http\RedirectResponse+ *+ * @param $permissions+ * @return View|RedirectResponse+ ** @internal param int $id- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @throws AuthorizationException*/public function edit(User $user){@@ -230,11 +243,13 @@ class UsersController extends Controller* Validate and save edited user data from edit form.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param SaveUserRequest $request- * @param int $id- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param int $id+ * @return RedirectResponse+ *+ * @throws AuthorizationException*/public function update(SaveUserRequest $request, User $user){@@ -272,7 +287,6 @@ class UsersController extends Controller}}-// Update the user fields$user->first_name = $request->input('first_name');@@ -304,7 +318,6 @@ class UsersController extends Controller// Set this here so that we can overwrite it later if the user is an admin or superadmin$user->activated = $request->input('activated', auth()->user()->is($user) ? 1 : $user->activated);-// Update the location of any assets checked out to this userAsset::where('assigned_type', User::class)->where('assigned_to', $user->id)@@ -343,13 +356,11 @@ class UsersController extends Controller}}-// Update the location of any assets checked out to this userAsset::where('assigned_type', User::class)->where('assigned_to', $user->id)->update(['location_id' => $user->location_id]);-// Handle uploaded avatarapp(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');session()->put(['redirect_option' => $request->input('redirect_option')]);@@ -359,6 +370,7 @@ class UsersController extends Controllerreturn Helper::getRedirectOption($request, $user->id, 'Users')->with('success', trans('admin/users/message.success.update'));}+return redirect()->back()->withInput()->withErrors($user->getErrors());}@@ -366,10 +378,13 @@ class UsersController extends Controller* Delete a user** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param int $id- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param int $id+ * @return RedirectResponse+ *+ * @throws AuthorizationException*/public function destroy(DeleteUserRequest $request, $id){@@ -384,8 +399,10 @@ class UsersController extends Controllerreturn redirect()->route('users.index')->with('success', trans('admin/users/message.success.delete'));}}+return redirect()->route('users.index')->with('error', trans('admin/users/message.cannot_delete'));}+return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found'));}@@ -394,10 +411,13 @@ class UsersController extends Controller* Restore a deleted user** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param int $id- * @return \Illuminate\Http\RedirectResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param int $id+ * @return RedirectResponse+ *+ * @throws AuthorizationException*/public function getRestore(User $user){@@ -409,7 +429,7 @@ class UsersController extends Controller}if ($user->restore()) {- $logaction = new Actionlog();+ $logaction = new Actionlog;$logaction->item_type = User::class;$logaction->item_id = $user->id;$logaction->created_at = date('Y-m-d H:i:s');@@ -421,6 +441,7 @@ class UsersController extends Controllerif ($deleted_users > 0) {return redirect()->back()->with('success', trans('admin/users/message.success.restored'));}+return redirect()->route('users.index')->with('success', trans('admin/users/message.success.restored'));}@@ -434,10 +455,13 @@ class UsersController extends Controller* Return a view with user detail** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param int $userId- * @return \Illuminate\Contracts\View\View- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param int $userId+ * @return View+ *+ * @throws AuthorizationException*/public function show(User $user){@@ -462,16 +486,18 @@ class UsersController extends Controller]);}-/*** Return a view containing a pre-populated new user form,* populated with some fields from an existing user.** @author [A. Gianotto] [<[email protected]>]+ ** @since [v1.0]- * @param int $id- * @return \Illuminate\Contracts\View\View- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @param int $id+ * @return View+ *+ * @throws AuthorizationException*/public function getClone(Request $request, User $user){@@ -482,15 +508,12 @@ class UsersController extends Controller$permissions = $request->input('permissions', []);app('request')->request->set('permissions', $permissions);-$user_to_clone = User::with('userloc')->withTrashed()->find($user->id);// Make sure they can view this particular user$this->authorize('view', $user_to_clone);-if ($user_to_clone) {-$user = clone $user_to_clone;// Blank out some fields@@ -519,16 +542,18 @@ class UsersController extends Controller->with('item', $user);}-}/*** Exports users to CSV** @author [A. Gianotto] [<[email protected]>]+ ** @since [v3.5]+ ** @return StreamedResponse- * @throws \Illuminate\Auth\Access\AuthorizationException+ *+ * @throws AuthorizationException*/public function getExportUserCsv(){@@ -586,16 +611,13 @@ class UsersController extends Controller$user_groups .= $user_group->name.', ';}+ $permissionstring = '';- $permissionstring = "";-- if($user->isSuperUser()) {+ if ($user->isSuperUser()) {$permissionstring = trans('general.superuser');- }- elseif($user->hasAccess('admin')) {+ } elseif ($user->hasAccess('admin')) {$permissionstring = trans('general.admin');- }- else {+ } else {$permissionstring = trans('general.user');}@@ -642,6 +664,7 @@ class UsersController extends Controller* Print inventory** @since [v1.8]+ ** @author Aladin Alaily*/public function printInventory($id)@@ -650,18 +673,18 @@ class UsersController extends Controller$user = User::where('id', $id)->with([- 'assets.log' => fn($query) => $query->withTrashed()->where('target_type', User::class)->where('target_id', $id)->where('action_type', 'accepted'),- 'assets.assignedAssets.log' => fn($query) => $query->withTrashed()->where('target_type', User::class)->where('target_id', $id)->where('action_type', 'accepted'),+ 'assets.log' => fn ($query) => $query->withTrashed()->where('target_type', User::class)->where('target_id', $id)->where('action_type', 'accepted'),+ 'assets.assignedAssets.log' => fn ($query) => $query->withTrashed()->where('target_type', User::class)->where('target_id', $id)->where('action_type', 'accepted'),'assets.assignedAssets.defaultLoc','assets.assignedAssets.location','assets.assignedAssets.model.category','assets.defaultLoc','assets.location','assets.model.category',- 'accessories.log' => fn($query) => $query->withTrashed()->where('target_type', User::class)->where('target_id', $id)->where('action_type', 'accepted'),+ 'accessories.log' => fn ($query) => $query->withTrashed()->where('target_type', User::class)->where('target_id', $id)->where('action_type', 'accepted'),'accessories.category','accessories.manufacturer',- 'consumables.log' => fn($query) => $query->withTrashed()->where('target_type', User::class)->where('target_id', $id)->where('action_type', 'accepted'),+ 'consumables.log' => fn ($query) => $query->withTrashed()->where('target_type', User::class)->where('target_id', $id)->where('action_type', 'accepted'),'consumables.category','consumables.manufacturer','licenses.category',@@ -680,14 +703,15 @@ class UsersController extends Controllerreturn redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', compact('id')));}-/*** Emails user a list of assigned assets** @author [G. Martinez] [<[email protected]>]+ ** @since [v6.0.5]- * @param \App\Http\Controllers\Users\UsersController $id- * @return \Illuminate\Http\RedirectResponse+ *+ * @param UsersController $id+ * @return RedirectResponse*/public function emailAssetList($id){@@ -705,6 +729,7 @@ class UsersController extends Controller}$user->notify((new CurrentInventory($user)));+return redirect()->back()->with('success', trans('admin/users/general.user_notified'));}@@ -716,8 +741,10 @@ class UsersController extends Controller* Send individual password reset email** @author A. Gianotto+ ** @since [v5.0.15]- * @return \Illuminate\Http\RedirectResponse+ *+ * @return RedirectResponse*/public function sendPasswordReset($id){@@ -729,6 +756,7 @@ class UsersController extends Controllertry {Password::sendResetLink($credentials);+return redirect()->back()->with('success', trans('admin/users/message.password_reset_sent', ['email' => $user->email]));} catch (\Exception $e) {diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.phpindex 02d4d11451..e03c820688 100755--- a/app/Http/Controllers/ViewAssetsController.php+++ b/app/Http/Controllers/ViewAssetsController.php@@ -13,11 +13,12 @@ use App\Models\Setting;use App\Models\User;use App\Notifications\RequestAssetCancelation;use App\Notifications\RequestAssetNotification;+use Exception;use Illuminate\Auth\Access\AuthorizationException;-use Illuminate\Http\Request;+use Illuminate\Contracts\View\View;use Illuminate\Http\RedirectResponse;-use \Illuminate\Contracts\View\View;-use Exception;+use Illuminate\Http\Request;+use Illuminate\Support\Collection;/*** This controller handles all actions related to the ability for users@@ -29,9 +30,6 @@ class ViewAssetsController extends Controller{/*** Extract custom fields that should be displayed in user view.- *- * @param User $user- * @return array*/private function extractCustomFields(User $user): array{@@ -45,16 +43,14 @@ class ViewAssetsController extends Controller}}}+return array_unique($fieldArray);}/*** Get list of users viewable by the current user.- *- * @param User $authUser- * @return \Illuminate\Support\Collection*/- private function getViewableUsers(User $authUser): \Illuminate\Support\Collection+ private function getViewableUsers(User $authUser): Collection{// SuperAdmin sees all usersif ($authUser->isSuperUser()) {@@ -67,49 +63,43 @@ class ViewAssetsController extends Controller// Regular manager sees only their subordinates + self$managedUsers = $authUser->getAllSubordinates();-+// If user has subordinates, show them with self at beginningif ($managedUsers->count() > 0) {return collect([$authUser])->merge($managedUsers)->sortBy('last_name')->sortBy('first_name');}-+// User has no subordinates, only sees themselvesreturn collect([$authUser]);}/*** Get the selected user ID from request or default to current user.- *- * @param Request $request- * @param \Illuminate\Support\Collection $subordinates- * @param int $defaultUserId- * @return int*/- private function getSelectedUserId(Request $request, \Illuminate\Support\Collection $subordinates, int $defaultUserId): int+ private function getSelectedUserId(Request $request, Collection $subordinates, int $defaultUserId): int{// If no subordinates or no user_id in request, return default- if ($subordinates->count() <= 1 || !$request->filled('user_id')) {+ if ($subordinates->count() <= 1 || ! $request->filled('user_id')) {return $defaultUserId;}$requestedUserId = (int) $request->input('user_id');-+// Validate if the requested user is allowedif ($subordinates->contains('id', $requestedUserId)) {return $requestedUserId;}-+// If invalid ID or not authorized, return defaultreturn $defaultUserId;}/*** Show user's assigned assets with optional manager view functionality.- **/- public function getIndex(Request $request) : View | RedirectResponse+ public function getIndex(Request $request): View|RedirectResponse{$authUser = auth()->user();$settings = Setting::getSettings();@@ -129,11 +119,11 @@ class ViewAssetsController extends Controller'assets.model.fieldset.fields','consumables','accessories',- 'licenses'+ 'licenses',])->find($selectedUserId);// If the user to view couldn't be found (shouldn't happen with proper logic), redirect with error- if (!$userToView) {+ if (! $userToView) {return redirect()->route('view-assets')->with('error', trans('admin/users/message.user_not_found'));}@@ -146,14 +136,14 @@ class ViewAssetsController extends Controller'field_array' => $fieldArray,'settings' => $settings,'subordinates' => $subordinates,- 'selectedUserId' => $selectedUserId+ 'selectedUserId' => $selectedUserId,]);}/*** Returns view of requestable items for a user.*/- public function getRequestableIndex() : View+ public function getRequestableIndex(): View{$assets = Asset::with('model', 'defaultLoc', 'location', 'assignedTo', 'requests')->Hardware()->RequestableAssets();$models = AssetModel::with([@@ -161,10 +151,8 @@ class ViewAssetsController extends Controller'requests','assets' => function ($q) {$q->where('requestable', 1)- ->whereHas('assetstatus', fn ($s) =>- $s->where('archived', 0)- ->where(fn ($s) =>- $s->where('deployable', 1)->orWhere('pending', 1)+ ->whereHas('assetstatus', fn ($s) => $s->where('archived', 0)+ ->where(fn ($s) => $s->where('deployable', 1)->orWhere('pending', 1)));},@@ -185,7 +173,7 @@ class ViewAssetsController extends Controller$user = auth()->user();- $logaction = new Actionlog();+ $logaction = new Actionlog;$logaction->item_id = $data['asset_id'] = $item->id;$logaction->item_type = $fullItemType;$logaction->created_at = $data['requested_date'] = date('Y-m-d H:i:s');@@ -234,12 +222,14 @@ class ViewAssetsController extends Controller/*** Process a specific requested asset- * @param null $assetId+ *+ * @param null $assetId*/public function store(Asset $asset): RedirectResponse{try {CreateCheckoutRequestAction::run($asset, auth()->user());+return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.success'));} catch (AssetNotRequestable $e) {return redirect()->back()->with('error', 'Asset is not requestable');@@ -247,6 +237,7 @@ class ViewAssetsController extends Controllerreturn redirect()->back()->with('error', trans('admin/hardware/message.requests.error'));} catch (Exception $e) {report($e);+return redirect()->back()->with('error', trans('general.something_went_wrong'));}}@@ -255,15 +246,16 @@ class ViewAssetsController extends Controller{try {CancelCheckoutRequestAction::run($asset, auth()->user());+return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.canceled'));} catch (Exception $e) {report($e);+return redirect()->back()->with('error', trans('general.something_went_wrong'));}}-- public function getRequestedAssets() : View+ public function getRequestedAssets(): View{return view('account/requested');}