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 2 Packages Projects Releases Wiki Activity

Wrap the Carbon method in a try/catch to prevent crashing on bad data

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2022-06-03 15:25:39 -07:00
parent 7ca617f077
commit 53f9e2bc7a
1 changed files with 42 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
app/Helpers/Helper.php
View file

@ -841,6 +841,15 @@ class Helper
return preg_replace('/\s+/u', '_', trim($string)); return preg_replace('/\s+/u', '_', trim($string));
} }
/**
* Return an array (or null) of the the raw and formatted date object for easy use in
* the API and the bootstrap table listings.
*
* @param $date
* @param $type
* @param $array
* @return array|string|null
*/
public static function getFormattedDateObject($date, $type = 'datetime', $array = true) public static function getFormattedDateObject($date, $type = 'datetime', $array = true)
{ {
if ($date == '') { if ($date == '') {
@ -848,21 +857,42 @@ class Helper
} }
$settings = Setting::getSettings(); $settings = Setting::getSettings();
$tmp_date = new \Carbon($date);
if ($type == 'datetime') { /**
$dt['datetime'] = $tmp_date->format('Y-m-d H:i:s'); * Wrap this in a try/catch so that if Carbon crashes, for example if the $date value
$dt['formatted'] = $tmp_date->format($settings->date_display_format.' '.$settings->time_display_format); * isn't actually valid, we don't crash out completely.
} else { *
$dt['date'] = $tmp_date->format('Y-m-d'); * While this *shouldn't* typically happen since we validate dates before entering them
$dt['formatted'] = $tmp_date->format($settings->date_display_format); * into the database (and we use date/datetime fields for native fields in the system),
* It is a possible scenario that a custom field could be created as an "ANY" field, data gets
* added, and then the custom field format gets edited later. If someone put bad data in the
* database before then - or if they manually edited the field's value - it will crash.
*
*/
=
try {
$tmp_date = new \Carbon($date);
if ($type == 'datetime') {
$dt['datetime'] = $tmp_date->format('Y-m-d H:i:s');
$dt['formatted'] = $tmp_date->format($settings->date_display_format.' '.$settings->time_display_format);
} else {
$dt['date'] = $tmp_date->format('Y-m-d');
$dt['formatted'] = $tmp_date->format($settings->date_display_format);
}
if ($array == 'true') {
return $dt;
}
return $dt['formatted'];
} catch (\Exception $e) {
\Log::warning($e);
return 'ERROR: Date value is invalid';
} }
if ($array == 'true') {
return $dt;
}
return $dt['formatted'];
} }
// Nicked from Drupal :) // Nicked from Drupal :)