" . bbcode($ev['desc']) . "
";
+ $o .= "" . BBCode::convert($ev['desc'], false, $simple) . "
";
- $o .= "" . $event_start . "
";
+ $o .= "" . $event_start . "
";
if (! $ev['nofinish']) {
- $o .= "" . $event_end ."
";
+ $o .= "" . $event_end ."
";
}
if (strlen($ev['location'])) {
- $o .= "" . $ev['location'] . "
";
+ $o .= "" . BBCode::convert($ev['location'], false, $simple) . "
";
}
return $o;
@@ -52,30 +57,30 @@ function format_event_html($ev, $simple = false) {
$o = '' . "\r\n";
- $o .= '
' . bbcode($ev['summary']) . '
' . "\r\n";
+ $o .= '
' . BBCode::convert($ev['summary'], false, $simple) . '
' . "\r\n";
- $o .= '
' . t('Starts:') . ' ' . L10n::t('Starts:') . ' '.$event_start
. '
' . "\r\n";
if (! $ev['nofinish']) {
- $o .= '
' . t('Finishes:') . ' ' . L10n::t('Finishes:') . ' '.$event_end
. '
' . "\r\n";
}
- $o .= '
' . bbcode($ev['desc']) . '
' . "\r\n";
+ $o .= '
' . BBCode::convert($ev['desc'], false, $simple) . '
' . "\r\n";
if (strlen($ev['location'])) {
- $o .= '
' . t('Location:') . ' '
- . bbcode($ev['location'])
+ $o .= '' . L10n::t('Location:') . ' '
+ . BBCode::convert($ev['location'], false, $simple)
. '
' . "\r\n";
// Include a map of the location if the [map] BBCode is used.
if (strpos($ev['location'], "[map") !== false) {
- $map = Map::byLocation($ev['location']);
+ $map = Map::byLocation($ev['location'], $simple);
if ($map !== $ev['location']) {
$o.= $map;
}
@@ -149,7 +154,7 @@ function bbtovcal($s) {
*/
function bbtoevent($s) {
- $ev = array();
+ $ev = [];
$match = '';
if (preg_match("/\[event\-summary\](.*?)\[\/event\-summary\]/is", $s, $match)) {
@@ -194,8 +199,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']) ? DateTimeFormat::local($a['start']) : $a['start']);
+ $date_b = (($b['adjust']) ? DateTimeFormat::local($b['start']) : $b['start']);
if ($date_a === $date_b) {
return strcasecmp($a['desc'], $b['desc']);
@@ -218,7 +223,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);
}
@@ -232,20 +237,24 @@ function event_delete($event_id) {
*/
function event_store($arr) {
- require_once 'include/datetime.php';
require_once 'include/items.php';
- require_once 'include/bbcode.php';
$a = get_app();
- $arr['created'] = (($arr['created']) ? $arr['created'] : datetime_convert());
- $arr['edited'] = (($arr['edited']) ? $arr['edited'] : datetime_convert());
+ $arr['created'] = (($arr['created']) ? DateTimeFormat::utc($arr['created']) : DateTimeFormat::utcNow());
+ $arr['edited'] = (($arr['edited']) ? DateTimeFormat::utc($arr['edited']) : DateTimeFormat::utcNow());
+ $arr['start'] = (($arr['start']) ? DateTimeFormat::utc($arr['start']) : NULL_DATE);
+ $arr['finish'] = (($arr['finish']) ? DateTimeFormat::utc($arr['finish']) : NULL_DATE);
$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']));
$arr['private'] = ((x($arr, 'private')) ? intval($arr['private']) : 0);
$arr['guid'] = get_guid(32);
+ if ($arr['finish'] < NULL_DATE) {
+ $arr['finish'] = NULL_DATE;
+ }
+
if ($arr['cid']) {
$c = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($arr['cid']),
@@ -314,20 +323,15 @@ function event_store($arr) {
$object .= '' . xmlify(format_event_bbcode($arr)) . '';
$object .= '' . "\n";
- q("UPDATE `item` SET `body` = '%s', `object` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d",
- dbesc(format_event_bbcode($arr)),
- dbesc($object),
- dbesc($arr['edited']),
- intval($r[0]['id']),
- intval($arr['uid'])
- );
+ $fields = ['body' => format_event_bbcode($arr), 'object' => $object, 'edited' => $arr['edited']];
+ Item::update($fields, ['id' => $r[0]['id']]);
$item_id = $r[0]['id'];
} else {
$item_id = 0;
}
- call_hooks("event_updated", $arr['id']);
+ Addon::callHooks("event_updated", $arr['id']);
return $item_id;
} else {
@@ -363,7 +367,7 @@ function event_store($arr) {
$event = $r[0];
}
- $item_arr = array();
+ $item_arr = [];
$item_arr['uid'] = $arr['uid'];
$item_arr['contact-id'] = $arr['cid'];
@@ -385,7 +389,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;
@@ -397,16 +400,12 @@ function event_store($arr) {
$item_arr['object'] .= '' . xmlify(format_event_bbcode($event)) . '';
$item_arr['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']),
- intval($arr['uid']),
- intval($item_id)
- );
+ Item::update(['event-id' => $event['id']], ['id' => $item_id]);
}
- call_hooks("event_created", $event['id']);
+ Addon::callHooks("event_created", $event['id']);
return $item_id;
}
@@ -422,63 +421,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;
}
@@ -492,7 +491,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') {
@@ -584,21 +583,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']) ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j'));
+ $d = (($rr['adjust']) ? DateTimeFormat::local($rr['start'], $fmt) : DateTimeFormat::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']) ? DateTimeFormat::local($rr['start'], 'c') : DateTimeFormat::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']) ? DateTimeFormat::local($rr['finish'], 'c') : DateTimeFormat::utc($rr['finish'], 'c'));
}
$is_first = ($d !== $last_date);
@@ -611,21 +610,21 @@ 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'));
+ $title = strip_tags(html_entity_decode(BBCode::convert($rr['summary']), ENT_QUOTES, 'UTF-8'));
if (! $title) {
- list($title, $_trash) = explode(" $rr['id'],
'start' => $start,
'end' => $end,
@@ -640,8 +639,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'), '', ''],
+ ];
}
}
@@ -848,12 +847,12 @@ function event_export($uid, $format = 'ical') {
$file_ext = "";
}
- $arr = array(
+ $arr = [
'success' => $process,
'format' => $format,
'extension' => $file_ext,
'content' => $res,
- );
+ ];
return $arr;
}
@@ -899,12 +898,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
- ));
+ ]);
}
/**
@@ -918,27 +917,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'] ?
+ DateTimeFormat::local($item['event-start'], $dformat)
+ : DateTimeFormat::utc($item['event-start'], $dformat)
+ );
+ $dtstart_title = DateTimeFormat::utc($item['event-start'], $item['event-adjust'] ? DateTimeFormat::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'] ?
+ DateTimeFormat::local($item['event-start'], 'M')
+ : DateTimeFormat::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'] ?
+ DateTimeFormat::local($item['event-start'], 'j')
+ : DateTimeFormat::utc($item['event-start'], 'j');
+ $start_time = $item['event-adjust'] ?
+ DateTimeFormat::local($item['event-start'], $tformat)
+ : DateTimeFormat::utc($item['event-start'], $tformat);
+ $start_short = day_short_translate(
+ $item['event-adjust'] ?
+ DateTimeFormat::local($item['event-start'], $dformat_short)
+ : DateTimeFormat::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'] ?
+ DateTimeFormat::local($item['event-finish'], $dformat)
+ : DateTimeFormat::utc($item['event-finish'], $dformat)
+ );
+ $dtend_title = DateTimeFormat::utc($item['event-finish'], $item['event-adjust'] ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s');
+ $end_short = day_short_translate(
+ $item['event-adjust'] ?
+ DateTimeFormat::local($item['event-finish'], $dformat_short)
+ : DateTimeFormat::utc($item['event-finish'], $dformat_short)
+ );
+ $end_time = $item['event-adjust'] ?
+ DateTimeFormat::local($item['event-finish'], $tformat)
+ : DateTimeFormat::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;
@@ -947,7 +972,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']);
@@ -964,17 +989,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,
@@ -988,12 +1013,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;
}
@@ -1016,7 +1041,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) {