Issue 11508: Sanitizing date fields for events and polls

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 007144265dcec0dadbf96d7941fd0ddadb6b3311..d603681a4cbbb7fd9fd91555ff243cd257becdaf 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -170,7 +170,7 @@ class Processor
                }
 
                if (!empty($activity['question']['end-time'])) {
-                       $question['end-time'] = $activity['question']['end-time'];
+                       $question['end-time'] = DateTimeFormat::utc($activity['question']['end-time']);
                }
 
                Post\Question::update($item['uri-id'], $question);
@@ -238,8 +238,12 @@ class Processor
                $event['edited']   = DateTimeFormat::utc($activity['updated']);
                $event['summary']  = HTML::toBBCode($activity['name']);
                $event['desc']     = HTML::toBBCode($activity['content']);
-               $event['start']    = $activity['start-time'];
-               $event['finish']   = $activity['end-time'];
+               if (!empty($activity['start-time'])) {
+                       $event['start']  = DateTimeFormat::utc($activity['start-time']);
+               }
+               if (!empty($activity['end-time'])) {
+                       $event['finish'] = DateTimeFormat::utc($activity['end-time']);
+               }
                $event['nofinish'] = empty($event['finish']);
                $event['location'] = $activity['location'];
 
@@ -558,8 +562,12 @@ class Processor
        {
                $event['summary']   = HTML::toBBCode($activity['name'] ?: $activity['summary']);
                $event['desc']      = HTML::toBBCode($activity['content']);
-               $event['start']     = $activity['start-time'];
-               $event['finish']    = $activity['end-time'];
+               if (!empty($activity['start-time'])) {
+                       $event['start']  = DateTimeFormat::utc($activity['start-time']);
+               }
+               if (!empty($activity['end-time'])) {
+                       $event['finish'] = DateTimeFormat::utc($activity['end-time']);
+               }
                $event['nofinish']  = empty($event['finish']);
                $event['location']  = $activity['location'];
                $event['cid']       = $item['contact-id'];