X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fevent.php;h=f5c4613d45a4444f59a37d98649cdb62abbf2263;hb=eb7a86f9ad2d3767469ccb813dc7888fd94ceb95;hp=a0509aa0fee048261f378e18bf0b1a66c0022415;hpb=a21f6135fcd8f0bfdb49de38a5ab4954d1784503;p=friendica.git

diff --git a/include/event.php b/include/event.php
index a0509aa0fe..f5c4613d45 100644
--- a/include/event.php
+++ b/include/event.php
@@ -5,21 +5,25 @@
  */
 
 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\Profile;
+use Friendica\Util\Map;
 
 require_once 'include/bbcode.php';
-require_once 'include/map.php';
 require_once 'include/datetime.php';
-require_once "include/conversation.php";
+require_once 'include/conversation.php';
 
 function format_event_html($ev, $simple = false) {
 	if (! ((is_array($ev)) && count($ev))) {
 		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 ))
@@ -36,14 +40,14 @@ function format_event_html($ev, $simple = false) {
 
 		$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;
@@ -53,13 +57,13 @@ 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="'
+	$o .= '<div class="event-start"><span class="event-label">' . L10n::t('Starts:') . '</span>&nbsp;<span class="dtstart" title="'
 		. datetime_convert('UTC', 'UTC', $ev['start'], (($ev['adjust']) ? ATOM_TIME : '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="'
+		$o .= '<div class="event-end" ><span class="event-label">' . L10n::t('Finishes:') . '</span>&nbsp;<span class="dtend" title="'
 			. datetime_convert('UTC', 'UTC', $ev['finish'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
 			. '" >'.$event_end
 			. '</span></div>' . "\r\n";
@@ -68,13 +72,13 @@ 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";
 
 		// Include a map of the location if the [map] BBCode is used.
 		if (strpos($ev['location'], "[map") !== false) {
-			$map = generate_named_map($ev['location']);
+			$map = Map::byLocation($ev['location']);
 			if ($map !== $ev['location']) {
 				$o.= $map;
 			}
@@ -87,7 +91,7 @@ function format_event_html($ev, $simple = false) {
 
 /**
  * @brief Convert an array with event data to bbcode.
- * 
+ *
  * @param array $ev Array which conains the event data.
  * @return string The event as a bbcode formatted string.
  */
@@ -125,7 +129,7 @@ function format_event_bbcode($ev) {
 /**
  * @brief Extract bbcode formatted event data from a string
  *     and convert it to html.
- * 
+ *
  * @params: string $s The string which should be parsed for event data.
  * @return string The html output.
  */
@@ -142,13 +146,13 @@ function bbtovcal($s) {
 
 /**
  * @brief Extract bbcode formatted event data from a string.
- * 
+ *
  * @params: string $s The string which should be parsed for event data.
  * @return array The array with the event information.
  */
 function bbtoevent($s) {
 
-	$ev = array();
+	$ev = [];
 
 	$match = '';
 	if (preg_match("/\[event\-summary\](.*?)\[\/event\-summary\]/is", $s, $match)) {
@@ -205,10 +209,10 @@ function ev_compare($a,$b) {
 
 /**
  * @brief Delete an event from the event table.
- * 
+ *
  * Note: This function does only delete the event from the event table not its
  * related entry in the item table.
- * 
+ *
  * @param int $event_id Event ID.
  * @return void
  */
@@ -217,15 +221,15 @@ 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);
 }
 
 /**
  * @brief Store the event.
- * 
+ *
  * Store the event in the event table and create an event item in the item table.
- * 
+ *
  * @param array $arr Array with event data.
  * @return int The event id.
  */
@@ -260,13 +264,10 @@ function event_store($arr) {
 		$contact = $c[0];
 	}
 
-
 	// Existing event being modified.
-
 	if ($arr['id']) {
 
 		// has the event actually changed?
-
 		$r = q("SELECT * FROM `event` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($arr['id']),
 			intval($arr['uid'])
@@ -274,7 +275,6 @@ function event_store($arr) {
 		if ((! DBM::is_result($r)) || ($r[0]['edited'] === $arr['edited'])) {
 
 			// Nothing has changed. Grab the item id to return.
-
 			$r = q("SELECT * FROM `item` WHERE `event-id` = %d AND `uid` = %d LIMIT 1",
 				intval($arr['id']),
 				intval($arr['uid'])
@@ -283,8 +283,7 @@ function event_store($arr) {
 		}
 
 		// The event changed. Update it.
-
-		$r = q("UPDATE `event` SET
+		q("UPDATE `event` SET
 			`edited` = '%s',
 			`start` = '%s',
 			`finish` = '%s',
@@ -308,6 +307,7 @@ function event_store($arr) {
 			intval($arr['id']),
 			intval($arr['uid'])
 		);
+
 		$r = q("SELECT * FROM `item` WHERE `event-id` = %d AND `uid` = %d LIMIT 1",
 			intval($arr['id']),
 			intval($arr['uid'])
@@ -330,13 +330,12 @@ function event_store($arr) {
 			$item_id = 0;
 		}
 
-		call_hooks("event_updated", $arr['id']);
+		Addon::callHooks("event_updated", $arr['id']);
 
 		return $item_id;
 	} else {
 		// New event. Store it.
-
-		$r = q("INSERT INTO `event` (`uid`,`cid`,`guid`,`uri`,`created`,`edited`,`start`,`finish`,`summary`, `desc`,`location`,`type`,
+		q("INSERT INTO `event` (`uid`,`cid`,`guid`,`uri`,`created`,`edited`,`start`,`finish`,`summary`, `desc`,`location`,`type`,
 			`adjust`,`nofinish`,`allow_cid`,`allow_gid`,`deny_cid`,`deny_gid`)
 			VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s' ) ",
 			intval($arr['uid']),
@@ -367,7 +366,7 @@ function event_store($arr) {
 			$event = $r[0];
 		}
 
-		$item_arr = array();
+		$item_arr = [];
 
 		$item_arr['uid']           = $arr['uid'];
 		$item_arr['contact-id']    = $arr['cid'];
@@ -389,7 +388,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;
@@ -402,21 +400,7 @@ function event_store($arr) {
 		$item_arr['object'] .= '</object>' . "\n";
 
 		$item_id = item_store($item_arr);
-
-		$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
-			intval($arr['uid'])
-		);
-		//if (DBM::is_result($r))
-		//	$plink = System::baseUrl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
-
-
 		if ($item_id) {
-			//q("UPDATE `item` SET `plink` = '%s', `event-id` = %d  WHERE `uid` = %d AND `id` = %d",
-			//	dbesc($plink),
-			//	intval($event['id']),
-			//	intval($arr['uid']),
-			//	intval($item_id)
-			//);
 			q("UPDATE `item` SET `event-id` = %d  WHERE `uid` = %d AND `id` = %d",
 				intval($event['id']),
 				intval($arr['uid']),
@@ -424,7 +408,7 @@ function event_store($arr) {
 			);
 		}
 
-		call_hooks("event_created", $event['id']);
+		Addon::callHooks("event_created", $event['id']);
 
 		return $item_id;
 	}
@@ -432,7 +416,7 @@ function event_store($arr) {
 
 /**
  * @brief Create an array with translation strings used for events.
- * 
+ *
  * @return array Array with translations strings.
  */
 function get_event_strings() {
@@ -440,63 +424,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;
 }
@@ -510,7 +494,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') {
@@ -525,10 +509,10 @@ function event_remove_duplicates($dates) {
 /**
  * @brief Get an event by its event ID.
  *
- * @param type $owner_uid The User ID of the owner of the event
- * @param type $event_params An assoziative array with
- *	int 'event_id' => The ID of the event in the event table
- * @param type $sql_extra
+ * @param int    $owner_uid    The User ID of the owner of the event
+ * @param array  $event_params An assoziative array with
+ *	                           int 'event_id' => The ID of the event in the event table
+ * @param string $sql_extra
  * @return array Query result
  */
 function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') {
@@ -563,7 +547,7 @@ function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') {
  *	string 'adjust_start' =>
  *
  * @param string $sql_extra Additional sql conditions (e.g. permission request).
- * 
+ *
  * @return array Query results.
  */
 function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') {
@@ -602,10 +586,10 @@ 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'));
@@ -625,10 +609,13 @@ function process_events($arr) {
 
 			// Show edit and drop actions only if the user is the owner of the event and the event
 			// is a real event (no bithdays).
+			$edit = null;
+			$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'));
@@ -640,7 +627,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,
@@ -655,8 +642,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'), '', ''],
+			];
 		}
 	}
 
@@ -671,9 +658,12 @@ function process_events($arr) {
  * @param string $timezone The timezone of the user (not implemented yet).
  *
  * @return string Content according to selected export format.
+ *
+ * @todo Implement timezone support
  */
-function event_format_export ($events, $format = 'ical', $timezone) {
-	if (! ((is_array($events)) && count($events))) {
+function event_format_export($events, $format = 'ical', $timezone)
+{
+	if (!((is_array($events)) && count($events))) {
 		return;
 	}
 
@@ -767,7 +757,7 @@ function event_format_export ($events, $format = 'ical', $timezone) {
 
 /**
  * @brief Get all events for a user ID.
- * 
+ *
  *    The query for events is done permission sensitive.
  *    If the user is the owner of the calendar he/she
  *    will get all of his/her available events.
@@ -860,12 +850,12 @@ function event_export($uid, $format = 'ical') {
 			$file_ext = "";
 	}
 
-	$arr = array(
+	$arr = [
 		'success'   => $process,
 		'format'    => $format,
 		'extension' => $file_ext,
 		'content'   => $res,
-	);
+	];
 
 	return $arr;
 }
@@ -899,7 +889,7 @@ function widget_events() {
 	 * for exporting the cal is enabled (otherwise the widget would appear for logged in users
 	 * on foreigen profile pages even if the widget is disabled).
 	 */
-	if (intval($owner_uid) && local_user() !== $owner_uid && ! feature_enabled($owner_uid, "export_calendar")) {
+	if (intval($owner_uid) && local_user() !== $owner_uid && ! Feature::isEnabled($owner_uid, "export_calendar")) {
 		return;
 	}
 
@@ -907,21 +897,21 @@ function widget_events() {
 	 * If it's a kind of profile page (intval($owner_uid)) return if the user not logged in and
 	 * export feature isn't enabled.
 	 */
-	if (intval($owner_uid) && ! local_user() && ! feature_enabled($owner_uid, "export_calendar")) {
+	if (intval($owner_uid) && ! local_user() && ! Feature::isEnabled($owner_uid, "export_calendar")) {
 		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
-	));
+	]);
 }
 
 /**
  * @brief Format an item array with event data to HTML.
- * 
+ *
  * @param arr $item Array with item and event data.
  * @return string HTML output.
  */
@@ -930,9 +920,9 @@ 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)));
@@ -959,16 +949,16 @@ 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']);
 	}
 	// Construct the map HTML.
 	if (isset($evloc['address'])) {
-		$location['map'] = '<div class="map">' . generate_named_map($evloc['address']) . '</div>';
+		$location['map'] = '<div class="map">' . Map::byLocation($evloc['address']) . '</div>';
 	} elseif (isset($evloc['coordinates'])) {
-		$location['map'] = '<div class="map">' . generate_map(str_replace('/', ' ', $evloc['coordinates'])) . '</div>';
+		$location['map'] = '<div class="map">' . Map::byCoordinates(str_replace('/', ' ', $evloc['coordinates'])) . '</div>';
 	}
 
 	// Construct the profile link (magic-auth).
@@ -976,17 +966,17 @@ function format_event_item($item) {
 	$profile_link = best_link_url($item, $sp);
 
 	if (!$sp) {
-		$profile_link = zrl($profile_link);
+		$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,
@@ -1000,24 +990,24 @@ 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;
 }
 
 /**
  * @brief Format a string with map bbcode to an array with location data.
- * 
+ *
  * Note: The string must only contain location data. A string with no bbcode will be
  * handled as location name.
- * 
+ *
  * @param string $s The string with the bbcode formatted location data.
- * 
+ *
  * @return array The array with the location data.
  *  'name' => The name of the location,<br>
  * 'address' => The address of the location,<br>
@@ -1028,7 +1018,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) {