X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDiaspora.php;h=02d6d270a696fd1ee468ccb14f21215387d3a8a3;hb=55147a6b44164f28b64a876a48140a7cd821802f;hp=087754dfc9e7806f80f87b5b7a3b3e5c64253884;hpb=e5ffda3478170211868582cddd342dec6dee7ba7;p=friendica.git

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 087754dfc9..02d6d270a6 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -24,7 +24,7 @@ namespace Friendica\Protocol;
 use Friendica\Content\Feature;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Markdown;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
@@ -1350,7 +1350,7 @@ class Diaspora
 				'notify' => $data['notify'], 'poll' => $data['poll'],
 				'network' => $data['network']];
 
-		DBA::update('contact', $fields, ['addr' => $old_handle]);
+		Contact::update($fields, ['addr' => $old_handle]);
 
 		Logger::notice('Contacts are updated.');
 
@@ -2109,7 +2109,7 @@ class Diaspora
 			$fields['bd'] = $birthday;
 		}
 
-		DBA::update('contact', $fields, ['id' => $contact['id']]);
+		Contact::update($fields, ['id' => $contact['id']]);
 
 		Logger::info("Profile of contact ".$contact["id"]." stored for user ".$importer["uid"]);
 
@@ -2719,7 +2719,7 @@ class Diaspora
 
 		/// @todo enable support for polls
 		//if ($data->poll) {
-		//	foreach ($data->poll AS $poll)
+		//	foreach ($data->poll as $poll)
 		//		print_r($poll);
 		//	die("poll!\n");
 		//}
@@ -3314,15 +3314,12 @@ class Diaspora
 		$eventdata["all_day"] = "false";
 
 		$eventdata['timezone'] = 'UTC';
-		if (!$event['adjust'] && $owner['timezone']) {
-			$eventdata['timezone'] = $owner['timezone'];
-		}
 
 		if ($event['start']) {
-			$eventdata['start'] = DateTimeFormat::convert($event['start'], "UTC", $eventdata['timezone'], $mask);
+			$eventdata['start'] = DateTimeFormat::utc($event['start'], $mask);
 		}
 		if ($event['finish'] && !$event['nofinish']) {
-			$eventdata['end'] = DateTimeFormat::convert($event['finish'], "UTC", $eventdata['timezone'], $mask);
+			$eventdata['end'] = DateTimeFormat::utc($event['finish'], $mask);
 		}
 		if ($event['summary']) {
 			$eventdata['summary'] = html_entity_decode(BBCode::toMarkdown($event['summary']));