X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FTemporal.php;h=e6d0f207df71963d48ae28f140232e3ddcb9642b;hb=720a43461d67ab229de0aecfc5008f22cc4c1c54;hp=c4a04d586cb266cd32d647617fe99056bdd420f6;hpb=85dc9bb96b30819fcf544c9aa1013a8f380d6981;p=friendica.git

diff --git a/src/Util/Temporal.php b/src/Util/Temporal.php
index c4a04d586c..e6d0f207df 100644
--- a/src/Util/Temporal.php
+++ b/src/Util/Temporal.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -225,7 +225,7 @@ class Temporal
 	public static function getDateTimeField(
 		DateTime $minDate,
 		DateTime $maxDate,
-		DateTime $defaultDate,
+		DateTime $defaultDate = null,
 		$label,
 		$id       = 'datetimepicker',
 		$pickdate = true,
@@ -271,7 +271,11 @@ class Temporal
 				$id,
 				$label,
 				$input_text,
-				'',
+				DI::l10n()->t(
+					'Time zone: <strong>%s</strong> <a href="%s">Change in Settings</a>',
+					str_replace('_', ' ', DI::app()->getTimeZone()) . ' (GMT ' . DateTimeFormat::localNow('P') . ')',
+					DI::baseUrl() . '/settings'
+				),
 				$required ? '*' : '',
 				'placeholder="' . $readable_format . '"'
 			],
@@ -284,7 +288,7 @@ class Temporal
 				'lang' => $lang,
 				'minfrom' => $minfrom,
 				'maxfrom' => $maxfrom,
-			]
+			],
 		]);
 
 		return $o;
@@ -360,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');
 	}
 
 	/**