X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FProfile.php;h=0dce1c08c67e4bffa272947380a62a0fcdb69d9b;hb=5e7285b9ba3236e3c5b6163df323eefebbc8b20e;hp=aeb7155f1930a1905c3592bb870606f33f77fb1b;hpb=b7a735529212a1305bdfa74b874cef9789d01a2d;p=friendica.git

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index aeb7155f19..0dce1c08c6 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -17,8 +17,8 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Protocol\Diaspora;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 use dba;
 
 require_once 'include/dba.php';
@@ -556,8 +556,8 @@ class Profile
 				WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ?
 				ORDER BY `start` ASC ",
 				local_user(),
-				Temporal::utc('now + 6 days'),
-				Temporal::utcNow()
+				DateTimeFormat::utc('now + 6 days'),
+				DateTimeFormat::utcNow()
 			);
 			if (DBM::is_result($s)) {
 				$r = dba::inArray($s);
@@ -600,7 +600,7 @@ class Profile
 
 					$rr['link'] = $url;
 					$rr['title'] = $rr['name'];
-					$rr['date'] = day_translate(Temporal::convert($rr['start'], $a->timezone, 'UTC', $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . L10n::t('[today]') : '');
+					$rr['date'] = day_translate(DateTimeFormat::convert($rr['start'], $a->timezone, 'UTC', $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . L10n::t('[today]') : '');
 					$rr['startime'] = null;
 					$rr['today'] = $today;
 				}
@@ -644,8 +644,8 @@ class Profile
 			WHERE `event`.`uid` = ? AND `type` != 'birthday' AND `start` < ? AND `start` >= ?
 			ORDER BY `start` ASC ",
 			local_user(),
-			Temporal::utc('now + 7 days'),
-			Temporal::utc('now - 1 days')
+			DateTimeFormat::utc('now + 7 days'),
+			DateTimeFormat::utc('now - 1 days')
 		);
 
 		$r = [];
@@ -658,8 +658,8 @@ class Profile
 					$total ++;
 				}
 
-				$strt = Temporal::convert($rr['start'], $rr['convert'] ? $a->timezone : 'UTC', 'UTC', 'Y-m-d');
-				if ($strt === Temporal::timezoneNow($a->timezone, 'Y-m-d')) {
+				$strt = DateTimeFormat::convert($rr['start'], $rr['convert'] ? $a->timezone : 'UTC', 'UTC', 'Y-m-d');
+				if ($strt === DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d')) {
 					$istoday = true;
 				}
 
@@ -674,17 +674,17 @@ class Profile
 					$description = L10n::t('[No description]');
 				}
 
-				$strt = Temporal::convert($rr['start'], $rr['convert'] ? $a->timezone : 'UTC');
+				$strt = DateTimeFormat::convert($rr['start'], $rr['convert'] ? $a->timezone : 'UTC');
 
-				if (substr($strt, 0, 10) < Temporal::timezoneNow($a->timezone, 'Y-m-d')) {
+				if (substr($strt, 0, 10) < DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d')) {
 					continue;
 				}
 
-				$today = ((substr($strt, 0, 10) === Temporal::timezoneNow($a->timezone, 'Y-m-d')) ? true : false);
+				$today = ((substr($strt, 0, 10) === DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d')) ? true : false);
 
 				$rr['title'] = $title;
 				$rr['description'] = $description;
-				$rr['date'] = day_translate(Temporal::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC', 'UTC', $bd_format)) . (($today) ? ' ' . L10n::t('[today]') : '');
+				$rr['date'] = day_translate(DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC', 'UTC', $bd_format)) . (($today) ? ' ' . L10n::t('[today]') : '');
 				$rr['startime'] = $strt;
 				$rr['today'] = $today;
 
@@ -731,8 +731,8 @@ class Profile
 
 				$val = day_translate(
 					intval($a->profile['dob']) ?
-						Temporal::utc($a->profile['dob'] . ' 00:00 +00:00', $year_bd_format)
-						: Temporal::utc('2001-' . substr($a->profile['dob'], 5) . ' 00:00 +00:00', $short_bd_format)
+						DateTimeFormat::utc($a->profile['dob'] . ' 00:00 +00:00', $year_bd_format)
+						: DateTimeFormat::utc('2001-' . substr($a->profile['dob'], 5) . ' 00:00 +00:00', $short_bd_format)
 				);
 
 				$profile['birthday'] = [L10n::t('Birthday:'), $val];