GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' into 'nightly' 

convert activity stream RFC3339 dates to mysql datetime format when saving remote event dates to db

See merge request !34
This commit is contained in:
mmn 2015-10-10 20:38:01 +00:00
parent 3255e2e1b8 a9f879c2ba
commit 0926316a76
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/Event/EventPlugin.php
View File

@ -157,6 +157,14 @@ class EventPlugin extends MicroAppPlugin
throw new Exception(_m('No end date for event.'));
}
// convert RFC3339 dates delivered in Activity Stream to MySQL DATETIME date format
$start_time = new DateTime($dtstart->item(0)->nodeValue);
$start_time->setTimezone(new DateTimeZone('UTC'));
$start_time = $start_time->format('Y-m-d H:i:s');
$end_time = new DateTime($dtend->item(0)->nodeValue);
$end_time->setTimezone(new DateTimeZone('UTC'));
$end_time = $end_time->format('Y-m-d H:i:s');
// location is optional
$location = null;
$location_object = $happeningObj->element->getElementsByTagName('location');
@ -177,8 +185,8 @@ class EventPlugin extends MicroAppPlugin
case ActivityVerb::POST:
// FIXME: get startTime, endTime, location and URL
$notice = Happening::saveNew($actor,
$dtstart->item(0)->nodeValue,
$dtend->item(0)->nodeValue,
$start_time,
$end_time,
$happeningObj->title,
$location,
$happeningObj->summary,