added support for multiple date formats

This commit is contained in:
Andy Miller
2016-05-10 16:53:19 -06:00
parent 710d2c6fd5
commit a78c017f91

View File

@@ -1024,49 +1024,49 @@ class Admin
{ {
static $guess; static $guess;
if (!$guess) { if (!isset($guess[$date])) {
if (Utils::contains($date, '/')) { if (Utils::contains($date, '/')) {
if ($this->validateDate($date, 'm/d/Y H:i')) { if ($this->validateDate($date, 'm/d/Y H:i')) {
$guess = 'm/d/Y H:i'; $guess[$date] = 'm/d/Y H:i';
} elseif ($this->validateDate($date, 'm/d/y H:i')) { } elseif ($this->validateDate($date, 'm/d/y H:i')) {
$guess = 'm/d/y H:i'; $guess[$date] = 'm/d/y H:i';
} elseif ($this->validateDate($date, 'm/d/Y G:i')) { } elseif ($this->validateDate($date, 'm/d/Y G:i')) {
$guess = 'm/d/Y G:i'; $guess[$date] = 'm/d/Y G:i';
} elseif ($this->validateDate($date, 'm/d/y G:i')) { } elseif ($this->validateDate($date, 'm/d/y G:i')) {
$guess = 'm/d/y G:i'; $guess[$date] = 'm/d/y G:i';
} elseif ($this->validateDate($date, 'm/d/Y h:ia')) { } elseif ($this->validateDate($date, 'm/d/Y h:ia')) {
$guess = 'm/d/Y h:ia'; $guess[$date] = 'm/d/Y h:ia';
} elseif ($this->validateDate($date, 'm/d/y h:ia')) { } elseif ($this->validateDate($date, 'm/d/y h:ia')) {
$guess = 'm/d/y h:ia'; $guess[$date] = 'm/d/y h:ia';
} elseif ($this->validateDate($date, 'm/d/Y g:ia')) { } elseif ($this->validateDate($date, 'm/d/Y g:ia')) {
$guess = 'm/d/Y g:ia'; $guess[$date] = 'm/d/Y g:ia';
} elseif ($this->validateDate($date, 'm/d/y g:ia')) { } elseif ($this->validateDate($date, 'm/d/y g:ia')) {
$guess = 'm/d/y g:ia'; $guess[$date] = 'm/d/y g:ia';
} }
} elseif (Utils::contains($date, '-')) { } elseif (Utils::contains($date, '-')) {
if ($this->validateDate($date, 'd-m-Y H:i')) { if ($this->validateDate($date, 'd-m-Y H:i')) {
$guess = 'd-m-Y H:i'; $guess[$date] = 'd-m-Y H:i';
} elseif ($this->validateDate($date, 'd-m-y H:i')) { } elseif ($this->validateDate($date, 'd-m-y H:i')) {
$guess = 'd-m-y H:i'; $guess[$date] = 'd-m-y H:i';
} elseif ($this->validateDate($date, 'd-m-Y G:i')) { } elseif ($this->validateDate($date, 'd-m-Y G:i')) {
$guess = 'd-m-Y G:i'; $guess[$date] = 'd-m-Y G:i';
} elseif ($this->validateDate($date, 'd-m-y G:i')) { } elseif ($this->validateDate($date, 'd-m-y G:i')) {
$guess = 'd-m-y G:i'; $guess[$date] = 'd-m-y G:i';
} elseif ($this->validateDate($date, 'd-m-Y h:ia')) { } elseif ($this->validateDate($date, 'd-m-Y h:ia')) {
$guess = 'd-m-Y h:ia'; $guess[$date] = 'd-m-Y h:ia';
} elseif ($this->validateDate($date, 'd-m-y h:ia')) { } elseif ($this->validateDate($date, 'd-m-y h:ia')) {
$guess = 'd-m-y h:ia'; $guess[$date] = 'd-m-y h:ia';
} elseif ($this->validateDate($date, 'd-m-Y g:ia')) { } elseif ($this->validateDate($date, 'd-m-Y g:ia')) {
$guess = 'd-m-Y g:ia'; $guess[$date] = 'd-m-Y g:ia';
} elseif ($this->validateDate($date, 'd-m-y g:ia')) { } elseif ($this->validateDate($date, 'd-m-y g:ia')) {
$guess = 'd-m-y g:ia'; $guess[$date] = 'd-m-y g:ia';
} }
} else { } else {
$guess = 'd-m-Y H:i'; $guess[$date] = 'd-m-Y H:i';
} }
} }
return $guess; return $guess[$date];
} }
public function validateDate($date, $format) public function validateDate($date, $format)