X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FDateTimeFormat.php;h=b413e80c57728b70ca16431c48ccb79c4a337d43;hb=3bca4fe2a64671d09e08346456cdfa6c12f996e9;hp=07590bac0a0a60f985f1999ac0a39afccab15746;hpb=e80d68ba53776bed047d897f52db7e25b35a479d;p=friendica.git diff --git a/src/Util/DateTimeFormat.php b/src/Util/DateTimeFormat.php index 07590bac0a..b413e80c57 100644 --- a/src/Util/DateTimeFormat.php +++ b/src/Util/DateTimeFormat.php @@ -1,6 +1,6 @@ format($format)); + $d = new DateTime('now', new DateTimeZone('UTC')); + $d->setDate(1, 1, 1)->setTime(0, 0); + return $d->format($format); } try { @@ -149,8 +151,12 @@ class DateTimeFormat try { $d = new DateTime($s, $from_obj); } catch (Exception $e) { - Logger::log('DateTimeFormat::convert: exception: ' . $e->getMessage()); - $d = new DateTime('now', $from_obj); + try { + $d = new DateTime(self::fix($s), $from_obj); + } catch (\Throwable $e) { + Logger::warning('DateTimeFormat::convert: exception: ' . $e->getMessage()); + $d = new DateTime('now', $from_obj); + } } try { @@ -159,11 +165,40 @@ class DateTimeFormat $to_obj = new DateTimeZone('UTC'); } - $d->setTimeZone($to_obj); + $d->setTimezone($to_obj); return $d->format($format); } + /** + * Fix weird date formats. + * + * Note: This method isn't meant to sanitize valid date/time strings, for example it will mangle relative date + * strings like "now - 3 days". + * + * @see \Friendica\Test\src\Util\DateTimeFormatTest::dataFix() for a list of examples handled by this method. + * @param string $dateString + * @return string + */ + public static function fix(string $dateString): string + { + $search = ['Mär', 'März', 'Mai', 'Juni', 'Juli', 'Okt', 'Dez', 'ET' , 'ZZ', ' - ', '+', '+', ' (Coordinated Universal Time)', '\\']; + $replace = ['Mar', 'Mar' , 'May', 'Jun' , 'Jul' , 'Oct', 'Dec', 'EST', 'Z' , ', ' , '+' , '+' , '' , '']; + + $dateString = str_replace($search, $replace, $dateString); + + $pregPatterns = [ + ['#(\w+), (\d+ \w+ \d+) (\d+:\d+:\d+) (.+)#', '$2 $3 $4'], + ['#(\d+:\d+) (\w+), (\w+) (\d+), (\d+)#', '$1 $2 $3 $4 $5'], + ]; + + foreach ($pregPatterns as $pattern) { + $dateString = preg_replace($pattern[0], $pattern[1], $dateString); + } + + return $dateString; + } + /** * Checks, if the given string is a date with the pattern YYYY-MM *