mirror of
https://github.com/getgrav/grav-plugin-admin.git
synced 2025-11-03 03:46:30 +01:00
Better date format guesser
This commit is contained in:
@@ -1012,44 +1012,36 @@ class Admin
|
|||||||
{
|
{
|
||||||
static $guess;
|
static $guess;
|
||||||
|
|
||||||
|
$date_formats = [
|
||||||
|
'm/d/y',
|
||||||
|
'm/d/Y',
|
||||||
|
'n/d/y',
|
||||||
|
'n/d/Y',
|
||||||
|
'd-m-Y',
|
||||||
|
'd-m-y',
|
||||||
|
];
|
||||||
|
|
||||||
|
$time_formats = [
|
||||||
|
'H:i',
|
||||||
|
'G:i',
|
||||||
|
'h:ia',
|
||||||
|
'g:ia'
|
||||||
|
];
|
||||||
|
|
||||||
if (!isset($guess[$date])) {
|
if (!isset($guess[$date])) {
|
||||||
if (Utils::contains($date, '/')) {
|
foreach ($date_formats as $date_format) {
|
||||||
if ($this->validateDate($date, 'm/d/Y H:i')) {
|
foreach ($time_formats as $time_format) {
|
||||||
$guess[$date] = 'm/d/Y H:i';
|
if ($this->validateDate($date, "$date_format $time_format")) {
|
||||||
} elseif ($this->validateDate($date, 'm/d/y H:i')) {
|
$guess[$date] = "$date_format $time_format";
|
||||||
$guess[$date] = 'm/d/y H:i';
|
break 2;
|
||||||
} elseif ($this->validateDate($date, 'm/d/Y G:i')) {
|
} elseif ($this->validateDate($date, "$time_format $date_format")) {
|
||||||
$guess[$date] = 'm/d/Y G:i';
|
$guess[$date] = "$time_format $date_format";
|
||||||
} elseif ($this->validateDate($date, 'm/d/y G:i')) {
|
break 2;
|
||||||
$guess[$date] = 'm/d/y G:i';
|
}
|
||||||
} elseif ($this->validateDate($date, 'm/d/Y h:ia')) {
|
|
||||||
$guess[$date] = 'm/d/Y h:ia';
|
|
||||||
} elseif ($this->validateDate($date, 'm/d/y h:ia')) {
|
|
||||||
$guess[$date] = 'm/d/y h:ia';
|
|
||||||
} elseif ($this->validateDate($date, 'm/d/Y g:ia')) {
|
|
||||||
$guess[$date] = 'm/d/Y g:ia';
|
|
||||||
} elseif ($this->validateDate($date, 'm/d/y g:ia')) {
|
|
||||||
$guess[$date] = 'm/d/y g:ia';
|
|
||||||
}
|
}
|
||||||
} elseif (Utils::contains($date, '-')) {
|
}
|
||||||
if ($this->validateDate($date, 'd-m-Y H:i')) {
|
|
||||||
$guess[$date] = 'd-m-Y H:i';
|
if (!isset($guess[$date])) {
|
||||||
} elseif ($this->validateDate($date, 'd-m-y H:i')) {
|
|
||||||
$guess[$date] = 'd-m-y H:i';
|
|
||||||
} elseif ($this->validateDate($date, 'd-m-Y G:i')) {
|
|
||||||
$guess[$date] = 'd-m-Y G:i';
|
|
||||||
} elseif ($this->validateDate($date, 'd-m-y G:i')) {
|
|
||||||
$guess[$date] = 'd-m-y G:i';
|
|
||||||
} elseif ($this->validateDate($date, 'd-m-Y h:ia')) {
|
|
||||||
$guess[$date] = 'd-m-Y h:ia';
|
|
||||||
} elseif ($this->validateDate($date, 'd-m-y h:ia')) {
|
|
||||||
$guess[$date] = 'd-m-y h:ia';
|
|
||||||
} elseif ($this->validateDate($date, 'd-m-Y g:ia')) {
|
|
||||||
$guess[$date] = 'd-m-Y g:ia';
|
|
||||||
} elseif ($this->validateDate($date, 'd-m-y g:ia')) {
|
|
||||||
$guess[$date] = 'd-m-y g:ia';
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$guess[$date] = 'd-m-Y H:i';
|
$guess[$date] = 'd-m-Y H:i';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user