X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FUtil%2FTemporal.php;h=e6d0f207df71963d48ae28f140232e3ddcb9642b;hb=3a96a971890d822bc43519c83c1fa7d27592bfce;hp=ef27b54b2d00547e292a629a7164861b69ad3842;hpb=ae2959c7805ae458b125f33e34f650c1520b4ccf;p=friendica.git
diff --git a/src/Util/Temporal.php b/src/Util/Temporal.php
index ef27b54b2d..e6d0f207df 100644
--- a/src/Util/Temporal.php
+++ b/src/Util/Temporal.php
@@ -1,7 +1,22 @@
.
+ *
*/
namespace Friendica\Util;
@@ -210,7 +225,7 @@ class Temporal
public static function getDateTimeField(
DateTime $minDate,
DateTime $maxDate,
- DateTime $defaultDate,
+ DateTime $defaultDate = null,
$label,
$id = 'datetimepicker',
$pickdate = true,
@@ -256,7 +271,11 @@ class Temporal
$id,
$label,
$input_text,
- '',
+ DI::l10n()->t(
+ 'Time zone: %s Change in Settings',
+ str_replace('_', ' ', DI::app()->getTimeZone()) . ' (GMT ' . DateTimeFormat::localNow('P') . ')',
+ DI::baseUrl() . '/settings'
+ ),
$required ? '*' : '',
'placeholder="' . $readable_format . '"'
],
@@ -269,7 +288,7 @@ class Temporal
'lang' => $lang,
'minfrom' => $minfrom,
'maxfrom' => $maxfrom,
- ]
+ ],
]);
return $o;
@@ -345,28 +364,24 @@ class Temporal
* Returns the age in years, given a date of birth and the timezone of the person
* whose date of birth is provided.
*
- * @param string $dob Date of Birth
- * @param string $owner_tz (optional) Timezone of the person of interest
+ * @param string $dob Date of Birth
+ * @param string $timezone Timezone of the person of interest
*
* @return int Age in years
* @throws \Exception
*/
- public static function getAgeByTimezone($dob, $owner_tz = '')
+ public static function getAgeByTimezone(string $dob, string $timezone): int
{
if (!intval($dob)) {
return 0;
}
- if (!$owner_tz) {
- $owner_tz = date_default_timezone_get();
- }
-
- $birthdate = new DateTime($dob . ' 00:00:00', new DateTimeZone($owner_tz));
+ $birthdate = new DateTime($dob . ' 00:00:00', new DateTimeZone($timezone));
$currentDate = new DateTime('now', new DateTimeZone('UTC'));
$interval = $birthdate->diff($currentDate);
- return $interval->format('%y');
+ return (int) $interval->format('%y');
}
/**