X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FDateTimeFormat.php;h=862ce6e9affe08e0e87b6df66d1700c442ba8597;hb=b5ad8c3e153976cf3e63753597377f09852d98d7;hp=1725a0e02dcdebe52fd413e4e424138e38947a17;hpb=831fff0f5c4497ccb14a9e1cb3299136f5682a3d;p=friendica.git

diff --git a/src/Util/DateTimeFormat.php b/src/Util/DateTimeFormat.php
index 1725a0e02d..862ce6e9af 100644
--- a/src/Util/DateTimeFormat.php
+++ b/src/Util/DateTimeFormat.php
@@ -1,7 +1,22 @@
 <?php
-
 /**
- * @file src/Util/DateTimeFormat.php
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Util;
@@ -12,13 +27,22 @@ use DateTimeZone;
 use Exception;
 
 /**
- * @brief Temporal class
+ * Temporal class
  */
 class DateTimeFormat
 {
-	const ATOM = 'Y-m-d\TH:i:s\Z';
+	const ATOM  = 'Y-m-d\TH:i:s\Z';
 	const MYSQL = 'Y-m-d H:i:s';
-	const HTTP = 'D, d M Y H:i:s \G\M\T';
+	const HTTP  = 'D, d M Y H:i:s \G\M\T';
+	const JSON  = 'Y-m-d\TH:i:s.v\Z';
+	const API   = 'D M d H:i:s +0000 Y';
+
+	static $localTimezone = 'UTC';
+
+	public static function setLocalTimeZone(string $timezone)
+	{
+		self::$localTimezone = $timezone;
+	}
 
 	/**
 	 * convert() shorthand for UTC.
@@ -28,7 +52,7 @@ class DateTimeFormat
 	 * @return string
 	 * @throws Exception
 	 */
-	public static function utc($time, $format = self::MYSQL)
+	public static function utc(string $time, string $format = self::MYSQL): string
 	{
 		return self::convert($time, 'UTC', 'UTC', $format);
 	}
@@ -43,7 +67,7 @@ class DateTimeFormat
 	 */
 	public static function local($time, $format = self::MYSQL)
 	{
-		return self::convert($time, date_default_timezone_get(), 'UTC', $format);
+		return self::convert($time, self::$localTimezone, 'UTC', $format);
 	}
 
 	/**
@@ -78,13 +102,13 @@ class DateTimeFormat
 	 * @return string
 	 * @throws Exception
 	 */
-	public static function utcNow($format = self::MYSQL)
+	public static function utcNow(string $format = self::MYSQL): string
 	{
 		return self::utc('now', $format);
 	}
 
 	/**
-	 * @brief General purpose date parse/convert/format function.
+	 * General purpose date parse/convert/format function.
 	 *
 	 * @param string $s       Some parseable date/time string
 	 * @param string $tz_to   Destination timezone
@@ -111,6 +135,8 @@ class DateTimeFormat
 			$s = 'now';
 		}
 
+		$s = self::fix($s);
+
 		/*
 		 * Slight hackish adjustment so that 'zero' datetime actually returns what is intended
 		 * otherwise we end up with -0001-11-30 ...
@@ -134,7 +160,7 @@ class DateTimeFormat
 		try {
 			$d = new DateTime($s, $from_obj);
 		} catch (Exception $e) {
-			Logger::log('DateTimeFormat::convert: exception: ' . $e->getMessage());
+			Logger::warning('DateTimeFormat::convert: exception: ' . $e->getMessage());
 			$d = new DateTime('now', $from_obj);
 		}
 
@@ -144,11 +170,37 @@ class DateTimeFormat
 			$to_obj = new DateTimeZone('UTC');
 		}
 
-		$d->setTimeZone($to_obj);
+		$d->setTimezone($to_obj);
 
 		return $d->format($format);
 	}
 
+	/**
+	 * Fix weird date formats
+	 *
+	 * @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
+	{
+		$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'],
+			['#(\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'],
+			['~(\d+-\d+-\d+)T(\d+:\d+:\d+)&#x2B;(\d+:\d+)~', '$1T$2+$3'],
+		];
+
+		foreach ($patterns 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
 	 *