DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

add a try catch around template validation

Browse source
This commit is contained in:
Godfrey M 2025-01-08 12:13:31 -08:00
parent ce7a8ad808
commit f4e69679ca
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/View/Label.php
View file

@ -38,7 +38,6 @@ class Label implements View
$settings = $this->data->get('settings'); $settings = $this->data->get('settings');
$assets = $this->data->get('assets'); $assets = $this->data->get('assets');
$offset = $this->data->get('offset'); $offset = $this->data->get('offset');
$template = LabelModel::find($settings->label2_template);
// If disabled, pass to legacy view // If disabled, pass to legacy view
if ((!$settings->label2_enable)) { if ((!$settings->label2_enable)) {
@ -49,11 +48,24 @@ class Label implements View
->with('count', $this->data->get('count')); ->with('count', $this->data->get('count'));
} }
if ($template === null) { try {
throw new \UnexpectedValueException('Template is null.'); $template = LabelModel::find($settings->label2_template);
if ($template === null) {
throw new \UnexpectedValueException('Template is null.');
}
$template->validate();
} catch (\UnexpectedValueException $e) {
\Log::error('Validation failed: ' . $e->getMessage());
} catch (\Throwable $e) {
\Log::error('An unexpected error occurred: ' . $e->getMessage());
} }
$template->validate();
$pdf = new TCPDF( $pdf = new TCPDF(
$template->getOrientation(), $template->getOrientation(),