Merge pull request #10967 from annando/api

[friendica.git] / src / Util / DateTimeFormat.php

diff --git a/src/Util/DateTimeFormat.php b/src/Util/DateTimeFormat.php
index 07590bac0a0a60f985f1999ac0a39afccab15746..cf3216a152c8c5ebc3b2cfdf8758f719feeeaf46 100644 (file)
--- a/src/Util/DateTimeFormat.php
+++ b/src/Util/DateTimeFormat.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -31,9 +31,17 @@ use Exception;
  */
 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';
+
+       static $localTimezone = 'UTC';
+
+       public static function setLocalTimeZone(string $timezone)
+       {
+               self::$localTimezone = $timezone;
+       }
 
        /**
         * convert() shorthand for UTC.
@@ -58,7 +66,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);
        }
 
        /**
@@ -149,7 +157,7 @@ class DateTimeFormat
                try {
                        $d = new DateTime($s, $from_obj);
                } catch (Exception $e) {
-                       Logger::log('DateTimeFormat::convert: exception: ' . $e->getMessage());
+                       Logger::notice('DateTimeFormat::convert: exception: ' . $e->getMessage());
                        $d = new DateTime('now', $from_obj);
                }
 
@@ -159,7 +167,7 @@ class DateTimeFormat
                        $to_obj = new DateTimeZone('UTC');
                }
 
-               $d->setTimeZone($to_obj);
+               $d->setTimezone($to_obj);
 
                return $d->format($format);
        }