Merge remote-tracking branch 'origin/develop'

snipe · snipe · commit e37a99082069 · 2025-02-10T22:42:58.000Z
diff --git a/app/Http/Controllers/Accessories/AccessoriesFilesController.php b/app/Http/Controllers/Accessories/AccessoriesFilesController.php
@@ -55,11 +55,11 @@ public function store(UploadFileRequest $request, $accessoryId = null) : Redirec
 
             }
 
-            return redirect()->route('accessories.show', $accessory->id)->with('error', trans('general.no_files_uploaded'));
+            return redirect()->route('accessories.show', $accessory->id)->withFragment('files')->with('error', trans('general.no_files_uploaded'));
         }
         // Prepare the error message
-        return redirect()->route('accessories.index')
-            ->with('error', trans('general.file_does_not_exist'));
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
+
     }
 
     /**
@@ -72,29 +72,27 @@ public function store(UploadFileRequest $request, $accessoryId = null) : Redirec
      */
     public function destroy($accessoryId = null, $fileId = null) : RedirectResponse
     {
-        $accessory = Accessory::find($accessoryId);
-
-        // the asset is valid
-        if (isset($accessory->id)) {
+        if ($accessory = Accessory::find($accessoryId)) {
             $this->authorize('update', $accessory);
-            $log = Actionlog::find($fileId);
 
-            // Remove the file if one exists
-            if (Storage::exists('accessories/'.$log->filename)) {
-                try {
-                    Storage::delete('accessories/'.$log->filename);
-                } catch (\Exception $e) {
-                    Log::debug($e);
+            if ($log = Actionlog::find($fileId)) {
+
+                if (Storage::exists('private_uploads/accessories/'.$log->filename)) {
+                    try {
+                        Storage::delete('private_uploads/accessories/' . $log->filename);
+                        $log->delete();
+                        return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
+                    } catch (\Exception $e) {
+                        Log::debug($e);
+                        return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist'));
+                    }
                 }
-            }
-
-            $log->delete();
 
-            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
+            }
+            return redirect()->route('accessories.show', ['accessory' => $accessory])->withFragment('files')->with('error',  trans('general.log_record_not_found'));
         }
 
-        // Redirect to the licence management page
-        return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist'));
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
     }
 
     /**
@@ -124,10 +122,11 @@ public function show($accessoryId = null, $fileId = null) : View | RedirectRespo
                 }
             }
 
-            return redirect()->route('accessories.show', ['accessory' => $accessory])->with('error',  trans('general.log_record_not_found'));
+            return redirect()->route('accessories.show', ['accessory' => $accessory])->withFragment('files')->with('error',  trans('general.log_record_not_found'));
 
         }
 
-        return redirect()->route('accessories.index')->with('error', trans('general.file_not_found'));
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
+
     }
 }
diff --git a/app/Http/Requests/SettingsSamlRequest.php b/app/Http/Requests/SettingsSamlRequest.php
@@ -62,7 +62,7 @@ public function withValidator($validator)
             $custom_privateKey = '';
             $custom_x509certNew = '';
             if (! empty($this->input('saml_custom_settings'))) {
-                $req_custom_settings = preg_split('/\r\n|\r|\n/', $this->input('saml_custom_settings'));
+                $req_custom_settings = preg_split('/\r\n|\r|\n/', $this->input('saml_custom_settings', ''));
                 $custom_settings = [];
 
                 foreach ($req_custom_settings as $custom_setting) {
diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php
@@ -307,7 +307,7 @@ public function setFormatAttribute($value)
     public function formatFieldValuesAsArray()
     {
         $result = [];
-        $arr = preg_split('/\\r\\n|\\r|\\n/', $this->field_values);
+        $arr = preg_split('/\\r\\n|\\r|\\n/', $this->field_values ?? '');
 
         if (($this->element != 'checkbox') && ($this->element != 'radio')) {
             $result[''] = 'Select '.strtolower($this->format);
diff --git a/app/Notifications/CheckinAssetNotification.php b/app/Notifications/CheckinAssetNotification.php
@@ -79,7 +79,7 @@ public function toSlack()
 
         $fields = [
             trans('general.administrator') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
-            trans('general.status') => $item->assetstatus->name,
+            trans('general.status') => $item->assetstatus?->name,
             trans('general.location') => ($item->location) ? $item->location->name : '',
         ];
 
@@ -106,19 +106,19 @@ public function toMicrosoftTeams()
                 ->title(trans('mail.Asset_Checkin_Notification'))
                 ->addStartGroupToSection('activityText')
                 ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityText')
-                ->fact(trans('mail.checked_into'), $item->location->name ? $item->location->name : '')
+                ->fact(trans('mail.checked_into'), ($item->location) ? $item->location->name : '')
                 ->fact(trans('mail.Asset_Checkin_Notification') . " by ", $admin->present()->fullName())
-                ->fact(trans('admin/hardware/form.status'), $item->assetstatus->name)
+                ->fact(trans('admin/hardware/form.status'), $item->assetstatus?->name)
                 ->fact(trans('mail.notes'), $note ?: '');
         }
 
 
         $message = trans('mail.Asset_Checkin_Notification');
         $details = [
             trans('mail.asset') => htmlspecialchars_decode($item->present()->name),
-            trans('mail.checked_into') => $item->location->name ? $item->location->name : '',
+            trans('mail.checked_into') => ($item->location) ? $item->location->name : '',
             trans('mail.Asset_Checkin_Notification')." by " => $admin->present()->fullName(),
-            trans('admin/hardware/form.status') => $item->assetstatus->name,
+            trans('admin/hardware/form.status') => $item->assetstatus?->name,
             trans('mail.notes') => $note ?: '',
         ];
 
@@ -142,8 +142,8 @@ public function toGoogleChat()
                         Section::create(
                             KeyValue::create(
                                 trans('mail.checked_into') ?: '',
-                                $item->location->name ? $item->location->name : '',
-                                trans('admin/hardware/form.status').": ".$item->assetstatus->name,
+                                ($item->location) ? $item->location->name : '',
+                                trans('admin/hardware/form.status').": ".$item->assetstatus?->name,
                             )
                                 ->onClick(route('hardware.show', $item->id))
                         )
diff --git a/app/Services/Saml.php b/app/Services/Saml.php
@@ -209,7 +209,7 @@ private function loadSettings()
                 }
             }
 
-            $custom_settings = preg_split('/\r\n|\r|\n/', $setting->saml_custom_settings);
+            $custom_settings = preg_split('/\r\n|\r|\n/', $setting->saml_custom_settings ?? '');
             if ($custom_settings) {
                 foreach ($custom_settings as $custom_setting) {
                     $split = explode('=', $custom_setting, 2);
diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php
@@ -128,7 +128,7 @@
           <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
             <div class="col-md-9 col-md-offset-3">
               <label for="image_delete" class="form-control">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['id' => 'image_delete', 'aria-label'=>'image_delete']) }}
+                <input type="checkbox" name="image_delete" id="image_delete" value="1" @checked(old('image_delete')) aria-label="image_delete">
                 {{ trans('general.image_delete') }}
               </label>
               {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
@@ -150,13 +150,23 @@
         @if ($snipeSettings->two_factor_enabled=='1')
         <div class="form-group {{ $errors->has('two_factor_optin') ? 'has-error' : '' }}">
           <div class="col-md-7 col-md-offset-3">
-            @can('self.two_factor')
-              <label class="form-control">{{ Form::checkbox('two_factor_optin', '1', old('two_factor_optin', $user->two_factor_optin)) }}
-            @else
-                <label class="form-control form-control--disabled">{{ Form::checkbox('two_factor_optin', '1', old('two_factor_optin', $user->two_factor_optin),['disabled' => 'disabled']) }}
-            @endcan
-
-            {{ trans('admin/settings/general.two_factor_enabled_text') }}</label>
+              <label
+                  for="two_factor_optin"
+                  @class([
+                    'form-control',
+                    'form-control--disabled' => auth()->user()->cannot('self.two_factor'),
+                  ])
+              >
+                <input
+                    type="checkbox"
+                    name="two_factor_optin"
+                    id="two_factor_optin"
+                    value="1"
+                    @checked(old('two_factor_optin', $user->two_factor_optin))
+                    @disabled(auth()->user()->cannot('self.two_factor'))
+                >
+                {{ trans('admin/settings/general.two_factor_enabled_text') }}
+              </label>
             @can('self.two_factor')
               <p class="help-block">{{ trans('admin/settings/general.two_factor_enabled_warning') }}</p>
             @else
diff --git a/resources/views/custom_fields/fieldsets/view.blade.php b/resources/views/custom_fields/fieldsets/view.blade.php
@@ -109,7 +109,7 @@
 
                 <div class="checkbox-inline">
                     <label>
-                    {{ Form::checkbox('required', 'on', old('required')) }}
+                      <input type="checkbox" name="required" value="on" @checked(old('required'))>
                       <span style="padding-left: 10px;">{{ trans('admin/custom_fields/general.required') }}</span>
                     </label>
                 </div>
diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php
@@ -47,7 +47,7 @@
             </div>
             <div class="col-md-5">
               <label class="form-control">
-                {{ Form::checkbox('null_name', '1', false) }}
+                <input type="checkbox" name="null_name" value="1">
                 {{ trans_choice('general.set_to_null', count($assets), ['selection_count' => count($assets)]) }}
               </label>
             </div>
@@ -66,7 +66,7 @@
             </div>
             <div class="col-md-5">
               <label class="form-control">
-                {{ Form::checkbox('null_purchase_date', '1', false) }}
+                <input type="checkbox" name="null_purchase_date" value="1">
                 {{ trans_choice('general.set_to_null', count($assets),['selection_count' => count($assets)]) }}
               </label>
             </div>
@@ -85,7 +85,7 @@
              </div>
               <div class="col-md-5">
                 <label class="form-control">
-                  {{ Form::checkbox('null_expected_checkin_date', '1', false) }}
+                  <input type="checkbox" name="null_expected_checkin_date" value="1">
                   {{ trans_choice('general.set_to_null', count($assets), ['selection_count' => count($assets)]) }}
                 </label>
               </div>
@@ -103,7 +103,7 @@
             </div>
             <div class="col-md-5">
               <label class="form-control">
-                {{ Form::checkbox('null_asset_eol_date', '1', false) }}
+                <input type="checkbox" name="null_asset_eol_date" value="1">
                 {{ trans_choice('general.set_to_null', count($assets),['selection_count' => count($assets)]) }}
               </label>
             </div>
@@ -112,7 +112,7 @@
           <div class="form-group">
             <div class="col-md-9 col-md-offset-3">
               <label class="form-control">
-                {{ Form::checkbox('calc_eol', '1', false) }}
+                <input type="checkbox" name="calc_eol" value="1">
                 {{ trans('admin/hardware/form.calc_eol') }}
               </label>
             </div>
@@ -215,7 +215,7 @@
             </div>
             <div class="col-md-5">
               <label class="form-control">
-                {{ Form::checkbox('null_next_audit_date', '1', false) }}
+                <input type="checkbox" name="null_next_audit_date" value="1">
                 {{ trans_choice('general.set_to_null', count($assets), ['selection_count' => count($assets)]) }}
               </label>
             </div>

Original file line number	Diff line number	Diff line change
`@@ -55,11 +55,11 @@ public function store(UploadFileRequest $request, $accessoryId = null) : Redirec`
`55`	`55`
`56`	`56`	`}`
`57`	`57`
`58`		`- return redirect()->route('accessories.show', $accessory->id)->with('error', trans('general.no_files_uploaded'));`
	`58`	`+ return redirect()->route('accessories.show', $accessory->id)->withFragment('files')->with('error', trans('general.no_files_uploaded'));`
`59`	`59`	`}`
`60`	`60`	`// Prepare the error message`
`61`		`- return redirect()->route('accessories.index')`
`62`		`- ->with('error', trans('general.file_does_not_exist'));`
	`61`	`+ return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));`
	`62`	`+`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/**`
`@@ -72,29 +72,27 @@ public function store(UploadFileRequest $request, $accessoryId = null) : Redirec`
`72`	`72`	`*/`
`73`	`73`	`public function destroy($accessoryId = null, $fileId = null) : RedirectResponse`
`74`	`74`	`{`
`75`		`- $accessory = Accessory::find($accessoryId);`
`76`		`-`
`77`		`- // the asset is valid`
`78`		`- if (isset($accessory->id)) {`
	`75`	`+ if ($accessory = Accessory::find($accessoryId)) {`
`79`	`76`	`$this->authorize('update', $accessory);`
`80`		`- $log = Actionlog::find($fileId);`
`81`	`77`
`82`		`- // Remove the file if one exists`
`83`		`- if (Storage::exists('accessories/'.$log->filename)) {`
`84`		`- try {`
`85`		`- Storage::delete('accessories/'.$log->filename);`
`86`		`- } catch (\Exception $e) {`
`87`		`- Log::debug($e);`
	`78`	`+ if ($log = Actionlog::find($fileId)) {`
	`79`	`+`
	`80`	`+ if (Storage::exists('private_uploads/accessories/'.$log->filename)) {`
	`81`	`+ try {`
	`82`	`+ Storage::delete('private_uploads/accessories/' . $log->filename);`
	`83`	`+ $log->delete();`
	`84`	`+ return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));`
	`85`	`+ } catch (\Exception $e) {`
	`86`	`+ Log::debug($e);`
	`87`	`+ return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist'));`
	`88`	`+ }`
`88`	`89`	`}`
`89`		`- }`
`90`		`-`
`91`		`- $log->delete();`
`92`	`90`
`93`		`- return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));`
	`91`	`+ }`
	`92`	`+ return redirect()->route('accessories.show', ['accessory' => $accessory])->withFragment('files')->with('error', trans('general.log_record_not_found'));`
`94`	`93`	`}`
`95`	`94`
`96`		`- // Redirect to the licence management page`
`97`		`- return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist'));`
	`95`	`+ return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));`
`98`	`96`	`}`
`99`	`97`
`100`	`98`	`/**`
`@@ -124,10 +122,11 @@ public function show($accessoryId = null, $fileId = null) : View \| RedirectRespo`
`124`	`122`	`}`
`125`	`123`	`}`
`126`	`124`
`127`		`- return redirect()->route('accessories.show', ['accessory' => $accessory])->with('error', trans('general.log_record_not_found'));`
	`125`	`+ return redirect()->route('accessories.show', ['accessory' => $accessory])->withFragment('files')->with('error', trans('general.log_record_not_found'));`
`128`	`126`
`129`	`127`	`}`
`130`	`128`
`131`		`- return redirect()->route('accessories.index')->with('error', trans('general.file_not_found'));`
	`129`	`+ return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));`
	`130`	`+`
`132`	`131`	`}`
`133`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ public function setFormatAttribute($value)`
`307`	`307`	`public function formatFieldValuesAsArray()`
`308`	`308`	`{`
`309`	`309`	`$result = [];`
`310`		`- $arr = preg_split('/\\r\\n\|\\r\|\\n/', $this->field_values);`
	`310`	`+ $arr = preg_split('/\\r\\n\|\\r\|\\n/', $this->field_values ?? '');`
`311`	`311`
`312`	`312`	`if (($this->element != 'checkbox') && ($this->element != 'radio')) {`
`313`	`313`	`$result[''] = 'Select '.strtolower($this->format);`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ private function loadSettings()`
`209`	`209`	`}`
`210`	`210`	`}`
`211`	`211`
`212`		`- $custom_settings = preg_split('/\r\n\|\r\|\n/', $setting->saml_custom_settings);`
	`212`	`+ $custom_settings = preg_split('/\r\n\|\r\|\n/', $setting->saml_custom_settings ?? '');`
`213`	`213`	`if ($custom_settings) {`
`214`	`214`	`foreach ($custom_settings as $custom_setting) {`
`215`	`215`	`$split = explode('=', $custom_setting, 2);`