TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

event fixes

Browse Source
This commit is contained in:
Mario
2022-03-04 18:43:21 +00:00
parent 6294be371a
commit 37f56e1efd
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/event.php
View File

@@ -73,7 +73,7 @@ function format_event_obj($jobject) {
$event = [];
$object = json_decode($jobject, true);
hz_syslog(print_r($object,true));
/*******
This is our encoded format
@@ -103,7 +103,11 @@ function format_event_obj($jobject) {
// mobilizon sets a timezone in the object
// we will assume that events with an timezone should be adjusted
$tz = $object['timezone'] ?? '';
$adjust = ((strpos($object['startTime'], 'Z') !== false) || $tz);
// friendica has its own flag for adjust
$dfrn_adjust = $object['dfrn:adjust'] ?? '';
$adjust = ((strpos($object['startTime'], 'Z') !== false) || $tz || $dfrn_adjust);
$allday = (($adjust) ? false : true);
@@ -140,7 +144,7 @@ function format_event_obj($jobject) {
$event['content'] = replace_macros(get_markup_template('event_item_content.tpl'), array(
'$description' => $object['content'],
'$location_label' => t('Location:'),
'$location' => ((array_path_exists('location/content', $object)) ? zidify_links(smilies(bbcode($object['location']['content']))) : EMPTY_STR)
'$location' => ((array_path_exists('location/name', $object)) ? zidify_links(smilies(bbcode($object['location']['name']))) : EMPTY_STR)
));
}
@@ -1210,7 +1214,7 @@ function event_store_item($arr, $event) {
// RFC3339 Section 4.3
'startTime' => (($arr['adjust']) ? datetime_convert('UTC', 'UTC', $arr['dtstart'], ATOM_TIME) : datetime_convert('UTC', 'UTC', $arr['dtstart'], 'Y-m-d\\TH:i:s-00:00')),
'content' => bbcode($arr['description']),
'location' => [ 'type' => 'Place', 'content' => $arr['location'] ],
'location' => [ 'type' => 'Place', 'name' => $arr['location'] ],
'source' => [ 'content' => format_event_bbcode($arr), 'mediaType' => 'text/x-multicode' ],
'url' => [ [ 'mediaType' => 'text/calendar', 'href' => z_root() . '/events/ical/' . $event['event_hash'] ] ],
'actor' => Activity::encode_person($r[0], false),
@@ -1370,7 +1374,7 @@ function event_store_item($arr, $event) {
// RFC3339 Section 4.3
'startTime' => (($arr['adjust']) ? datetime_convert('UTC', 'UTC', $arr['dtstart'], ATOM_TIME) : datetime_convert('UTC', 'UTC', $arr['dtstart'], 'Y-m-d\\TH:i:s-00:00')),
'content' => bbcode($arr['description']),
'location' => [ 'type' => 'Place', 'content' => bbcode($arr['location']) ],
'location' => [ 'type' => 'Place', 'name' => bbcode($arr['location']) ],
'source' => [ 'content' => format_event_bbcode($arr), 'mediaType' => 'text/x-multicode' ],
'url' => [ [ 'mediaType' => 'text/calendar', 'href' => z_root() . '/events/ical/' . $event['event_hash'] ] ],
'actor' => Activity::encode_person($z, false),

2
include/html2bbcode.php
View File

@@ -87,7 +87,7 @@ function deletenode(&$doc, $node)
function html2bbcode($message)
{
if(!$message)
if(!is_string($message) && !$message)
return;
$message = str_replace("\r", "", $message);