X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FDateTimeFormat.php;h=df7b6d92c4ef18f647ea80f2c7cad72159f047e5;hb=e02c475c9e98f27f631bd245592f1641c181db72;hp=45ed477fa7ee3e06ee1562c7ff78304a9f151fc1;hpb=6b917718fd4472cac36ef7f7edfbb15368bcf80e;p=friendica.git

diff --git a/src/Util/DateTimeFormat.php b/src/Util/DateTimeFormat.php
index 45ed477fa7..df7b6d92c4 100644
--- a/src/Util/DateTimeFormat.php
+++ b/src/Util/DateTimeFormat.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -119,7 +119,7 @@ class DateTimeFormat
 	 * @return string Formatted date according to given format
 	 * @throws Exception
 	 */
-	public static function convert($s = 'now', $tz_to = 'UTC', $tz_from = 'UTC', $format = self::MYSQL)
+	public static function convert(string $s = 'now', string $tz_to = 'UTC', string $tz_from = 'UTC', string $format = self::MYSQL): string
 	{
 		// Defaults to UTC if nothing is set, but throws an exception if set to empty string.
 		// Provide some sane defaults regardless.
@@ -135,20 +135,11 @@ class DateTimeFormat
 			$s = 'now';
 		}
 
-		$s = self::fixDateFormat($s);
-
-		/*
-		 * Slight hackish adjustment so that 'zero' datetime actually returns what is intended
-		 * otherwise we end up with -0001-11-30 ...
-		 * add 32 days so that we at least get year 00, and then hack around the fact that
-		 * months and days always start with 1.
-		 */
+		// Lowest possible datetime value
 		if (substr($s, 0, 10) <= '0001-01-01') {
-			if ($s < '0000-00-00') {
-				$s = '0000-00-00';
-			}
-			$d = new DateTime($s . ' + 32 days', new DateTimeZone('UTC'));
-			return str_replace('1', '0', $d->format($format));
+			$d = new DateTime('now', new DateTimeZone('UTC'));
+			$d->setDate(1, 1, 1)->setTime(0, 0);
+			return $d->format($format);
 		}
 
 		try {
@@ -160,8 +151,12 @@ class DateTimeFormat
 		try {
 			$d = new DateTime($s, $from_obj);
 		} catch (Exception $e) {
-			Logger::warning('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 {
@@ -176,23 +171,28 @@ class DateTimeFormat
 	}
 
 	/**
-	 * Fix weird date formats
+	 * 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
 	 */
-	private static function fixDateFormat(string $dateString): string
+	public static function fix(string $dateString): string
 	{
-		$patterns = [
-			['#(\w+), (\d+/\d+/\d+) - (\d+:\d+)#', '$1, $2 $3'],
-			['#(\d+-\d+-\d+)T(\d+:\d+:\d+)ZZ#', '$1T$2Z'],
-			['#(\d+-\d+-\d+)T(\d+:\d+:\d+\.\d+)ZZ#', '$1T$2Z'],
+		$search  = ['Mär', 'März', 'Mai', 'Juni', 'Juli', 'Okt', 'Dez', 'ET' , 'ZZ', ' - ', '&#x2B;', '&amp;#43;', ' (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'],
-			['#(\w+ \d+, \d+) - (\d+:\d+)#', '$1, $2'],
 		];
 
-		foreach ($patterns as $pattern) {
+		foreach ($pregPatterns as $pattern) {
 			$dateString = preg_replace($pattern[0], $pattern[1], $dateString);
 		}