From a46b781664e82ec829d3c5e13740651ff0c7b684 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 22 Feb 2025 14:43:25 +0000 Subject: slightly improve event object rendering --- include/event.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/include/event.php b/include/event.php index 3cad0a355..b83a733b8 100644 --- a/include/event.php +++ b/include/event.php @@ -102,7 +102,15 @@ function format_event_obj($jobject) { if (is_array($object) && (array_key_exists('summary', $object) || array_key_exists('name', $object))) { $dtend = ((array_key_exists('endTime', $object)) ? $object['endTime'] : NULL_DATE); - $title = ((isset($object['summary']) && $object['summary']) ? zidify_links(smilies(bbcode($object['summary']))) : $object['name']); + + $title = $object['name'] ?? ''; + $content = html2bbcode($object['content']); + + if (strpos($object['source']['content'], '[/event-description]') !== false) { + $bbdescription = []; + preg_match("/\[event\-description\](.*?)\[\/event\-description\]/ism", $object['source']['content'], $bbdescription); + $content = $bbdescription[1]; + } // mobilizon sets a timezone in the object // we will assume that events with an timezone should be adjusted @@ -146,15 +154,8 @@ function format_event_obj($jobject) { '$event_tz' => ['label' => t('Timezone'), 'value' => (($tz === date_default_timezone_get()) ? '' : $tz)] )); - - $description = []; - - if (strpos($object['source']['content'], '[/event-description]') !== false) { - preg_match("/\[event\-description\](.*?)\[\/event\-description\]/ism", $object['source']['content'], $description); - } - $event['content'] = replace_macros(get_markup_template('event_item_content.tpl'), array( - '$description' => ((isset($description[1]))? zidify_links(smilies(bbcode($description[1]))) : EMPTY_STR), + '$description' => zidify_links(smilies(bbcode($content, ['tryoembed' => false]))), '$location_label' => t('Location:'), '$location' => ((array_path_exists('location/name', $object)) ? zidify_links(smilies(bbcode($object['location']['name']))) : EMPTY_STR) )); -- cgit v1.2.3