<?php
/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
$uriid = $event['uri-id'] ?? $uriid;
- $bd_format = DI::l10n()->t('l F d, Y \@ g:i A'); // Friday January 18, 2011 @ 8 AM.
+ $bd_format = DI::l10n()->t('l F d, Y \@ g:i A \G\M\TP (e)'); // Friday October 29, 2021 @ 9:15 AM GMT-04:00 (America/New_York)
- $event_start = DI::l10n()->getDay(
- !empty($event['adjust']) ?
- DateTimeFormat::local($event['start'], $bd_format) : DateTimeFormat::utc($event['start'], $bd_format)
- );
+ $event_start = DI::l10n()->getDay(DateTimeFormat::local($event['start'], $bd_format));
if (!empty($event['finish'])) {
- $event_end = DI::l10n()->getDay(
- !empty($event['adjust']) ?
- DateTimeFormat::local($event['finish'], $bd_format) : DateTimeFormat::utc($event['finish'], $bd_format)
- );
+ $event_end = DI::l10n()->getDay(DateTimeFormat::local($event['finish'], $bd_format));
} else {
$event_end = '';
}
$o .= '<div class="summary event-summary">' . BBCode::convertForUriId($uriid, Strings::escapeHtml($event['summary']), $simple) . '</div>' . "\r\n";
$o .= '<div class="event-start"><span class="event-label">' . DI::l10n()->t('Starts:') . '</span> <span class="dtstart" title="'
- . DateTimeFormat::utc($event['start'], (!empty($event['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s'))
+ . DateTimeFormat::local($event['start'], DateTimeFormat::ATOM)
. '" >' . $event_start
. '</span></div>' . "\r\n";
if (!$event['nofinish']) {
$o .= '<div class="event-end" ><span class="event-label">' . DI::l10n()->t('Finishes:') . '</span> <span class="dtend" title="'
- . DateTimeFormat::utc($event['finish'], (!empty($event['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s'))
+ . DateTimeFormat::local($event['finish'], DateTimeFormat::ATOM)
. '" >' . $event_end
. '</span></div>' . "\r\n";
}
$o .= '[event-location]' . $event['location'] . '[/event-location]';
}
- if ($event['adjust']) {
- $o .= '[event-adjust]' . $event['adjust'] . '[/event-adjust]';
- }
-
return $o;
}
$ev['location'] = $match[1];
}
- $match = [];
- if (preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is", $text, $match)) {
- $ev['adjust'] = $match[1];
- }
-
$ev['nofinish'] = !empty($ev['start']) && empty($ev['finish']) ? 1 : 0;
return $ev;
private static function compareDatesCallback($event_a, $event_b)
{
- $date_a = (($event_a['adjust']) ? DateTimeFormat::local($event_a['start']) : $event_a['start']);
- $date_b = (($event_b['adjust']) ? DateTimeFormat::local($event_b['start']) : $event_b['start']);
+ $date_a = DateTimeFormat::local($event_a['start']);
+ $date_b = DateTimeFormat::local($event_b['start']);
if ($date_a === $date_b) {
return strcasecmp($event_a['desc'], $event_b['desc']);
}
DBA::delete('event', ['id' => $event_id]);
- Logger::log("Deleted event ".$event_id, Logger::DEBUG);
+ Logger::info("Deleted event", ['id' => $event_id]);
}
/**
*/
public static function store($arr)
{
- $network = $arr['network'] ?? Protocol::DFRN;
- $protocol = $arr['protocol'] ?? Conversation::PARCEL_UNKNOWN;
- $direction = $arr['direction'] ?? Conversation::UNKNOWN;
- $source = $arr['source'] ?? '';
-
- unset($arr['network']);
- unset($arr['protocol']);
- unset($arr['direction']);
- unset($arr['source']);
-
$event = [];
$event['id'] = intval($arr['id'] ?? 0);
$event['uid'] = intval($arr['uid'] ?? 0);
$event['allow_gid'] = $arr['allow_gid'] ?? '';
$event['deny_cid'] = $arr['deny_cid'] ?? '';
$event['deny_gid'] = $arr['deny_gid'] ?? '';
- $event['adjust'] = intval($arr['adjust'] ?? 0);
$event['nofinish'] = intval($arr['nofinish'] ?? (!empty($event['start']) && empty($event['finish'])));
$event['created'] = DateTimeFormat::utc(($arr['created'] ?? '') ?: 'now');
if ($event['finish'] < DBA::NULL_DATETIME) {
$event['finish'] = DBA::NULL_DATETIME;
}
- $private = intval($arr['private'] ?? 0);
-
- if ($event['cid']) {
- $conditions = ['id' => $event['cid']];
- } else {
- $conditions = ['uid' => $event['uid'], 'self' => true];
- }
-
- $contact = DBA::selectFirst('contact', [], $conditions);
- if (!DBA::isResult($contact)) {
- Logger::warning('Contact not found', ['condition' => $conditions, 'callstack' => System::callstack(20)]);
- }
// Existing event being modified.
if ($event['id']) {
// has the event actually changed?
$existing_event = DBA::selectFirst('event', ['edited'], ['id' => $event['id'], 'uid' => $event['uid']]);
- if (!DBA::isResult($existing_event) || ($existing_event['edited'] === $event['edited'])) {
-
- $item = Post::selectFirst(['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]);
-
- return DBA::isResult($item) ? $item['id'] : 0;
+ if (!DBA::isResult($existing_event)) {
+ return 0;
+ }
+
+ if ($existing_event['edited'] === $event['edited']) {
+ return $event['id'];
}
$updated_fields = [
'desc' => $event['desc'],
'location' => $event['location'],
'type' => $event['type'],
- 'adjust' => $event['adjust'],
'nofinish' => $event['nofinish'],
];
$fields = ['body' => self::getBBCode($event), 'object' => $object, 'edited' => $event['edited']];
Item::update($fields, ['id' => $item['id']]);
-
- $uriid = $item['uri-id'];
- } else {
- $uriid = 0;
}
Hook::callAll('event_updated', $event['id']);
// New event. Store it.
DBA::insert('event', $event);
- $uriid = 0;
-
- // Don't create an item for birthday events
- if ($event['type'] == 'event') {
- $event['id'] = DBA::lastInsertId();
-
- $item_arr = [];
-
- $item_arr['uid'] = $event['uid'];
- $item_arr['contact-id'] = $event['cid'];
- $item_arr['uri'] = $event['uri'];
- $item_arr['uri-id'] = ItemURI::getIdByURI($event['uri']);
- $item_arr['guid'] = $event['guid'];
- $item_arr['plink'] = $arr['plink'] ?? '';
- $item_arr['post-type'] = Item::PT_EVENT;
- $item_arr['wall'] = $event['cid'] ? 0 : 1;
- $item_arr['contact-id'] = $contact['id'];
- $item_arr['owner-name'] = $contact['name'];
- $item_arr['owner-link'] = $contact['url'];
- $item_arr['owner-avatar'] = $contact['thumb'];
- $item_arr['author-name'] = $contact['name'];
- $item_arr['author-link'] = $contact['url'];
- $item_arr['author-avatar'] = $contact['thumb'];
- $item_arr['title'] = '';
- $item_arr['allow_cid'] = $event['allow_cid'];
- $item_arr['allow_gid'] = $event['allow_gid'];
- $item_arr['deny_cid'] = $event['deny_cid'];
- $item_arr['deny_gid'] = $event['deny_gid'];
- $item_arr['private'] = $private;
- $item_arr['visible'] = 1;
- $item_arr['verb'] = Activity::POST;
- $item_arr['object-type'] = Activity\ObjectType::EVENT;
- $item_arr['post-type'] = Item::PT_EVENT;
- $item_arr['origin'] = $event['cid'] === 0 ? 1 : 0;
- $item_arr['body'] = self::getBBCode($event);
- $item_arr['event-id'] = $event['id'];
- $item_arr['network'] = $network;
- $item_arr['protocol'] = $protocol;
- $item_arr['direction'] = $direction;
- $item_arr['source'] = $source;
-
- $item_arr['object'] = '<object><type>' . XML::escape(Activity\ObjectType::EVENT) . '</type><title></title><id>' . XML::escape($event['uri']) . '</id>';
- $item_arr['object'] .= '<content>' . XML::escape(self::getBBCode($event)) . '</content>';
- $item_arr['object'] .= '</object>' . "\n";
-
- if (Item::insert($item_arr)) {
- $uriid = $item_arr['uri-id'];
- }
- }
+ $event['id'] = DBA::lastInsertId();
Hook::callAll("event_created", $event['id']);
}
- return $uriid;
+ return $event['id'];
+ }
+
+ public static function getItemArrayForId(int $event_id, array $item = []):array
+ {
+ if (empty($event_id)) {
+ return $item;
+ }
+
+ $event = DBA::selectFirst('event', [], ['id' => $event_id]);
+ if ($event['type'] != 'event') {
+ return $item;
+ }
+
+ if ($event['cid']) {
+ $conditions = ['id' => $event['cid']];
+ } else {
+ $conditions = ['uid' => $event['uid'], 'self' => true];
+ }
+
+ $contact = DBA::selectFirst('contact', [], $conditions);
+
+ $event['id'] = $event_id;
+
+ $item['uid'] = $event['uid'];
+ $item['contact-id'] = $event['cid'];
+ $item['uri'] = $event['uri'];
+ $item['uri-id'] = ItemURI::getIdByURI($event['uri']);
+ $item['guid'] = $event['guid'];
+ $item['plink'] = $arr['plink'] ?? '';
+ $item['post-type'] = Item::PT_EVENT;
+ $item['wall'] = $event['cid'] ? 0 : 1;
+ $item['contact-id'] = $contact['id'];
+ $item['owner-name'] = $contact['name'];
+ $item['owner-link'] = $contact['url'];
+ $item['owner-avatar'] = $contact['thumb'];
+ $item['author-name'] = $contact['name'];
+ $item['author-link'] = $contact['url'];
+ $item['author-avatar'] = $contact['thumb'];
+ $item['title'] = '';
+ $item['allow_cid'] = $event['allow_cid'];
+ $item['allow_gid'] = $event['allow_gid'];
+ $item['deny_cid'] = $event['deny_cid'];
+ $item['deny_gid'] = $event['deny_gid'];
+ $item['private'] = intval($event['private'] ?? 0);
+ $item['visible'] = 1;
+ $item['verb'] = Activity::POST;
+ $item['object-type'] = Activity\ObjectType::EVENT;
+ $item['post-type'] = Item::PT_EVENT;
+ $item['origin'] = $event['cid'] === 0 ? 1 : 0;
+ $item['body'] = self::getBBCode($event);
+ $item['event-id'] = $event['id'];
+
+ $item['object'] = '<object><type>' . XML::escape(Activity\ObjectType::EVENT) . '</type><title></title><id>' . XML::escape($event['uri']) . '</id>';
+ $item['object'] .= '<content>' . XML::escape(self::getBBCode($event)) . '</content>';
+ $item['object'] .= '</object>' . "\n";
+
+ return $item;
+ }
+
+ public static function getItemArrayForImportedId(int $event_id, array $item = []):array
+ {
+ if (empty($event_id)) {
+ return $item;
+ }
+
+ $event = DBA::selectFirst('event', [], ['id' => $event_id]);
+ if ($event['type'] != 'event') {
+ return $item;
+ }
+
+ $item['post-type'] = Item::PT_EVENT;
+ $item['title'] = '';
+ $item['object-type'] = Activity\ObjectType::EVENT;
+ $item['body'] = self::getBBCode($event);
+ $item['event-id'] = $event_id;
+
+ $item['object'] = '<object><type>' . XML::escape(Activity\ObjectType::EVENT) . '</type><title></title><id>' . XML::escape($event['uri']) . '</id>';
+ $item['object'] .= '<content>' . XML::escape(self::getBBCode($event)) . '</content>';
+ $item['object'] .= '</object>' . "\n";
+
+ return $item;
}
/**
}
// Query for the event by event id
- $events = DBA::toArray(DBA::p("SELECT `event`.*, `post-user-view`.`id` AS `itemid` FROM `event`
- LEFT JOIN `post-user-view` ON `post-user-view`.`event-id` = `event`.`id` AND `post-user-view`.`uid` = `event`.`uid`
+ $events = DBA::toArray(DBA::p("SELECT `event`.*, `post-user`.`id` AS `itemid` FROM `event`
+ LEFT JOIN `post-user` ON `post-user`.`event-id` = `event`.`id` AND `post-user`.`uid` = `event`.`uid`
WHERE `event`.`uid` = ? AND `event`.`id` = ? $sql_extra",
$owner_uid, $event_id));
* int 'ignore' =>
* string 'start' => Start time of the timeframe.
* string 'finish' => Finish time of the timeframe.
- * string 'adjust_start' =>
- * string 'adjust_finish' =>
*
* @param string $sql_extra Additional sql conditions (e.g. permission request).
*
}
// Query for the event by date.
- // @todo Slow query (518 seconds to run), to be optimzed
- $events = DBA::toArray(DBA::p("SELECT `event`.*, `post-user-view`.`id` AS `itemid` FROM `event`
- LEFT JOIN `post-user-view` ON `post-user-view`.`event-id` = `event`.`id` AND `post-user-view`.`uid` = `event`.`uid`
+ $events = DBA::toArray(DBA::p("SELECT `event`.*, `post-user`.`id` AS `itemid` FROM `event`
+ LEFT JOIN `post-user` ON `post-user`.`event-id` = `event`.`id` AND `post-user`.`uid` = `event`.`uid`
WHERE `event`.`uid` = ? AND `event`.`ignore` = ?
- AND ((NOT `adjust` AND (`finish` >= ? OR (`nofinish` AND `start` >= ?)) AND `start` <= ?)
- OR (`adjust` AND (`finish` >= ? OR (`nofinish` AND `start` >= ?)) AND `start` <= ?))" . $sql_extra,
- $owner_uid, $event_params["ignore"],
- $event_params["start"], $event_params["start"], $event_params["finish"],
- $event_params["adjust_start"], $event_params["adjust_start"], $event_params["adjust_finish"]));
+ AND (`finish` >= ? OR (`nofinish` AND `start` >= ?)) AND `start` <= ?
+ " . $sql_extra,
+ $owner_uid, $event_params['ignore'],
+ $event_params['start'], $event_params['start'], $event_params['finish']
+ ));
if (DBA::isResult($events)) {
$return = self::removeDuplicates($events);
$event = array_merge($event, $item);
- $start = $event['adjust'] ? DateTimeFormat::local($event['start'], 'c') : DateTimeFormat::utc($event['start'], 'c');
- $j = $event['adjust'] ? DateTimeFormat::local($event['start'], 'j') : DateTimeFormat::utc($event['start'], 'j');
- $day = $event['adjust'] ? DateTimeFormat::local($event['start'], $fmt) : DateTimeFormat::utc($event['start'], $fmt);
+ $start = DateTimeFormat::local($event['start'], 'c');
+ $j = DateTimeFormat::local($event['start'], 'j');
+ $day = DateTimeFormat::local($event['start'], $fmt);
$day = DI::l10n()->getDay($day);
if ($event['nofinish']) {
$end = null;
} else {
- $end = $event['adjust'] ? DateTimeFormat::local($event['finish'], 'c') : DateTimeFormat::utc($event['finish'], 'c');
+ $end = DateTimeFormat::local($event['finish'], 'c');
}
$is_first = ($day !== $last_date);
// but test your solution against http://icalvalid.cloudapp.net/
// also long lines SHOULD be split at 75 characters length
foreach ($events as $event) {
- if ($event['adjust'] == 1) {
- $UTC = 'Z';
- } else {
- $UTC = '';
- }
$o .= 'BEGIN:VEVENT' . PHP_EOL;
if ($event['start']) {
- $tmp = strtotime($event['start']);
- $dtformat = "%Y%m%dT%H%M%S" . $UTC;
- $o .= 'DTSTART:' . strftime($dtformat, $tmp) . PHP_EOL;
+ $o .= 'DTSTART:' . DateTimeFormat::utc($event['start'], 'Ymd\THis\Z') . PHP_EOL;
}
if (!$event['nofinish']) {
- $tmp = strtotime($event['finish']);
- $dtformat = "%Y%m%dT%H%M%S" . $UTC;
- $o .= 'DTEND:' . strftime($dtformat, $tmp) . PHP_EOL;
+ $o .= 'DTEND:' . DateTimeFormat::utc($event['finish'], 'Ymd\THis\Z') . PHP_EOL;
}
if ($event['summary']) {
return $return;
}
- $fields = ['start', 'finish', 'adjust', 'summary', 'desc', 'location', 'nofinish'];
+ $fields = ['start', 'finish', 'summary', 'desc', 'location', 'nofinish'];
$conditions = ['uid' => $uid, 'cid' => 0];
$tformat = DI::l10n()->t('g:i A'); // 8:01 AM.
// Convert the time to different formats.
- $dtstart_dt = DI::l10n()->getDay(
- $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');
+ $dtstart_dt = DI::l10n()->getDay(DateTimeFormat::local($item['event-start'], $dformat));
+ $dtstart_title = DateTimeFormat::utc($item['event-start'], DateTimeFormat::ATOM);
// Format: Jan till Dec.
- $month_short = DI::l10n()->getDayShort(
- $item['event-adjust'] ?
- DateTimeFormat::local($item['event-start'], 'M')
- : DateTimeFormat::utc($item['event-start'], 'M')
- );
+ $month_short = DI::l10n()->getDayShort(DateTimeFormat::local($item['event-start'], 'M'));
// Format: 1 till 31.
- $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 = DI::l10n()->getDayShort(
- $item['event-adjust'] ?
- DateTimeFormat::local($item['event-start'], $dformat_short)
- : DateTimeFormat::utc($item['event-start'], $dformat_short)
- );
+ $date_short = DateTimeFormat::local($item['event-start'], 'j');
+ $start_time = DateTimeFormat::local($item['event-start'], $tformat);
+ $start_short = DI::l10n()->getDayShort(DateTimeFormat::local($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 = DI::l10n()->getDay(
- $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 = DI::l10n()->getDayShort(
- $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);
+ $dtend_dt = DI::l10n()->getDay(DateTimeFormat::local($item['event-finish'], $dformat));
+ $dtend_title = DateTimeFormat::utc($item['event-finish'], DateTimeFormat::ATOM);
+ $end_short = DI::l10n()->getDayShort(DateTimeFormat::utc($item['event-finish'], $dformat_short));
+ $end_time = DateTimeFormat::local($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;
'summary' => DI::l10n()->t('%s\'s birthday', $contact['name']),
'desc' => DI::l10n()->t('Happy Birthday %s', ' [url=' . $contact['url'] . ']' . $contact['name'] . '[/url]'),
'type' => 'birthday',
- 'adjust' => 0
];
self::store($values);
projects / friendica.git / blobdiff