Merge pull request #12390 from annando/fixes

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

diff --git a/src/Util/Temporal.php b/src/Util/Temporal.php
index 0186b59dd6157985d89128fa22f125981e95f8ad..f6805a92224b4eaf8eda09789bf04b37edff1352 100644 (file)
--- a/src/Util/Temporal.php
+++ b/src/Util/Temporal.php
@@ -238,7 +238,7 @@ class Temporal
                bool $required = false): string
        {
                // First day of the week (0 = Sunday)
-               $firstDay = DI::pConfig()->get(local_user(), 'system', 'first_day_of_week', 0);
+               $firstDay = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'first_day_of_week', 0);
 
                $lang = substr(DI::l10n()->getCurrentLang(), 0, 2);
 
@@ -305,27 +305,38 @@ class Temporal
         * Results relative to current timezone.
         * Limited to range of timestamps.
         *
-        * @param string $posted_date MySQL-formatted date string (YYYY-MM-DD HH:MM:SS)
-        * @param string $format (optional) Parsed with sprintf()
+        * @param string $posted_date  MySQL-formatted date string (YYYY-MM-DD HH:MM:SS)
+        * @param string $format       (optional) Parsed with sprintf()
+        * @param bool   $compare_time Compare date (false) or date and time (true). "true" is default.
         *    <tt>%1$d %2$s ago</tt>, e.g. 22 hours ago, 1 minute ago
         *
         * @return string with relative date
         */
-       public static function getRelativeDate(string $posted_date, string $format = null): string
+       public static function getRelativeDate(string $posted_date = null, string $format = null, bool $compare_time = true): string
        {
-               $localtime = $posted_date . ' UTC';
+               if (empty($posted_date) || $posted_date <= DBA::NULL_DATETIME) {
+                       return DI::l10n()->t('never');
+               }
 
+               $localtime = $posted_date . ' UTC';
                $abs = strtotime($localtime);
 
-               if (is_null($posted_date) || $posted_date <= DBA::NULL_DATETIME || $abs === false) {
+               if ($abs === false) {
                        return DI::l10n()->t('never');
                }
 
+               $now = time();
+       
+               if (!$compare_time) {
+                       $now = mktime(0, 0, 0, date('m', $now), date('d', $now), date('Y', $now));
+                       $abs = mktime(0, 0, 0, date('m', $abs), date('d', $abs), date('Y', $abs));
+               }
+
                $isfuture = false;
-               $etime = time() - $abs;
+               $etime = $now - $abs;
 
                if ($etime < 1 && $etime >= 0) {
-                       return DI::l10n()->t('less than a second ago');
+                       return $compare_time ? DI::l10n()->t('less than a second ago') : DI::l10n()->t('today');
                }
 
                if ($etime < 0){