]> git.mxchange.org Git - friendica.git/blobdiff - include/event.php
Add Temporal::utc() shorthand to Temporal::convert()
[friendica.git] / include / event.php
index b8b60a86da7d7f15acf0643539f3a81e75e490ce..faa0f9b9f7c7afbaf4ade99e1c240f72ad80ec8a 100644 (file)
@@ -4,13 +4,16 @@
  * @brief functions specific to event handling
  */
 
-use Friendica\App;
 use Friendica\Content\Feature;
+use Friendica\Core\Addon;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Util\Map;
+use Friendica\Util\Temporal;
 
 require_once 'include/bbcode.php';
 require_once 'include/datetime.php';
@@ -21,31 +24,33 @@ function format_event_html($ev, $simple = false) {
                return '';
        }
 
-       $bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM.
+       $bd_format = L10n::t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM.
 
-       $event_start = (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
-                       $ev['start'] , $bd_format ))
-                       : day_translate(datetime_convert('UTC', 'UTC',
-                       $ev['start'] , $bd_format)));
+       $event_start = day_translate(
+               $ev['adjust'] ?
+                       Temporal::convert($ev['start'], date_default_timezone_get(), 'UTC', $bd_format)
+                       : Temporal::utc($ev['start'], $bd_format)
+       );
 
-       $event_end = (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
-                               $ev['finish'] , $bd_format ))
-                               : day_translate(datetime_convert('UTC', 'UTC',
-                               $ev['finish'] , $bd_format )));
+       $event_end = day_translate(
+               $ev['adjust'] ?
+                       Temporal::convert($ev['finish'], date_default_timezone_get(), 'UTC', $bd_format)
+                       : Temporal::utc($ev['finish'], $bd_format)
+       );
 
        if ($simple) {
                $o = "<h3>" . bbcode($ev['summary']) . "</h3>";
 
                $o .= "<div>" . bbcode($ev['desc']) . "</div>";
 
-               $o .= "<h4>" . t('Starts:') . "</h4><p>" . $event_start . "</p>";
+               $o .= "<h4>" . L10n::t('Starts:') . "</h4><p>" . $event_start . "</p>";
 
                if (! $ev['nofinish']) {
-                       $o .= "<h4>" . t('Finishes:') . "</h4><p>" . $event_end  ."</p>";
+                       $o .= "<h4>" . L10n::t('Finishes:') . "</h4><p>" . $event_end  ."</p>";
                }
 
                if (strlen($ev['location'])) {
-                       $o .= "<h4>" . t('Location:') . "</h4><p>" . $ev['location'] . "</p>";
+                       $o .= "<h4>" . L10n::t('Location:') . "</h4><p>" . $ev['location'] . "</p>";
                }
 
                return $o;
@@ -55,14 +60,14 @@ function format_event_html($ev, $simple = false) {
 
        $o .= '<div class="summary event-summary">' . bbcode($ev['summary']) . '</div>' . "\r\n";
 
-       $o .= '<div class="event-start"><span class="event-label">' . t('Starts:') . '</span>&nbsp;<span class="dtstart" title="'
-               . datetime_convert('UTC', 'UTC', $ev['start'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
+       $o .= '<div class="event-start"><span class="event-label">' . L10n::t('Starts:') . '</span>&nbsp;<span class="dtstart" title="'
+               . Temporal::utc($ev['start'], (($ev['adjust']) ? Temporal::ATOM : 'Y-m-d\TH:i:s' ))
                . '" >'.$event_start
                . '</span></div>' . "\r\n";
 
        if (! $ev['nofinish']) {
-               $o .= '<div class="event-end" ><span class="event-label">' . t('Finishes:') . '</span>&nbsp;<span class="dtend" title="'
-                       . datetime_convert('UTC', 'UTC', $ev['finish'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
+               $o .= '<div class="event-end" ><span class="event-label">' . L10n::t('Finishes:') . '</span>&nbsp;<span class="dtend" title="'
+                       . Temporal::utc($ev['finish'], (($ev['adjust']) ? Temporal::ATOM : 'Y-m-d\TH:i:s' ))
                        . '" >'.$event_end
                        . '</span></div>' . "\r\n";
        }
@@ -70,7 +75,7 @@ function format_event_html($ev, $simple = false) {
        $o .= '<div class="description event-description">' . bbcode($ev['desc']) . '</div>' . "\r\n";
 
        if (strlen($ev['location'])) {
-               $o .= '<div class="event-location"><span class="event-label">' . t('Location:') . '</span>&nbsp;<span class="location">'
+               $o .= '<div class="event-location"><span class="event-label">' . L10n::t('Location:') . '</span>&nbsp;<span class="location">'
                        . bbcode($ev['location'])
                        . '</span></div>' . "\r\n";
 
@@ -150,7 +155,7 @@ function bbtovcal($s) {
  */
 function bbtoevent($s) {
 
-       $ev = array();
+       $ev = [];
 
        $match = '';
        if (preg_match("/\[event\-summary\](.*?)\[\/event\-summary\]/is", $s, $match)) {
@@ -195,8 +200,8 @@ function sort_by_date($a) {
 
 function ev_compare($a,$b) {
 
-       $date_a = (($a['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $a['start']) : $a['start']);
-       $date_b = (($b['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $b['start']) : $b['start']);
+       $date_a = (($a['adjust']) ? Temporal::convert($a['start'], date_default_timezone_get()) : $a['start']);
+       $date_b = (($b['adjust']) ? Temporal::convert($b['start'], date_default_timezone_get()) : $b['start']);
 
        if ($date_a === $date_b) {
                return strcasecmp($a['desc'], $b['desc']);
@@ -219,7 +224,7 @@ function event_delete($event_id) {
                return;
        }
 
-       dba::delete('event', array('id' => $event_id));
+       dba::delete('event', ['id' => $event_id]);
        logger("Deleted event ".$event_id, LOGGER_DEBUG);
 }
 
@@ -239,8 +244,8 @@ function event_store($arr) {
 
        $a = get_app();
 
-       $arr['created'] = (($arr['created'])     ? $arr['created']         : datetime_convert());
-       $arr['edited']  = (($arr['edited'])      ? $arr['edited']          : datetime_convert());
+       $arr['created'] = (($arr['created'])     ? $arr['created']         : Temporal::utcNow());
+       $arr['edited']  = (($arr['edited'])      ? $arr['edited']          : Temporal::utcNow());
        $arr['type']    = (($arr['type'])        ? $arr['type']            : 'event' );
        $arr['cid']     = ((intval($arr['cid'])) ? intval($arr['cid'])     : 0);
        $arr['uri']     = (x($arr, 'uri')        ? $arr['uri']             : item_new_uri($a->get_hostname(), $arr['uid']));
@@ -328,7 +333,7 @@ function event_store($arr) {
                        $item_id = 0;
                }
 
-               call_hooks("event_updated", $arr['id']);
+               Addon::callHooks("event_updated", $arr['id']);
 
                return $item_id;
        } else {
@@ -364,7 +369,7 @@ function event_store($arr) {
                        $event = $r[0];
                }
 
-               $item_arr = array();
+               $item_arr = [];
 
                $item_arr['uid']           = $arr['uid'];
                $item_arr['contact-id']    = $arr['cid'];
@@ -386,7 +391,6 @@ function event_store($arr) {
                $item_arr['deny_cid']      = $arr['deny_cid'];
                $item_arr['deny_gid']      = $arr['deny_gid'];
                $item_arr['private']       = $arr['private'];
-               $item_arr['last-child']    = 1;
                $item_arr['visible']       = 1;
                $item_arr['verb']          = ACTIVITY_POST;
                $item_arr['object-type']   = ACTIVITY_OBJ_EVENT;
@@ -398,7 +402,7 @@ function event_store($arr) {
                $item_arr['object'] .= '<content>' . xmlify(format_event_bbcode($event)) . '</content>';
                $item_arr['object'] .= '</object>' . "\n";
 
-               $item_id = item_store($item_arr);
+               $item_id = Item::insert($item_arr);
                if ($item_id) {
                        q("UPDATE `item` SET `event-id` = %d  WHERE `uid` = %d AND `id` = %d",
                                intval($event['id']),
@@ -407,7 +411,7 @@ function event_store($arr) {
                        );
                }
 
-               call_hooks("event_created", $event['id']);
+               Addon::callHooks("event_created", $event['id']);
 
                return $item_id;
        }
@@ -423,63 +427,63 @@ function get_event_strings() {
        // First day of the week (0 = Sunday).
        $firstDay = PConfig::get(local_user(), 'system', 'first_day_of_week', 0);
 
-       $i18n = array(
+       $i18n = [
                        "firstDay" => $firstDay,
-                       "allday"   => t("all-day"),
-
-                       "Sun" => t("Sun"),
-                       "Mon" => t("Mon"),
-                       "Tue" => t("Tue"),
-                       "Wed" => t("Wed"),
-                       "Thu" => t("Thu"),
-                       "Fri" => t("Fri"),
-                       "Sat" => t("Sat"),
-
-                       "Sunday"    => t("Sunday"),
-                       "Monday"    => t("Monday"),
-                       "Tuesday"   => t("Tuesday"),
-                       "Wednesday" => t("Wednesday"),
-                       "Thursday"  => t("Thursday"),
-                       "Friday"    => t("Friday"),
-                       "Saturday"  => t("Saturday"),
-
-                       "Jan" => t("Jan"),
-                       "Feb" => t("Feb"),
-                       "Mar" => t("Mar"),
-                       "Apr" => t("Apr"),
-                       "May" => t("May"),
-                       "Jun" => t("Jun"),
-                       "Jul" => t("Jul"),
-                       "Aug" => t("Aug"),
-                       "Sep" => t("Sept"),
-                       "Oct" => t("Oct"),
-                       "Nov" => t("Nov"),
-                       "Dec" => t("Dec"),
-
-                       "January"   => t("January"),
-                       "February"  => t("February"),
-                       "March"     => t("March"),
-                       "April"     => t("April"),
-                       "May"       => t("May"),
-                       "June"      => t("June"),
-                       "July"      => t("July"),
-                       "August"    => t("August"),
-                       "September" => t("September"),
-                       "October"   => t("October"),
-                       "November"  => t("November"),
-                       "December"  => t("December"),
-
-                       "today" => t("today"),
-                       "month" => t("month"),
-                       "week"  => t("week"),
-                       "day"   => t("day"),
-
-                       "noevent" => t("No events to display"),
-
-                       "dtstart_label"  => t("Starts:"),
-                       "dtend_label"    => t("Finishes:"),
-                       "location_label" => t("Location:")
-               );
+                       "allday"   => L10n::t("all-day"),
+
+                       "Sun" => L10n::t("Sun"),
+                       "Mon" => L10n::t("Mon"),
+                       "Tue" => L10n::t("Tue"),
+                       "Wed" => L10n::t("Wed"),
+                       "Thu" => L10n::t("Thu"),
+                       "Fri" => L10n::t("Fri"),
+                       "Sat" => L10n::t("Sat"),
+
+                       "Sunday"    => L10n::t("Sunday"),
+                       "Monday"    => L10n::t("Monday"),
+                       "Tuesday"   => L10n::t("Tuesday"),
+                       "Wednesday" => L10n::t("Wednesday"),
+                       "Thursday"  => L10n::t("Thursday"),
+                       "Friday"    => L10n::t("Friday"),
+                       "Saturday"  => L10n::t("Saturday"),
+
+                       "Jan" => L10n::t("Jan"),
+                       "Feb" => L10n::t("Feb"),
+                       "Mar" => L10n::t("Mar"),
+                       "Apr" => L10n::t("Apr"),
+                       "May" => L10n::t("May"),
+                       "Jun" => L10n::t("Jun"),
+                       "Jul" => L10n::t("Jul"),
+                       "Aug" => L10n::t("Aug"),
+                       "Sep" => L10n::t("Sept"),
+                       "Oct" => L10n::t("Oct"),
+                       "Nov" => L10n::t("Nov"),
+                       "Dec" => L10n::t("Dec"),
+
+                       "January"   => L10n::t("January"),
+                       "February"  => L10n::t("February"),
+                       "March"     => L10n::t("March"),
+                       "April"     => L10n::t("April"),
+                       "May"       => L10n::t("May"),
+                       "June"      => L10n::t("June"),
+                       "July"      => L10n::t("July"),
+                       "August"    => L10n::t("August"),
+                       "September" => L10n::t("September"),
+                       "October"   => L10n::t("October"),
+                       "November"  => L10n::t("November"),
+                       "December"  => L10n::t("December"),
+
+                       "today" => L10n::t("today"),
+                       "month" => L10n::t("month"),
+                       "week"  => L10n::t("week"),
+                       "day"   => L10n::t("day"),
+
+                       "noevent" => L10n::t("No events to display"),
+
+                       "dtstart_label"  => L10n::t("Starts:"),
+                       "dtend_label"    => L10n::t("Finishes:"),
+                       "location_label" => L10n::t("Location:")
+               ];
 
        return $i18n;
 }
@@ -493,7 +497,7 @@ function get_event_strings() {
  * @todo We should replace this with a separate update function if there is some time left.
  */
 function event_remove_duplicates($dates) {
-       $dates2 = array();
+       $dates2 = [];
 
        foreach ($dates as $date) {
                if ($date['type'] == 'birthday') {
@@ -585,21 +589,21 @@ function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') {
  * @return array Event array for the template.
  */
 function process_events($arr) {
-       $events=array();
+       $events=[];
 
        $last_date = '';
-       $fmt = t('l, F j');
+       $fmt = L10n::t('l, F j');
        if (count($arr)) {
                foreach ($arr as $rr) {
-                       $j = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['start'], 'j') : datetime_convert('UTC', 'UTC', $rr['start'], 'j'));
-                       $d = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['start'], $fmt) : datetime_convert('UTC', 'UTC', $rr['start'], $fmt));
+                       $j = (($rr['adjust']) ? Temporal::convert($rr['start'], date_default_timezone_get(), 'UTC', 'j') : Temporal::utc($rr['start'], 'j'));
+                       $d = (($rr['adjust']) ? Temporal::convert($rr['start'], date_default_timezone_get(), 'UTC', $fmt) : Temporal::utc($rr['start'], $fmt));
                        $d = day_translate($d);
 
-                       $start = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['start'], 'c') : datetime_convert('UTC', 'UTC', $rr['start'], 'c'));
+                       $start = (($rr['adjust']) ? Temporal::convert($rr['start'], date_default_timezone_get(), 'UTC', 'c') : Temporal::utc($rr['start'], 'c'));
                        if ($rr['nofinish']) {
                                $end = null;
                        } else {
-                               $end = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['finish'], 'c') : datetime_convert('UTC', 'UTC', $rr['finish'], 'c'));
+                               $end = (($rr['adjust']) ? Temporal::convert($rr['finish'], date_default_timezone_get(), 'UTC', 'c') : Temporal::utc($rr['finish'], 'c'));
                        }
 
                        $is_first = ($d !== $last_date);
@@ -612,9 +616,9 @@ function process_events($arr) {
                        $copy = null;
                        $drop = null;
                        if (local_user() && local_user() == $rr['uid'] && $rr['type'] == 'event') {
-                               $edit = ((! $rr['cid']) ? array(System::baseUrl() . '/events/event/' . $rr['id'], t('Edit event'), '', '') : null);
-                               $copy = ((! $rr['cid']) ? array(System::baseUrl() . '/events/copy/' . $rr['id'], t('Duplicate event'), '', '') : null);
-                               $drop = array(System::baseUrl() . '/events/drop/' . $rr['id'], t('Delete event'), '', '');
+                               $edit = ((! $rr['cid']) ? [System::baseUrl() . '/events/event/' . $rr['id'], L10n::t('Edit event'), '', ''] : null);
+                               $copy = ((! $rr['cid']) ? [System::baseUrl() . '/events/copy/' . $rr['id'], L10n::t('Duplicate event'), '', ''] : null);
+                               $drop = [System::baseUrl() . '/events/drop/' . $rr['id'], L10n::t('Delete event'), '', ''];
                        }
 
                        $title = strip_tags(html_entity_decode(bbcode($rr['summary']), ENT_QUOTES, 'UTF-8'));
@@ -626,7 +630,7 @@ function process_events($arr) {
                        $html = format_event_html($rr);
                        $rr['desc'] = bbcode($rr['desc']);
                        $rr['location'] = bbcode($rr['location']);
-                       $events[] = array(
+                       $events[] = [
                                'id'     => $rr['id'],
                                'start'  => $start,
                                'end'    => $end,
@@ -641,8 +645,8 @@ function process_events($arr) {
                                'is_first' => $is_first,
                                'item'     => $rr,
                                'html'     => $html,
-                               'plink'    => array($rr['plink'], t('link to source'), '', ''),
-                       );
+                               'plink'    => [$rr['plink'], L10n::t('link to source'), '', ''],
+                       ];
                }
        }
 
@@ -849,12 +853,12 @@ function event_export($uid, $format = 'ical') {
                        $file_ext = "";
        }
 
-       $arr = array(
+       $arr = [
                'success'   => $process,
                'format'    => $format,
                'extension' => $file_ext,
                'content'   => $res,
-       );
+       ];
 
        return $arr;
 }
@@ -900,12 +904,12 @@ function widget_events() {
                return;
        }
 
-       return replace_macros(get_markup_template("events_aside.tpl"), array(
-               '$etitle' => t("Export"),
-               '$export_ical' => t("Export calendar as ical"),
-               '$export_csv' => t("Export calendar as csv"),
+       return replace_macros(get_markup_template("events_aside.tpl"), [
+               '$etitle' => L10n::t("Export"),
+               '$export_ical' => L10n::t("Export calendar as ical"),
+               '$export_csv' => L10n::t("Export calendar as csv"),
                '$user' => $user
-       ));
+       ]);
 }
 
 /**
@@ -919,27 +923,53 @@ function format_event_item($item) {
        $finish    = false;
 
        // Set the different time formats.
-       $dformat       = t('l F d, Y \@ g:i A'); // Friday January 18, 2011 @ 8:01 AM.
-       $dformat_short = t('D g:i A'); // Fri 8:01 AM.
-       $tformat       = t('g:i A'); // 8:01 AM.
+       $dformat       = L10n::t('l F d, Y \@ g:i A'); // Friday January 18, 2011 @ 8:01 AM.
+       $dformat_short = L10n::t('D g:i A'); // Fri 8:01 AM.
+       $tformat       = L10n::t('g:i A'); // 8:01 AM.
 
        // Convert the time to different formats.
-       $dtstart_dt = (($item['event-adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), $item['event-start'], $dformat)) : day_translate(datetime_convert('UTC', 'UTC', $item['event-start'], $dformat)));
-       $dtstart_title = datetime_convert('UTC', 'UTC', $item['event-start'], (($item['event-adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s'));
+       $dtstart_dt = day_translate(
+               $item['event-adjust'] ?
+                       Temporal::convert($item['event-start'], date_default_timezone_get(), 'UTC', $dformat)
+                       : Temporal::utc($item['event-start'], $dformat)
+       );
+       $dtstart_title = Temporal::utc($item['event-start'], $item['event-adjust'] ? Temporal::ATOM : 'Y-m-d\TH:i:s');
        // Format: Jan till Dec.
-       $month_short = (($item['event-adjust']) ? day_short_translate(datetime_convert('UTC', date_default_timezone_get(), $item['event-start'], 'M')) : day_short_translate(datetime_convert('UTC', 'UTC', $item['event-start'], 'M')));
+       $month_short = day_short_translate(
+               $item['event-adjust'] ?
+                       Temporal::convert($item['event-start'], date_default_timezone_get(), 'UTC', 'M')
+                       : Temporal::utc($item['event-start'], 'M')
+       );
        // Format: 1 till 31.
-       $date_short = (($item['event-adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $item['event-start'], 'j') : datetime_convert('UTC', 'UTC', $item['event-start'], 'j'));
-       $start_time = (($item['event-adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $item['event-start'], $tformat) : datetime_convert('UTC', 'UTC', $item['event-start'], $tformat));
-       $start_short = (($item['event-adjust']) ? day_short_translate(datetime_convert('UTC', date_default_timezone_get(), $item['event-start'], $dformat_short)) : day_short_translate(datetime_convert('UTC', 'UTC', $item['event-start'], $dformat_short)));
+       $date_short = $item['event-adjust'] ?
+               Temporal::convert($item['event-start'], date_default_timezone_get(), 'UTC', 'j')
+               : Temporal::utc($item['event-start'], 'j');
+       $start_time = $item['event-adjust'] ?
+               Temporal::convert($item['event-start'], date_default_timezone_get(), 'UTC', $tformat)
+               : Temporal::utc($item['event-start'], $tformat);
+       $start_short = day_short_translate(
+               $item['event-adjust'] ?
+                       Temporal::convert($item['event-start'], date_default_timezone_get(), 'UTC', $dformat_short)
+                       : Temporal::utc($item['event-start'], $dformat_short)
+       );
 
        // If the option 'nofinisch' isn't set, we need to format the finish date/time.
        if (!$item['event-nofinish']) {
                $finish = true;
-               $dtend_dt  = (($item['event-adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), $item['event-finish'], $dformat)) : day_translate(datetime_convert('UTC', 'UTC', $item['event-finish'], $dformat)));
-               $dtend_title = datetime_convert('UTC', 'UTC', $item['event-finish'], (($item['event-adjust'])   ? ATOM_TIME : 'Y-m-d\TH:i:s'));
-               $end_short = (($item['event-adjust']) ? day_short_translate(datetime_convert('UTC', date_default_timezone_get(), $item['event-finish'], $dformat_short)) : day_short_translate(datetime_convert('UTC', 'UTC', $item['event-finish'], $dformat_short)));
-               $end_time = (($item['event-adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $item['event-finish'], $tformat) : datetime_convert('UTC', 'UTC', $item['event-finish'], $tformat));
+               $dtend_dt  = day_translate(
+                       $item['event-adjust'] ?
+                               Temporal::convert($item['event-finish'], date_default_timezone_get(), 'UTC', $dformat)
+                               : Temporal::utc($item['event-finish'], $dformat)
+               );
+               $dtend_title = Temporal::utc($item['event-finish'], $item['event-adjust']   ? Temporal::ATOM : 'Y-m-d\TH:i:s');
+               $end_short = day_short_translate(
+                       $item['event-adjust'] ?
+                               Temporal::convert($item['event-finish'], date_default_timezone_get(), 'UTC', $dformat_short)
+                               : Temporal::utc($item['event-finish'], $dformat_short)
+               );
+               $end_time = $item['event-adjust'] ?
+                       Temporal::convert($item['event-finish'], date_default_timezone_get(), 'UTC', $tformat)
+                       : Temporal::utc($item['event-finish'], $tformat);
                // Check if start and finish time is at the same day.
                if (substr($dtstart_title, 0, 10) === substr($dtend_title, 0, 10)) {
                        $same_date = true;
@@ -948,7 +978,7 @@ function format_event_item($item) {
 
        // Format the event location.
        $evloc = event_location2array($item['event-location']);
-       $location = array();
+       $location = [];
 
        if (isset($evloc['name'])) {
                $location['name'] = prepare_text($evloc['name']);
@@ -968,14 +998,14 @@ function format_event_item($item) {
                $profile_link = Profile::zrl($profile_link);
        }
 
-       $event = replace_macros(get_markup_template('event_stream_item.tpl'), array(
+       $event = replace_macros(get_markup_template('event_stream_item.tpl'), [
                '$id'             => $item['event-id'],
                '$title'          => prepare_text($item['event-summary']),
-               '$dtstart_label'  => t('Starts:'),
+               '$dtstart_label'  => L10n::t('Starts:'),
                '$dtstart_title'  => $dtstart_title,
                '$dtstart_dt'     => $dtstart_dt,
                '$finish'         => $finish,
-               '$dtend_label'    => t('Finishes:'),
+               '$dtend_label'    => L10n::t('Finishes:'),
                '$dtend_title'    => $dtend_title,
                '$dtend_dt'       => $dtend_dt,
                '$month_short'    => $month_short,
@@ -989,12 +1019,12 @@ function format_event_item($item) {
                '$author_link'    => $profile_link,
                '$author_avatar'  => $item['author-avatar'],
                '$description'    => prepare_text($item['event-desc']),
-               '$location_label' => t('Location:'),
-               '$show_map_label' => t('Show map'),
-               '$hide_map_label' => t('Hide map'),
-               '$map_btn_label'  => t('Show map'),
+               '$location_label' => L10n::t('Location:'),
+               '$show_map_label' => L10n::t('Show map'),
+               '$hide_map_label' => L10n::t('Hide map'),
+               '$map_btn_label'  => L10n::t('Show map'),
                '$location'       => $location
-       ));
+       ]);
 
        return $event;
 }
@@ -1017,7 +1047,7 @@ function event_location2array($s = '') {
                return;
        }
 
-       $location = array('name' => $s);
+       $location = ['name' => $s];
 
        // Map tag with location name - e.g. [map]Paris[/map].
        if (strpos($s, '[/map]') !== false) {