X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FEvent.php;h=ce2e9d53b2cc98b43a537bcb7db3e01af66dc209;hb=5e188d17f927b3d3061d3f86cf9b633bac1d2b43;hp=ee61149de5b300d6b365b164d91764406ad76ef3;hpb=8a46c786f37550160d81e7b7ecbcacb4c9fff493;p=friendica.git diff --git a/src/Model/Event.php b/src/Model/Event.php index ee61149de5..ce2e9d53b2 100644 --- a/src/Model/Event.php +++ b/src/Model/Event.php @@ -5,27 +5,24 @@ namespace Friendica\Model; -use Friendica\BaseObject; use Friendica\Content\Text\BBCode; -use Friendica\Core\Addon; +use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Core\System; use Friendica\Database\DBA; -use Friendica\Model\Contact; +use Friendica\DI; +use Friendica\Protocol\Activity; use Friendica\Util\DateTimeFormat; use Friendica\Util\Map; - -require_once 'boot.php'; -require_once 'include/dba.php'; -require_once 'include/items.php'; +use Friendica\Util\Strings; +use Friendica\Util\XML; /** - * @brief functions for interacting with the event database table + * functions for interacting with the event database table */ -class Event extends BaseObject +class Event { public static function getHTML(array $event, $simple = false) @@ -34,15 +31,15 @@ class Event extends BaseObject return ''; } - $bd_format = 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'); // Friday January 18, 2011 @ 8 AM. - $event_start = day_translate( + $event_start = DI::l10n()->getDay( !empty($event['adjust']) ? DateTimeFormat::local($event['start'], $bd_format) : DateTimeFormat::utc($event['start'], $bd_format) ); if (!empty($event['finish'])) { - $event_end = day_translate( + $event_end = DI::l10n()->getDay( !empty($event['adjust']) ? DateTimeFormat::local($event['finish'], $bd_format) : DateTimeFormat::utc($event['finish'], $bd_format) ); @@ -51,22 +48,24 @@ class Event extends BaseObject } if ($simple) { + $o = ''; + if (!empty($event['summary'])) { - $o = "

" . BBCode::convert($event['summary'], false, $simple) . "

"; + $o .= "

" . BBCode::convert(Strings::escapeHtml($event['summary']), false, $simple) . "

"; } if (!empty($event['desc'])) { - $o .= "
" . BBCode::convert($event['desc'], false, $simple) . "
"; + $o .= "
" . BBCode::convert(Strings::escapeHtml($event['desc']), false, $simple) . "
"; } - $o .= "

" . L10n::t('Starts:') . "

" . $event_start . "

"; + $o .= "

" . DI::l10n()->t('Starts:') . "

" . $event_start . "

"; if (!$event['nofinish']) { - $o .= "

" . L10n::t('Finishes:') . "

" . $event_end . "

"; + $o .= "

" . DI::l10n()->t('Finishes:') . "

" . $event_end . "

"; } if (!empty($event['location'])) { - $o .= "

" . L10n::t('Location:') . "

" . BBCode::convert($event['location'], false, $simple) . "

"; + $o .= "

" . DI::l10n()->t('Location:') . "

" . BBCode::convert(Strings::escapeHtml($event['location']), false, $simple) . "

"; } return $o; @@ -74,27 +73,27 @@ class Event extends BaseObject $o = '
' . "\r\n"; - $o .= '
' . BBCode::convert($event['summary'], false, $simple) . '
' . "\r\n"; + $o .= '
' . BBCode::convert(Strings::escapeHtml($event['summary']), false, $simple) . '
' . "\r\n"; - $o .= '
' . L10n::t('Starts:') . ' ' . DI::l10n()->t('Starts:') . ' ' . $event_start . '
' . "\r\n"; if (!$event['nofinish']) { - $o .= '
' . L10n::t('Finishes:') . ' ' . DI::l10n()->t('Finishes:') . ' ' . $event_end . '
' . "\r\n"; } if (!empty($event['desc'])) { - $o .= '
' . BBCode::convert($event['desc'], false, $simple) . '
' . "\r\n"; + $o .= '
' . BBCode::convert(Strings::escapeHtml($event['desc']), false, $simple) . '
' . "\r\n"; } if (!empty($event['location'])) { - $o .= '
' . L10n::t('Location:') . ' ' - . BBCode::convert($event['location'], false, $simple) + $o .= '
' . DI::l10n()->t('Location:') . ' ' + . BBCode::convert(Strings::escapeHtml($event['location']), false, $simple) . '
' . "\r\n"; // Include a map of the location if the [map] BBCode is used. @@ -111,7 +110,7 @@ class Event extends BaseObject } /** - * @brief Convert an array with event data to bbcode. + * Convert an array with event data to bbcode. * * @param array $event Array which contains the event data. * @return string The event as a bbcode formatted string. @@ -148,9 +147,10 @@ class Event extends BaseObject } /** - * @brief Extract bbcode formatted event data from a string. + * Extract bbcode formatted event data from a string. * * @params: string $s The string which should be parsed for event data. + * @param $text * @return array The array with the event information. */ public static function fromBBCode($text) @@ -211,13 +211,14 @@ class Event extends BaseObject } /** - * @brief Delete an event from the event table. + * 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 + * @throws \Exception */ public static function delete($event_id) { @@ -225,46 +226,46 @@ class Event extends BaseObject return; } - DBA::delete('event', ['id' => $event_id]); + DBA::delete('event', ['id' => $event_id], ['cascade' => false]); Logger::log("Deleted event ".$event_id, Logger::DEBUG); } /** - * @brief Store the event. + * 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 new event id. + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function store($arr) { - $a = self::getApp(); - $event = []; - $event['id'] = intval(defaults($arr, 'id' , 0)); - $event['uid'] = intval(defaults($arr, 'uid' , 0)); - $event['cid'] = intval(defaults($arr, 'cid' , 0)); - $event['uri'] = defaults($arr, 'uri' , Item::newURI($event['uid'])); - $event['type'] = defaults($arr, 'type' , 'event'); - $event['summary'] = defaults($arr, 'summary' , ''); - $event['desc'] = defaults($arr, 'desc' , ''); - $event['location'] = defaults($arr, 'location' , ''); - $event['allow_cid'] = defaults($arr, 'allow_cid', ''); - $event['allow_gid'] = defaults($arr, 'allow_gid', ''); - $event['deny_cid'] = defaults($arr, 'deny_cid' , ''); - $event['deny_gid'] = defaults($arr, 'deny_gid' , ''); - $event['adjust'] = intval(defaults($arr, 'adjust' , 0)); - $event['nofinish'] = intval(defaults($arr, 'nofinish' , !empty($event['start']) && empty($event['finish']))); - - $event['created'] = DateTimeFormat::utc(defaults($arr, 'created' , 'now')); - $event['edited'] = DateTimeFormat::utc(defaults($arr, 'edited' , 'now')); - $event['start'] = DateTimeFormat::utc(defaults($arr, 'start' , DBA::NULL_DATETIME)); - $event['finish'] = DateTimeFormat::utc(defaults($arr, 'finish' , DBA::NULL_DATETIME)); + $event['id'] = intval($arr['id'] ?? 0); + $event['uid'] = intval($arr['uid'] ?? 0); + $event['cid'] = intval($arr['cid'] ?? 0); + $event['guid'] = ($arr['guid'] ?? '') ?: System::createUUID(); + $event['uri'] = ($arr['uri'] ?? '') ?: Item::newURI($event['uid'], $event['guid']); + $event['type'] = ($arr['type'] ?? '') ?: 'event'; + $event['summary'] = $arr['summary'] ?? ''; + $event['desc'] = $arr['desc'] ?? ''; + $event['location'] = $arr['location'] ?? ''; + $event['allow_cid'] = $arr['allow_cid'] ?? ''; + $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'); + $event['edited'] = DateTimeFormat::utc(($arr['edited'] ?? '') ?: 'now'); + $event['start'] = DateTimeFormat::utc(($arr['start'] ?? '') ?: DBA::NULL_DATETIME); + $event['finish'] = DateTimeFormat::utc(($arr['finish'] ?? '') ?: DBA::NULL_DATETIME); if ($event['finish'] < DBA::NULL_DATETIME) { $event['finish'] = DBA::NULL_DATETIME; } - $private = intval(defaults($arr, 'private', 0)); + $private = intval($arr['private'] ?? 0); $conditions = ['uid' => $event['uid']]; if ($event['cid']) { @@ -302,8 +303,8 @@ class Event extends BaseObject $item = Item::selectFirst(['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]); if (DBA::isResult($item)) { - $object = '' . xmlify(ACTIVITY_OBJ_EVENT) . '' . xmlify($event['uri']) . ''; - $object .= '' . xmlify(self::getBBCode($event)) . ''; + $object = '' . XML::escape(Activity\ObjectType::EVENT) . '' . XML::escape($event['uri']) . ''; + $object .= '' . XML::escape(self::getBBCode($event)) . ''; $object .= '' . "\n"; $fields = ['body' => self::getBBCode($event), 'object' => $object, 'edited' => $event['edited']]; @@ -314,130 +315,133 @@ class Event extends BaseObject $item_id = 0; } - Addon::callHooks('event_updated', $event['id']); + Hook::callAll('event_updated', $event['id']); } else { - $event['guid'] = defaults($arr, 'guid', System::createUUID()); - // New event. Store it. DBA::insert('event', $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['parent-uri'] = $event['uri']; - $item_arr['guid'] = $event['guid']; - $item_arr['plink'] = defaults($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_OBJ_EVENT; - $item_arr['origin'] = $event['cid'] === 0 ? 1 : 0; - $item_arr['body'] = self::getBBCode($event); - $item_arr['event-id'] = $event['id']; - - $item_arr['object'] = '' . xmlify(ACTIVITY_OBJ_EVENT) . '' . xmlify($event['uri']) . ''; - $item_arr['object'] .= '' . xmlify(self::getBBCode($event)) . ''; - $item_arr['object'] .= '' . "\n"; - - $item_id = Item::insert($item_arr); - - Addon::callHooks("event_created", $event['id']); + $item_id = 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['parent-uri'] = $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['origin'] = $event['cid'] === 0 ? 1 : 0; + $item_arr['body'] = self::getBBCode($event); + $item_arr['event-id'] = $event['id']; + + $item_arr['object'] = '' . XML::escape(Activity\ObjectType::EVENT) . '' . XML::escape($event['uri']) . ''; + $item_arr['object'] .= '' . XML::escape(self::getBBCode($event)) . ''; + $item_arr['object'] .= '' . "\n"; + + $item_id = Item::insert($item_arr); + } + + Hook::callAll("event_created", $event['id']); } return $item_id; } /** - * @brief Create an array with translation strings used for events. + * Create an array with translation strings used for events. * * @return array Array with translations strings. + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function getStrings() { // First day of the week (0 = Sunday). - $firstDay = PConfig::get(local_user(), 'system', 'first_day_of_week', 0); + $firstDay = DI::pConfig()->get(local_user(), 'system', 'first_day_of_week', 0); $i18n = [ "firstDay" => $firstDay, - "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:") + "allday" => DI::l10n()->t("all-day"), + + "Sun" => DI::l10n()->t("Sun"), + "Mon" => DI::l10n()->t("Mon"), + "Tue" => DI::l10n()->t("Tue"), + "Wed" => DI::l10n()->t("Wed"), + "Thu" => DI::l10n()->t("Thu"), + "Fri" => DI::l10n()->t("Fri"), + "Sat" => DI::l10n()->t("Sat"), + + "Sunday" => DI::l10n()->t("Sunday"), + "Monday" => DI::l10n()->t("Monday"), + "Tuesday" => DI::l10n()->t("Tuesday"), + "Wednesday" => DI::l10n()->t("Wednesday"), + "Thursday" => DI::l10n()->t("Thursday"), + "Friday" => DI::l10n()->t("Friday"), + "Saturday" => DI::l10n()->t("Saturday"), + + "Jan" => DI::l10n()->t("Jan"), + "Feb" => DI::l10n()->t("Feb"), + "Mar" => DI::l10n()->t("Mar"), + "Apr" => DI::l10n()->t("Apr"), + "May" => DI::l10n()->t("May"), + "Jun" => DI::l10n()->t("Jun"), + "Jul" => DI::l10n()->t("Jul"), + "Aug" => DI::l10n()->t("Aug"), + "Sep" => DI::l10n()->t("Sept"), + "Oct" => DI::l10n()->t("Oct"), + "Nov" => DI::l10n()->t("Nov"), + "Dec" => DI::l10n()->t("Dec"), + + "January" => DI::l10n()->t("January"), + "February" => DI::l10n()->t("February"), + "March" => DI::l10n()->t("March"), + "April" => DI::l10n()->t("April"), + "June" => DI::l10n()->t("June"), + "July" => DI::l10n()->t("July"), + "August" => DI::l10n()->t("August"), + "September" => DI::l10n()->t("September"), + "October" => DI::l10n()->t("October"), + "November" => DI::l10n()->t("November"), + "December" => DI::l10n()->t("December"), + + "today" => DI::l10n()->t("today"), + "month" => DI::l10n()->t("month"), + "week" => DI::l10n()->t("week"), + "day" => DI::l10n()->t("day"), + + "noevent" => DI::l10n()->t("No events to display"), + + "dtstart_label" => DI::l10n()->t("Starts:"), + "dtend_label" => DI::l10n()->t("Finishes:"), + "location_label" => DI::l10n()->t("Location:") ]; return $i18n; } /** - * @brief Removes duplicated birthday events. + * Removes duplicated birthday events. * * @param array $dates Array of possibly duplicated events. * @return array Cleaned events. @@ -459,12 +463,13 @@ class Event extends BaseObject } /** - * @brief Get an event by its event ID. + * Get an event by its event ID. * * @param int $owner_uid The User ID of the owner of the event * @param int $event_id The ID of the event in the event table * @param string $sql_extra * @return array Query result + * @throws \Exception */ public static function getListById($owner_uid, $event_id, $sql_extra = '') { @@ -491,19 +496,20 @@ class Event extends BaseObject } /** - * @brief Get all events in a specific time frame. + * Get all events in a specific time frame. * - * @param int $owner_uid The User ID of the owner of the events. - * @param array $event_params An associative array with - * int 'ignore' => - * string 'start' => Start time of the timeframe. - * string 'finish' => Finish time of the timeframe. - * string 'adjust_start' => - * string 'adjust_finish' => + * @param int $owner_uid The User ID of the owner of the events. + * @param array $event_params An associative array with + * 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). + * @param string $sql_extra Additional sql conditions (e.g. permission request). * * @return array Query results. + * @throws \Exception */ public static function getListByDate($owner_uid, $event_params, $sql_extra = '') { @@ -540,17 +546,19 @@ class Event extends BaseObject } /** - * @brief Convert an array query results in an array which could be used by the events template. + * Convert an array query results in an array which could be used by the events template. * * @param array $event_result Event query array. * @return array Event array for the template. + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function prepareListForTemplate(array $event_result) { $event_list = []; $last_date = ''; - $fmt = L10n::t('l, F j'); + $fmt = DI::l10n()->t('l, F j'); foreach ($event_result as $event) { $item = Item::selectFirst(['plink', 'author-name', 'author-avatar', 'author-link'], ['id' => $event['itemid']]); if (!DBA::isResult($item)) { @@ -563,7 +571,7 @@ class Event extends BaseObject $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); - $day = day_translate($day); + $day = DI::l10n()->getDay($day); if ($event['nofinish']) { $end = null; @@ -581,15 +589,14 @@ class Event extends BaseObject $copy = null; $drop = null; if (local_user() && local_user() == $event['uid'] && $event['type'] == 'event') { - $edit = !$event['cid'] ? [System::baseUrl() . '/events/event/' . $event['id'], L10n::t('Edit event') , '', ''] : null; - $copy = !$event['cid'] ? [System::baseUrl() . '/events/copy/' . $event['id'] , L10n::t('Duplicate event'), '', ''] : null; - $drop = [System::baseUrl() . '/events/drop/' . $event['id'] , L10n::t('Delete event') , '', '']; + $edit = !$event['cid'] ? [DI::baseUrl() . '/events/event/' . $event['id'], DI::l10n()->t('Edit event') , '', ''] : null; + $copy = !$event['cid'] ? [DI::baseUrl() . '/events/copy/' . $event['id'] , DI::l10n()->t('Duplicate event'), '', ''] : null; + $drop = [DI::baseUrl() . '/events/drop/' . $event['id'] , DI::l10n()->t('Delete event') , '', '']; } - $title = strip_tags(html_entity_decode(BBCode::convert($event['summary']), ENT_QUOTES, 'UTF-8')); + $title = BBCode::convert(Strings::escapeHtml($event['summary'])); if (!$title) { - list($title, $_trash) = explode(" $event['id'], 'start' => $start, @@ -615,7 +623,7 @@ class Event extends BaseObject 'is_first' => $is_first, 'item' => $event, 'html' => $html, - 'plink' => [$event['plink'], L10n::t('link to source'), '', ''], + 'plink' => [$event['plink'], DI::l10n()->t('link to source'), '', ''], ]; } @@ -623,27 +631,29 @@ class Event extends BaseObject } /** - * @brief Format event to export format (ical/csv). + * Format event to export format (ical/csv). * - * @param array $events Query result for events. - * @param string $format The output format (ical/csv). - * @param string $timezone The timezone of the user (not implemented yet). + * @param array $events Query result for events. + * @param string $format The output format (ical/csv). * + * @param $timezone * @return string Content according to selected export format. * - * @todo Implement timezone support + * @todo Implement timezone support */ - private static function formatListForExport(array $events, $format, $timezone) + private static function formatListForExport(array $events, $format) { + $o = ''; + if (!count($events)) { - return ''; + return $o; } switch ($format) { // Format the exported data as a CSV file. case "csv": header("Content-type: text/csv"); - $o = '"Subject", "Start Date", "Start Time", "Description", "End Date", "End Time", "Location"' . PHP_EOL; + $o .= '"Subject", "Start Date", "Start Time", "Description", "End Date", "End Time", "Location"' . PHP_EOL; foreach ($events as $event) { /// @todo The time / date entries don't include any information about the @@ -728,7 +738,7 @@ class Event extends BaseObject } /** - * @brief Get all events for a user ID. + * Get all events for a user ID. * * The query for events is done permission sensitive. * If the user is the owner of the calendar they @@ -739,6 +749,7 @@ class Event extends BaseObject * @param int $uid The user ID. * * @return array Query results. + * @throws \Exception */ private static function getListByUserId($uid = 0) { @@ -769,33 +780,29 @@ class Event extends BaseObject /** * - * @param int $uid The user ID. + * @param int $uid The user ID. * @param string $format Output format (ical/csv). * @return array With the results: - * bool 'success' => True if the processing was successful,
- * string 'format' => The output format,
- * string 'extension' => The file extension of the output format,
- * string 'content' => The formatted output content.
+ * bool 'success' => True if the processing was successful,
+ * string 'format' => The output format,
+ * string 'extension' => The file extension of the output format,
+ * string 'content' => The formatted output content.
* + * @throws \Exception * @todo Respect authenticated users with events_by_uid(). */ public static function exportListByUserId($uid, $format = 'ical') { $process = false; - $user = DBA::selectFirst('user', ['timezone'], ['uid' => $uid]); - if (DBA::isResult($user)) { - $timezone = $user['timezone']; - } - // Get all events which are owned by a uid (respects permissions). $events = self::getListByUserId($uid); // We have the events that are available for the requestor. // Now format the output according to the requested format. - $res = self::formatListForExport($events, $format, $timezone); + $res = self::formatListForExport($events, $format); - // If there are results the precess was successfull. + // If there are results the precess was successful. if (!empty($res)) { $process = true; } @@ -825,29 +832,31 @@ class Event extends BaseObject } /** - * @brief Format an item array with event data to HTML. + * Format an item array with event data to HTML. * * @param array $item Array with item and event data. * @return string HTML output. + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function getItemHTML(array $item) { $same_date = false; $finish = false; // Set the different time formats. - $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. + $dformat = DI::l10n()->t('l F d, Y \@ g:i A'); // Friday January 18, 2011 @ 8:01 AM. + $dformat_short = DI::l10n()->t('D g:i A'); // Fri 8:01 AM. + $tformat = DI::l10n()->t('g:i A'); // 8:01 AM. // Convert the time to different formats. - $dtstart_dt = day_translate( + $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'); // Format: Jan till Dec. - $month_short = day_short_translate( + $month_short = DI::l10n()->getDayShort( $item['event-adjust'] ? DateTimeFormat::local($item['event-start'], 'M') : DateTimeFormat::utc($item['event-start'], 'M') @@ -859,7 +868,7 @@ class Event extends BaseObject $start_time = $item['event-adjust'] ? DateTimeFormat::local($item['event-start'], $tformat) : DateTimeFormat::utc($item['event-start'], $tformat); - $start_short = day_short_translate( + $start_short = DI::l10n()->getDayShort( $item['event-adjust'] ? DateTimeFormat::local($item['event-start'], $dformat_short) : DateTimeFormat::utc($item['event-start'], $dformat_short) @@ -868,13 +877,13 @@ class Event extends BaseObject // If the option 'nofinisch' isn't set, we need to format the finish date/time. if (!$item['event-nofinish']) { $finish = true; - $dtend_dt = day_translate( + $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 = day_short_translate( + $end_short = DI::l10n()->getDayShort( $item['event-adjust'] ? DateTimeFormat::local($item['event-finish'], $dformat_short) : DateTimeFormat::utc($item['event-finish'], $dformat_short) @@ -902,12 +911,12 @@ class Event extends BaseObject $tpl = Renderer::getMarkupTemplate('event_stream_item.tpl'); $return = Renderer::replaceMacros($tpl, [ '$id' => $item['event-id'], - '$title' => prepare_text($item['event-summary']), - '$dtstart_label' => L10n::t('Starts:'), + '$title' => BBCode::convert($item['event-summary']), + '$dtstart_label' => DI::l10n()->t('Starts:'), '$dtstart_title' => $dtstart_title, '$dtstart_dt' => $dtstart_dt, '$finish' => $finish, - '$dtend_label' => L10n::t('Finishes:'), + '$dtend_label' => DI::l10n()->t('Finishes:'), '$dtend_title' => $dtend_title, '$dtend_dt' => $dtend_dt, '$month_short' => $month_short, @@ -920,11 +929,11 @@ class Event extends BaseObject '$author_name' => $item['author-name'], '$author_link' => $profile_link, '$author_avatar' => $item['author-avatar'], - '$description' => prepare_text($item['event-desc']), - '$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'), + '$description' => BBCode::convert($item['event-desc']), + '$location_label' => DI::l10n()->t('Location:'), + '$show_map_label' => DI::l10n()->t('Show map'), + '$hide_map_label' => DI::l10n()->t('Hide map'), + '$map_btn_label' => DI::l10n()->t('Show map'), '$location' => $location ]); @@ -932,7 +941,7 @@ class Event extends BaseObject } /** - * @brief Format a string with map bbcode to an array with location data. + * 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. @@ -943,6 +952,7 @@ class Event extends BaseObject * 'name' => The name of the location,
* 'address' => The address of the location,
* 'coordinates' => Latitude‎ and longitude‎ (e.g. '48.864716,2.349014').
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ private static function locationToArray($s = '') { if ($s == '') { @@ -969,7 +979,7 @@ class Event extends BaseObject } } - $location['name'] = prepare_text($location['name']); + $location['name'] = BBCode::convert($location['name']); // Construct the map HTML. if (isset($location['address'])) { @@ -980,4 +990,48 @@ class Event extends BaseObject return $location; } + + /** + * Add new birthday event for this person + * + * @param array $contact Contact array, expects: id, uid, url, name + * @param string $birthday Birthday of the contact + * @return bool + * @throws \Exception + */ + public static function createBirthday($contact, $birthday) + { + // Check for duplicates + $condition = [ + 'uid' => $contact['uid'], + 'cid' => $contact['id'], + 'start' => DateTimeFormat::utc($birthday), + 'type' => 'birthday' + ]; + if (DBA::exists('event', $condition)) { + return false; + } + + /* + * Add new birthday event for this person + * + * summary is just a readable placeholder in case the event is shared + * with others. We will replace it during presentation to our $importer + * to contain a sparkle link and perhaps a photo. + */ + $values = [ + 'uid' => $contact['uid'], + 'cid' => $contact['id'], + 'start' => DateTimeFormat::utc($birthday), + 'finish' => DateTimeFormat::utc($birthday . ' + 1 day '), + '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); + + return true; + } }