From 8c956ac0c8b1ba55648145b8644af19faaecdd59 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 16 Mar 2018 21:22:19 -0400 Subject: [PATCH 01/14] Add new classes - Add Model\Event class - Add Content\Widget\CalendarExport class --- src/Content/Widget/CalendarExport.php | 78 +++ src/Model/Event.php | 955 ++++++++++++++++++++++++++ 2 files changed, 1033 insertions(+) create mode 100644 src/Content/Widget/CalendarExport.php create mode 100644 src/Model/Event.php diff --git a/src/Content/Widget/CalendarExport.php b/src/Content/Widget/CalendarExport.php new file mode 100644 index 000000000..27a4e4348 --- /dev/null +++ b/src/Content/Widget/CalendarExport.php @@ -0,0 +1,78 @@ +data['user']['uid']; +// // The permission testing is a little bit tricky because we have to respect many cases. +// +// // It's not the private events page (we don't get the $owner_uid for /events). +// if (! local_user() && ! $owner_uid) { +// return; +// } +// +// /* +// * Cal logged in user (test permission at foreign profile page). +// * If the $owner uid is available we know it is part of one of the profile pages (like /cal). +// * So we have to test if if it's the own profile page of the logged in user +// * or a foreign one. For foreign profile pages we need to check if the feature +// * 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::isEnabled($owner_uid, "export_calendar")) { +// return; +// } +// +// /* +// * 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::isEnabled($owner_uid, "export_calendar")) { +// return; +// } + /* + * All the legacy checks above seem to be equivalent to the check below, see https://ethercalc.org/z6ehv1tut9cm + * If there is a mistake in the spreadsheet, please notify @MrPetovan on GitHub or by email mrpetovan@gmail.com + */ + if (!local_user()) { + return; + } + + // $a->data is only available if the profile page is visited. If the visited page is not part + // of the profile page it should be the personal /events page. So we can use $a->user. + $user = defaults($a->data['user'], 'nickname', $a->user['nickname']); + + $tpl = get_markup_template("events_aside.tpl"); + $return = replace_macros($tpl, [ + '$etitle' => L10n::t("Export"), + '$export_ical' => L10n::t("Export calendar as ical"), + '$export_csv' => L10n::t("Export calendar as csv"), + '$user' => $user + ]); + + return $return; + } +} diff --git a/src/Model/Event.php b/src/Model/Event.php new file mode 100644 index 000000000..9c35e34e4 --- /dev/null +++ b/src/Model/Event.php @@ -0,0 +1,955 @@ +" . BBCode::convert($event['summary'], false, $simple) . ""; + + $o .= "
" . BBCode::convert($event['desc'], false, $simple) . "
"; + + $o .= "

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

" . $event_start . "

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

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

" . $event_end . "

"; + } + + if (strlen($event['location'])) { + $o .= "

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

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

"; + } + + return $o; + } + + $o = '
' . "\r\n"; + + $o .= '
' . BBCode::convert($event['summary'], false, $simple) . '
' . "\r\n"; + + $o .= '
' . L10n::t('Starts:') . ' ' . $event_start + . '
' . "\r\n"; + + if (!$event['nofinish']) { + $o .= '
' . L10n::t('Finishes:') . ' ' . $event_end + . '
' . "\r\n"; + } + + $o .= '
' . BBCode::convert($event['desc'], false, $simple) . '
' . "\r\n"; + + if (strlen($event['location'])) { + $o .= '
' . L10n::t('Location:') . ' ' + . BBCode::convert($event['location'], false, $simple) + . '
' . "\r\n"; + + // Include a map of the location if the [map] BBCode is used. + if (strpos($event['location'], "[map") !== false) { + $map = Map::byLocation($event['location'], $simple); + if ($map !== $event['location']) { + $o .= $map; + } + } + } + + $o .= '
' . "\r\n"; + return $o; + } + + /** + * @brief 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. + */ + public static function getBBCode(array $event) + { + $o = ''; + + if ($event['summary']) { + $o .= '[event-summary]' . $event['summary'] . '[/event-summary]'; + } + + if ($event['desc']) { + $o .= '[event-description]' . $event['desc'] . '[/event-description]'; + } + + if ($event['start']) { + $o .= '[event-start]' . $event['start'] . '[/event-start]'; + } + + if (($event['finish']) && (!$event['nofinish'])) { + $o .= '[event-finish]' . $event['finish'] . '[/event-finish]'; + } + + if ($event['location']) { + $o .= '[event-location]' . $event['location'] . '[/event-location]'; + } + + if ($event['adjust']) { + $o .= '[event-adjust]' . $event['adjust'] . '[/event-adjust]'; + } + + return $o; + } + + /** + * @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. + */ + public static function fromBBCode($text) + { + $ev = []; + + $match = ''; + if (preg_match("/\[event\-summary\](.*?)\[\/event\-summary\]/is", $text, $match)) { + $ev['summary'] = $match[1]; + } + + $match = ''; + if (preg_match("/\[event\-description\](.*?)\[\/event\-description\]/is", $text, $match)) { + $ev['desc'] = $match[1]; + } + + $match = ''; + if (preg_match("/\[event\-start\](.*?)\[\/event\-start\]/is", $text, $match)) { + $ev['start'] = $match[1]; + } + + $match = ''; + if (preg_match("/\[event\-finish\](.*?)\[\/event\-finish\]/is", $text, $match)) { + $ev['finish'] = $match[1]; + } + + $match = ''; + if (preg_match("/\[event\-location\](.*?)\[\/event\-location\]/is", $text, $match)) { + $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; + } + + public static function sortByDate($event_list) + { + usort($event_list, ['self', 'compareDatesCallback']); + return $event_list; + } + + 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']); + + if ($date_a === $date_b) { + return strcasecmp($event_a['desc'], $event_b['desc']); + } + + return strcmp($date_a, $date_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 + */ + public static function delete($event_id) + { + if ($event_id == 0) { + return; + } + + 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 $event Array with event data. + * @return int The event id. + */ + public static function store($arr) + { + $a = self::getApp(); + + $event['uri'] = defaults($arr, 'uri' , item_new_uri($a->get_hostname(), $event['uid'])); + $event['id'] = intval(defaults($arr, 'id' , 0)); + $event['uid'] = intval(defaults($arr, 'uid' , 0)); + $event['cid'] = intval(defaults($arr, 'cid' , 0)); + $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['private'] = intval(defaults($arr, 'private' , 0)); + $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' , NULL_DATE)); + $event['finish'] = DateTimeFormat::utc(defaults($arr, 'finish' , NULL_DATE)); + if ($event['finish'] < NULL_DATE) { + $event['finish'] = NULL_DATE; + } + + $condition = ['uid' => $event['uid']]; + if ($event['cid']) { + $condition['id'] = $event['cid']; + } + + $contact = dba::selectFirst('contact', [], ['id' => $event['cid'], 'uid' => $event['uid']]); + + // 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 ((! DBM::is_result($existing_event)) || ($existing_event['edited'] === $event['edited'])) { + + $item = dba::selectFirst('item', [], ['event-id' => $event['id'], 'uid' => $event['uid']]); + + return DBM::is_result($item) ? $item['id'] : 0; + } + + $updated_fields = [ + 'edited' => $event['edited'], + 'start' => $event['start'], + 'finish' => $event['finish'], + 'summary' => $event['summary'], + 'desc' => $event['desc'], + 'location' => $event['location'], + 'type' => $event['type'], + 'adjust' => $event['adjust'], + 'nofinish' => $event['nofinish'], + ]; + + dba::update('event', $updated_fields, ['id' => $event['cid'], 'uid' => $event['uid']]); + + $item = dba::selectFirst('item', ['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]); + if (DBM::is_result($item)) { + $object = '' . xmlify(ACTIVITY_OBJ_EVENT) . '' . xmlify($event['uri']) . ''; + $object .= '' . xmlify(format_event_bbcode($event)) . ''; + $object .= '' . "\n"; + + $fields = ['body' => format_event_bbcode($event), 'object' => $object, 'edited' => $event['edited']]; + Item::update($fields, ['id' => $item['id']]); + + $item_id = $item['id']; + } else { + $item_id = 0; + } + + Addon::callHooks('event_updated', $event['id']); + } else { + $event['guid'] = get_guid(32); + + // 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['type'] = 'activity'; + $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'] = $event['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'] = format_event_bbcode($event); + $item_arr['event-id'] = $event['id']; + + $item_arr['object'] = '' . xmlify(ACTIVITY_OBJ_EVENT) . '' . xmlify($event['uri']) . ''; + $item_arr['object'] .= '' . xmlify(format_event_bbcode($event)) . ''; + $item_arr['object'] .= '' . "\n"; + + $item_id = Item::insert($item_arr); + + Addon::callHooks("event_created", $event['id']); + } + + return $item_id; + } + + /** + * @brief Create an array with translation strings used for events. + * + * @return array Array with translations strings. + */ + public static function getStrings() + { + // First day of the week (0 = Sunday). + $firstDay = 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:") + ]; + + return $i18n; + } + + /** + * @brief Removes duplicated birthday events. + * + * @param array $dates Array of possibly duplicated events. + * @return array Cleaned events. + * + * @todo We should replace this with a separate update function if there is some time left. + */ + public static function removeDuplicates(array $dates) + { + $dates2 = []; + + foreach ($dates as $date) { + if ($date['type'] == 'birthday') { + $dates2[$date['uid'] . "-" . $date['cid'] . "-" . $date['start']] = $date; + } else { + $dates2[] = $date; + } + } + return array_values($dates2); + } + + /** + * @brief 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 + */ + public static function getListById($owner_uid, $event_id, $sql_extra = '') + { + $return = []; + + // Ownly allow events if there is a valid owner_id. + if ($owner_uid == 0) { + return $return; + } + + // Query for the event by event id + $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`, + `item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event` + LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid` + WHERE `event`.`uid` = %d AND `event`.`id` = %d $sql_extra", + intval($owner_uid), + intval($event_id) + ); + + if (DBM::is_result($r)) { + $return = event_remove_duplicates($r); + } + + return $return; + } + + /** + * @brief 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 string $sql_extra Additional sql conditions (e.g. permission request). + * + * @return array Query results. + */ + public static function getListByDate($owner_uid, $event_params, $sql_extra = '') + { + $return = []; + + // Only allow events if there is a valid owner_id. + if ($owner_uid == 0) { + return $return; + } + + // Query for the event by date. + $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`, + `item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event` + LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid` + WHERE `event`.`uid` = %d AND event.ignore = %d + AND ((`adjust` = 0 AND (`finish` >= '%s' OR (nofinish AND start >= '%s')) AND `start` <= '%s') + OR (`adjust` = 1 AND (`finish` >= '%s' OR (nofinish AND start >= '%s')) AND `start` <= '%s')) + $sql_extra ", + intval($owner_uid), + intval($event_params["ignore"]), + dbesc($event_params["start"]), + dbesc($event_params["start"]), + dbesc($event_params["finish"]), + dbesc($event_params["adjust_start"]), + dbesc($event_params["adjust_start"]), + dbesc($event_params["adjust_finish"]) + ); + + if (DBM::is_result($r)) { + $return = event_remove_duplicates($r); + } + + return $return; + } + + /** + * @brief 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. + */ + public static function prepareListForTemplate(array $event_result) + { + $event_list = []; + + $last_date = ''; + $fmt = L10n::t('l, F j'); + foreach ($event_result as $event) { + $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); + + if ($event['nofinish']) { + $end = null; + } else { + $end = $event['adjust'] ? DateTimeFormat::local($event['finish'], 'c') : DateTimeFormat::utc($event['finish'], 'c'); + } + + $is_first = ($day !== $last_date); + + $last_date = $day; + + // 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() == $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') , '', '']; + } + + $title = strip_tags(html_entity_decode(BBCode::convert($event['summary']), ENT_QUOTES, 'UTF-8')); + if (!$title) { + list($title, $_trash) = explode(" $event['id'], + 'start' => $start, + 'end' => $end, + 'allDay' => false, + 'title' => $title, + 'j' => $j, + 'd' => $day, + 'edit' => $edit, + 'drop' => $drop, + 'copy' => $copy, + 'is_first' => $is_first, + 'item' => $event, + 'html' => $html, + 'plink' => [$event['plink'], L10n::t('link to source'), '', ''], + ]; + } + + return $event_list; + } + + /** + * @brief 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). + * + * @return string Content according to selected export format. + * + * @todo Implement timezone support + */ + public static function formatListForExport(array $events, $format, $timezone) + { + if (!count($events)) { + return ''; + } + + 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; + + foreach ($events as $event) { + /// @todo The time / date entries don't include any information about the + /// timezone the event is scheduled in :-/ + $tmp1 = strtotime($event['start']); + $tmp2 = strtotime($event['finish']); + $time_format = "%H:%M:%S"; + $date_format = "%Y-%m-%d"; + + $o .= '"' . $event['summary'] . '", "' . strftime($date_format, $tmp1) . + '", "' . strftime($time_format, $tmp1) . '", "' . $event['desc'] . + '", "' . strftime($date_format, $tmp2) . + '", "' . strftime($time_format, $tmp2) . + '", "' . $event['location'] . '"' . PHP_EOL; + } + break; + + // Format the exported data as a ics file. + case "ical": + header("Content-type: text/ics"); + $o = 'BEGIN:VCALENDAR' . PHP_EOL + . 'VERSION:2.0' . PHP_EOL + . 'PRODID:-//friendica calendar export//0.1//EN' . PHP_EOL; + /// @todo include timezone informations in cases were the time is not in UTC + // see http://tools.ietf.org/html/rfc2445#section-4.8.3 + // . 'BEGIN:VTIMEZONE' . PHP_EOL + // . 'TZID:' . $timezone . PHP_EOL + // . 'END:VTIMEZONE' . PHP_EOL; + // TODO instead of PHP_EOL CRLF should be used for long entries + // 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; + } + + if (!$event['nofinish']) { + $tmp = strtotime($event['finish']); + $dtformat = "%Y%m%dT%H%M%S" . $UTC; + $o .= 'DTEND:' . strftime($dtformat, $tmp) . PHP_EOL; + } + + if ($event['summary']) { + $tmp = $event['summary']; + $tmp = str_replace(PHP_EOL, PHP_EOL . ' ', $tmp); + $tmp = addcslashes($tmp, ',;'); + $o .= 'SUMMARY:' . $tmp . PHP_EOL; + } + + if ($event['desc']) { + $tmp = $event['desc']; + $tmp = str_replace(PHP_EOL, PHP_EOL . ' ', $tmp); + $tmp = addcslashes($tmp, ',;'); + $o .= 'DESCRIPTION:' . $tmp . PHP_EOL; + } + + if ($event['location']) { + $tmp = $event['location']; + $tmp = str_replace(PHP_EOL, PHP_EOL . ' ', $tmp); + $tmp = addcslashes($tmp, ',;'); + $o .= 'LOCATION:' . $tmp . PHP_EOL; + } + + $o .= 'END:VEVENT' . PHP_EOL; + $o .= PHP_EOL; + } + + $o .= 'END:VCALENDAR' . PHP_EOL; + break; + } + + return $o; + } + + /** + * @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 they + * will get all of their available events. + * If the user is only a visitor only the public events will + * be available. + * + * @param int $uid The user ID. + * + * @return array Query results. + */ + public static function getListByUserId($uid = 0) + { + $return = []; + + if ($uid == 0) { + return $return; + } + + $fields = ['start', 'finish', 'adjust', 'summary', 'desc', 'location', 'nofinish']; + + $conditions = ['uid' => $uid, 'cid' => 0]; + + // Does the user who requests happen to be the owner of the events + // requested? then show all of your events, otherwise only those that + // don't have limitations set in allow_cid and allow_gid. + if (local_user() != $uid) { + $conditions += ['allow_cid' => '', 'allow_gid' => '']; + } + + $events = dba::select('event', $fields, $conditions); + if (DBM::is_result($events)) { + $return = $events; + } + + return $return; + } + + /** + * + * @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.
+ * + * @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 (DBM::is_result($user)) { + $timezone = $user['timezone']; + } + + // Get all events which are owned by a uid (respects permissions). + $events = events_by_uid($uid); + + // We have the events that are available for the requestor. + // Now format the output according to the requested format. + $res = event_format_export($events, $format, $timezone); + + // If there are results the precess was successfull. + if (!empty($res)) { + $process = true; + } + + // Get the file extension for the format. + switch ($format) { + case "ical": + $file_ext = "ics"; + break; + + case "csv": + $file_ext = "csv"; + break; + + default: + $file_ext = ""; + } + + $return = [ + 'success' => $process, + 'format' => $format, + 'extension' => $file_ext, + 'content' => $res, + ]; + + return $return; + } + + /** + * @brief Format an item array with event data to HTML. + * + * @param arr $item Array with item and event data. + * @return string HTML output. + */ + public static function getItemHTML($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. + + // Convert the time to different formats. + $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 = 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'] ? + 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 = 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; + } + } + + // Format the event location. + $location = event_location2array($item['event-location']); + + // Construct the profile link (magic-auth). + $sp = false; + $profile_link = best_link_url($item, $sp); + + if (!$sp) { + $profile_link = Profile::zrl($profile_link); + } + + $tpl = get_markup_template('event_stream_item.tpl'); + $return = replace_macros($tpl, [ + '$id' => $item['event-id'], + '$title' => prepare_text($item['event-summary']), + '$dtstart_label' => L10n::t('Starts:'), + '$dtstart_title' => $dtstart_title, + '$dtstart_dt' => $dtstart_dt, + '$finish' => $finish, + '$dtend_label' => L10n::t('Finishes:'), + '$dtend_title' => $dtend_title, + '$dtend_dt' => $dtend_dt, + '$month_short' => $month_short, + '$date_short' => $date_short, + '$same_date' => $same_date, + '$start_time' => $start_time, + '$start_short' => $start_short, + '$end_time' => $end_time, + '$end_short' => $end_short, + '$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'), + '$location' => $location + ]); + + return $return; + } + + /** + * @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,
+ * 'address' => The address of the location,
+ * 'coordinates' => Latitude‎ and longitude‎ (e.g. '48.864716,2.349014').
+ */ + public static function locationToArray($s = '') { + if ($s == '') { + return []; + } + + $location = ['name' => $s]; + + // Map tag with location name - e.g. [map]Paris[/map]. + if (strpos($s, '[/map]') !== false) { + $found = preg_match("/\[map\](.*?)\[\/map\]/ism", $s, $match); + if (intval($found) > 0 && array_key_exists(1, $match)) { + $location['address'] = $match[1]; + // Remove the map bbcode from the location name. + $location['name'] = str_replace($match[0], "", $s); + } + // Map tag with coordinates - e.g. [map=48.864716,2.349014]. + } elseif (strpos($s, '[map=') !== false) { + $found = preg_match("/\[map=(.*?)\]/ism", $s, $match); + if (intval($found) > 0 && array_key_exists(1, $match)) { + $location['coordinates'] = $match[1]; + // Remove the map bbcode from the location name. + $location['name'] = str_replace($match[0], "", $s); + } + } + + $location['name'] = prepare_text($location['name']); + + // Construct the map HTML. + if (isset($location['address'])) { + $location['map'] = '
' . Map::byLocation($location['address']) . '
'; + } elseif (isset($location['coordinates'])) { + $location['map'] = '
' . Map::byCoordinates(str_replace('/', ' ', $location['coordinates'])) . '
'; + } + + return $location; + } +} From 5aecc758f9a7b35d06f7c1ebe2d5ed279444deed Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 16 Mar 2018 21:22:40 -0400 Subject: [PATCH 02/14] Replace include/event function content by method calls --- include/event.php | 1026 +-------------------------------------------- 1 file changed, 18 insertions(+), 1008 deletions(-) diff --git a/include/event.php b/include/event.php index 45fa7bcd5..84daf81e7 100644 --- a/include/event.php +++ b/include/event.php @@ -4,1062 +4,72 @@ * @brief functions specific to event handling */ -use Friendica\Content\Feature; -use Friendica\Content\Text\BBCode; -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\DateTimeFormat; -use Friendica\Util\Map; - -require_once 'include/conversation.php'; - function format_event_html($ev, $simple = false) { - if (! ((is_array($ev)) && count($ev))) { - return ''; - } - - $bd_format = L10n::t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM. - - $event_start = day_translate( - $ev['adjust'] ? - DateTimeFormat::local($ev['start'], $bd_format) - : DateTimeFormat::utc($ev['start'], $bd_format) - ); - - $event_end = day_translate( - $ev['adjust'] ? - DateTimeFormat::local($ev['finish'], $bd_format) - : DateTimeFormat::utc($ev['finish'], $bd_format) - ); - - if ($simple) { - $o = "

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

"; - - $o .= "

" . BBCode::convert($ev['desc'], false, $simple) . "

"; - - $o .= "

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

" . $event_start . "

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

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

" . $event_end ."

"; - } - - if (strlen($ev['location'])) { - $o .= "

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

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

"; - } - - return $o; - } - - $o = '
' . "\r\n"; - - $o .= '
' . BBCode::convert($ev['summary'], false, $simple) . '
' . "\r\n"; - - $o .= '
' . L10n::t('Starts:') . ' '.$event_start - . '
' . "\r\n"; - - if (! $ev['nofinish']) { - $o .= '
' . L10n::t('Finishes:') . ' '.$event_end - . '
' . "\r\n"; - } - - $o .= '
' . BBCode::convert($ev['desc'], false, $simple) . '
' . "\r\n"; - - if (strlen($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'], $simple); - if ($map !== $ev['location']) { - $o.= $map; - } - } - } - - $o .= '
' . "\r\n"; - return $o; + return \Friendica\Model\Event::getHTML($ev, $simple); } -/** - * @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. - */ function format_event_bbcode($ev) { - - $o = ''; - - if ($ev['summary']) { - $o .= '[event-summary]' . $ev['summary'] . '[/event-summary]'; - } - - if ($ev['desc']) { - $o .= '[event-description]' . $ev['desc'] . '[/event-description]'; - } - - if ($ev['start']) { - $o .= '[event-start]' . $ev['start'] . '[/event-start]'; - } - - if (($ev['finish']) && (! $ev['nofinish'])) { - $o .= '[event-finish]' . $ev['finish'] . '[/event-finish]'; - } - - if ($ev['location']) { - $o .= '[event-location]' . $ev['location'] . '[/event-location]'; - } - - if ($ev['adjust']) { - $o .= '[event-adjust]' . $ev['adjust'] . '[/event-adjust]'; - } - - return $o; + return \Friendica\Model\Event::getBBCode($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. - */ -function bbtovcal($s) { - $o = ''; - $ev = bbtoevent($s); - - if ($ev['desc']) { - $o = format_event_html($ev); - } - - return $o; -} - -/** - * @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 = []; - - $match = ''; - if (preg_match("/\[event\-summary\](.*?)\[\/event\-summary\]/is", $s, $match)) { - $ev['summary'] = $match[1]; - } - - $match = ''; - if (preg_match("/\[event\-description\](.*?)\[\/event\-description\]/is", $s, $match)) { - $ev['desc'] = $match[1]; - } - - $match = ''; - if (preg_match("/\[event\-start\](.*?)\[\/event\-start\]/is", $s, $match)) { - $ev['start'] = $match[1]; - } - - $match = ''; - if (preg_match("/\[event\-finish\](.*?)\[\/event\-finish\]/is", $s, $match)) { - $ev['finish'] = $match[1]; - } - - $match = ''; - if (preg_match("/\[event\-location\](.*?)\[\/event\-location\]/is", $s, $match)) { - $ev['location'] = $match[1]; - } - - $match = ''; - if (preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is", $s, $match)) { - $ev['adjust'] = $match[1]; - } - - $ev['nofinish'] = (((x($ev, 'start') && $ev['start']) && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0); - - return $ev; + return \Friendica\Model\Event::fromBBCode($s); } function sort_by_date($a) { - - usort($a,'ev_compare'); - return $a; + return \Friendica\Model\Event::sortByDate($a); } -function ev_compare($a,$b) { - - $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']); - } - - return strcmp($date_a, $date_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 - */ function event_delete($event_id) { - if ($event_id == 0) { - return; - } - - dba::delete('event', ['id' => $event_id]); - logger("Deleted event ".$event_id, LOGGER_DEBUG); + \Friendica\Model\Event::delete($event_id); } -/** - * @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. - */ function event_store($arr) { - - require_once 'include/items.php'; - - $a = get_app(); - - $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']), - intval($arr['uid']) - ); - } else { - $c = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", - intval($arr['uid']) - ); - } - - if (DBM::is_result($c)) { - $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']) - ); - 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']) - ); - return ((DBM::is_result($r)) ? $r[0]['id'] : 0); - } - - // The event changed. Update it. - q("UPDATE `event` SET - `edited` = '%s', - `start` = '%s', - `finish` = '%s', - `summary` = '%s', - `desc` = '%s', - `location` = '%s', - `type` = '%s', - `adjust` = %d, - `nofinish` = %d - WHERE `id` = %d AND `uid` = %d", - - dbesc($arr['edited']), - dbesc($arr['start']), - dbesc($arr['finish']), - dbesc($arr['summary']), - dbesc($arr['desc']), - dbesc($arr['location']), - dbesc($arr['type']), - intval($arr['adjust']), - intval($arr['nofinish']), - 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']) - ); - if (DBM::is_result($r)) { - $object = '' . xmlify(ACTIVITY_OBJ_EVENT) . '' . xmlify($arr['uri']) . ''; - $object .= '' . xmlify(format_event_bbcode($arr)) . ''; - $object .= '' . "\n"; - - $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; - } - - Addon::callHooks("event_updated", $arr['id']); - - return $item_id; - } else { - // New event. Store it. - 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']), - intval($arr['cid']), - dbesc($arr['guid']), - dbesc($arr['uri']), - dbesc($arr['created']), - dbesc($arr['edited']), - dbesc($arr['start']), - dbesc($arr['finish']), - dbesc($arr['summary']), - dbesc($arr['desc']), - dbesc($arr['location']), - dbesc($arr['type']), - intval($arr['adjust']), - intval($arr['nofinish']), - dbesc($arr['allow_cid']), - dbesc($arr['allow_gid']), - dbesc($arr['deny_cid']), - dbesc($arr['deny_gid']) - ); - - $r = q("SELECT * FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", - dbesc($arr['uri']), - intval($arr['uid']) - ); - if (DBM::is_result($r)) { - $event = $r[0]; - } - - $item_arr = []; - - $item_arr['uid'] = $arr['uid']; - $item_arr['contact-id'] = $arr['cid']; - $item_arr['uri'] = $arr['uri']; - $item_arr['parent-uri'] = $arr['uri']; - $item_arr['guid'] = $arr['guid']; - $item_arr['type'] = 'activity'; - $item_arr['wall'] = (($arr['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'] = $arr['allow_cid']; - $item_arr['allow_gid'] = $arr['allow_gid']; - $item_arr['deny_cid'] = $arr['deny_cid']; - $item_arr['deny_gid'] = $arr['deny_gid']; - $item_arr['private'] = $arr['private']; - $item_arr['visible'] = 1; - $item_arr['verb'] = ACTIVITY_POST; - $item_arr['object-type'] = ACTIVITY_OBJ_EVENT; - $item_arr['origin'] = ((intval($arr['cid']) == 0) ? 1 : 0); - $item_arr['body'] = format_event_bbcode($event); - - - $item_arr['object'] = '' . xmlify(ACTIVITY_OBJ_EVENT) . '' . xmlify($arr['uri']) . ''; - $item_arr['object'] .= '' . xmlify(format_event_bbcode($event)) . ''; - $item_arr['object'] .= '' . "\n"; - - $item_id = Item::insert($item_arr); - if ($item_id) { - Item::update(['event-id' => $event['id']], ['id' => $item_id]); - } - - Addon::callHooks("event_created", $event['id']); - - return $item_id; - } + return \Friendica\Model\Event::store($arr); } -/** - * @brief Create an array with translation strings used for events. - * - * @return array Array with translations strings. - */ function get_event_strings() { - - // First day of the week (0 = Sunday). - $firstDay = 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:") - ]; - - return $i18n; + return \Friendica\Model\Event::getStrings(); } -/** - * @brief Removes duplicated birthday events. - * - * @param array $dates Array of possibly duplicated events. - * @return array Cleaned events. - * - * @todo We should replace this with a separate update function if there is some time left. - */ function event_remove_duplicates($dates) { - $dates2 = []; - - foreach ($dates as $date) { - if ($date['type'] == 'birthday') { - $dates2[$date['uid'] . "-" . $date['cid'] . "-" . $date['start']] = $date; - } else { - $dates2[] = $date; - } - } - return $dates2; + return \Friendica\Model\Event::removeDuplicates($dates); } -/** - * @brief Get an event by its event ID. - * - * @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 = '') { - // Ownly allow events if there is a valid owner_id. - if ($owner_uid == 0) { - return; - } - - // Query for the event by event id - $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`, - `item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event` - LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid` - WHERE `event`.`uid` = %d AND `event`.`id` = %d $sql_extra", - intval($owner_uid), - intval($event_params["event_id"]) - ); - - if (DBM::is_result($r)) { - return event_remove_duplicates($r); - } + return \Friendica\Model\Event::getListById($owner_uid, $event_params['event-id'], $sql_extra); } -/** - * @brief Get all events in a specific timeframe. - * - * @param int $owner_uid The User ID of the owner of the events. - * @param array $event_params An assoziative array with - * int 'ignored' =>
- * string 'start' => Start time of the timeframe.
- * string 'finish' => Finish time of the timeframe.
- * string 'adjust_start' =>
- * 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 = '') { - // Only allow events if there is a valid owner_id. - if ($owner_uid == 0) { - return; - } - - // Query for the event by date. - $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`, - `item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event` - LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid` - WHERE `event`.`uid` = %d AND event.ignore = %d - AND ((`adjust` = 0 AND (`finish` >= '%s' OR (nofinish AND start >= '%s')) AND `start` <= '%s') - OR (`adjust` = 1 AND (`finish` >= '%s' OR (nofinish AND start >= '%s')) AND `start` <= '%s')) - $sql_extra ", - intval($owner_uid), - intval($event_params["ignored"]), - dbesc($event_params["start"]), - dbesc($event_params["start"]), - dbesc($event_params["finish"]), - dbesc($event_params["adjust_start"]), - dbesc($event_params["adjust_start"]), - dbesc($event_params["adjust_finish"]) - ); - - if (DBM::is_result($r)) { - return event_remove_duplicates($r); - } + $event_params['ignore'] = $event_params['ignored']; + return \Friendica\Model\Event::getListByDate($owner_uid, $event_params, $sql_extra); } -/** - * @brief Convert an array query results in an arry which could be used by the events template. - * - * @param array $arr Event query array. - * @return array Event array for the template. - */ function process_events($arr) { - $events=[]; - - $last_date = ''; - $fmt = L10n::t('l, F j'); - if (count($arr)) { - foreach ($arr as $rr) { - $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']) ? DateTimeFormat::local($rr['start'], 'c') : DateTimeFormat::utc($rr['start'], 'c')); - if ($rr['nofinish']) { - $end = null; - } else { - $end = (($rr['adjust']) ? DateTimeFormat::local($rr['finish'], 'c') : DateTimeFormat::utc($rr['finish'], 'c')); - } - - $is_first = ($d !== $last_date); - - $last_date = $d; - - // 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']) ? [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::convert($rr['summary']), ENT_QUOTES, 'UTF-8')); - if (! $title) { - list($title, $_trash) = explode(" $rr['id'], - 'start' => $start, - 'end' => $end, - 'allDay' => false, - 'title' => $title, - - 'j' => $j, - 'd' => $d, - 'edit' => $edit, - 'drop' => $drop, - 'copy' => $copy, - 'is_first' => $is_first, - 'item' => $rr, - 'html' => $html, - 'plink' => [$rr['plink'], L10n::t('link to source'), '', ''], - ]; - } - } - - return $events; + return \Friendica\Model\Event::prepareListForTemplate($arr); } -/** - * @brief 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). - * - * @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))) { - return; - } - - 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; - - foreach ($events as $event) { - /// @todo The time / date entries don't include any information about the - /// timezone the event is scheduled in :-/ - $tmp1 = strtotime($event['start']); - $tmp2 = strtotime($event['finish']); - $time_format = "%H:%M:%S"; - $date_format = "%Y-%m-%d"; - - $o .= '"' . $event['summary'] . '", "' . strftime($date_format, $tmp1) . - '", "' . strftime($time_format, $tmp1) . '", "' . $event['desc'] . - '", "' . strftime($date_format, $tmp2) . - '", "' . strftime($time_format, $tmp2) . - '", "' . $event['location'] . '"' . PHP_EOL; - } - break; - - // Format the exported data as a ics file. - case "ical": - header("Content-type: text/ics"); - $o = 'BEGIN:VCALENDAR' . PHP_EOL - . 'VERSION:2.0' . PHP_EOL - . 'PRODID:-//friendica calendar export//0.1//EN' . PHP_EOL; - /// @todo include timezone informations in cases were the time is not in UTC - // see http://tools.ietf.org/html/rfc2445#section-4.8.3 - // . 'BEGIN:VTIMEZONE' . PHP_EOL - // . 'TZID:' . $timezone . PHP_EOL - // . 'END:VTIMEZONE' . PHP_EOL; - // TODO instead of PHP_EOL CRLF should be used for long entries - // 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; - } - - if (!$event['nofinish']) { - $tmp = strtotime($event['finish']); - $dtformat = "%Y%m%dT%H%M%S" . $UTC; - $o .= 'DTEND:' . strftime($dtformat, $tmp) . PHP_EOL; - } - - if ($event['summary']) { - $tmp = $event['summary']; - $tmp = str_replace(PHP_EOL, PHP_EOL . ' ', $tmp); - $tmp = addcslashes($tmp, ',;'); - $o .= 'SUMMARY:' . $tmp . PHP_EOL; - } - - if ($event['desc']) { - $tmp = $event['desc']; - $tmp = str_replace(PHP_EOL, PHP_EOL . ' ', $tmp); - $tmp = addcslashes($tmp, ',;'); - $o .= 'DESCRIPTION:' . $tmp . PHP_EOL; - } - - if ($event['location']) { - $tmp = $event['location']; - $tmp = str_replace(PHP_EOL, PHP_EOL . ' ', $tmp); - $tmp = addcslashes($tmp, ',;'); - $o .= 'LOCATION:' . $tmp . PHP_EOL; - } - - $o .= 'END:VEVENT' . PHP_EOL; - $o .= PHP_EOL; - } - - $o .= 'END:VCALENDAR' . PHP_EOL; - break; - } - - return $o; + return \Friendica\Model\Event::formatListForExport($events, $format, $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. - * If the user is only a visitor only the public events will - * be available. - * - * @param int $uid The user ID. - * @param int $sql_extra Additional sql conditions for permission. - * - * @return array Query results. - */ function events_by_uid($uid = 0, $sql_extra = '') { - if ($uid == 0) { - return; - } - - // The permission condition if no condition was transmitted. - if ($sql_extra == '') { - $sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' "; - } - - // Does the user who requests happen to be the owner of the events - // requested? then show all of your events, otherwise only those that - // don't have limitations set in allow_cid and allow_gid. - if (local_user() == $uid) { - $r = q("SELECT `start`, `finish`, `adjust`, `summary`, `desc`, `location`, `nofinish` - FROM `event` WHERE `uid`= %d AND `cid` = 0 ", - intval($uid) - ); - } else { - $r = q("SELECT `start`, `finish`, `adjust`, `summary`, `desc`, `location`, `nofinish` - FROM `event` WHERE `uid`= %d AND `cid` = 0 $sql_extra ", - intval($uid) - ); - } - - if (DBM::is_result($r)) { - return $r; - } + return \Friendica\Model\Event::getListByUserId($uid); } -/** - * - * @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.
- * - * @todo Respect authenticated users with events_by_uid(). - */ function event_export($uid, $format = 'ical') { - - $process = false; - - // We are allowed to show events. - // Get the timezone the user is in. - $r = q("SELECT `timezone` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid)); - if (DBM::is_result($r)) { - $timezone = $r[0]['timezone']; - } - - // Get all events which are owned by a uid (respects permissions). - $events = events_by_uid($uid); - - // We have the events that are available for the requestor. - // Now format the output according to the requested format. - if (count($events)) { - $res = event_format_export($events, $format, $timezone); - } - - // If there are results the precess was successfull. - if (x($res)) { - $process = true; - } - - // Get the file extension for the format. - switch ($format) { - case "ical": - $file_ext = "ics"; - break; - - case "csv": - $file_ext = "csv"; - break; - - default: - $file_ext = ""; - } - - $arr = [ - 'success' => $process, - 'format' => $format, - 'extension' => $file_ext, - 'content' => $res, - ]; - - return $arr; + return \Friendica\Model\Event::exportListByUserId($uid, $format); } -/** - * @brief Get the events widget. - * - * @return string Formated html of the evens widget. - */ function widget_events() { - $a = get_app(); - - $owner_uid = $a->data['user']['uid']; - // $a->data is only available if the profile page is visited. If the visited page is not part - // of the profile page it should be the personal /events page. So we can use $a->user. - $user = ($a->data['user']['nickname'] ? $a->data['user']['nickname'] : $a->user['nickname']); - - - // The permission testing is a little bit tricky because we have to respect many cases. - - // It's not the private events page (we don't get the $owner_uid for /events). - if (! local_user() && ! $owner_uid) { - return; - } - - /* - * Cal logged in user (test permission at foreign profile page). - * If the $owner uid is available we know it is part of one of the profile pages (like /cal). - * So we have to test if if it's the own profile page of the logged in user - * or a foreign one. For foreign profile pages we need to check if the feature - * 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::isEnabled($owner_uid, "export_calendar")) { - return; - } - - /* - * 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::isEnabled($owner_uid, "export_calendar")) { - return; - } - - 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 - ]); + return \Friendica\Content\Widget\CalendarExport::getHTML(); } -/** - * @brief Format an item array with event data to HTML. - * - * @param arr $item Array with item and event data. - * @return string HTML output. - */ function format_event_item($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. - - // Convert the time to different formats. - $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 = 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'] ? - 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 = 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; - } - } - - // Format the event location. - $evloc = event_location2array($item['event-location']); - $location = []; - - if (isset($evloc['name'])) { - $location['name'] = prepare_text($evloc['name']); - } - // Construct the map HTML. - if (isset($evloc['address'])) { - $location['map'] = '
' . Map::byLocation($evloc['address']) . '
'; - } elseif (isset($evloc['coordinates'])) { - $location['map'] = '
' . Map::byCoordinates(str_replace('/', ' ', $evloc['coordinates'])) . '
'; - } - - // Construct the profile link (magic-auth). - $sp = false; - $profile_link = best_link_url($item, $sp); - - if (!$sp) { - $profile_link = Profile::zrl($profile_link); - } - - $event = replace_macros(get_markup_template('event_stream_item.tpl'), [ - '$id' => $item['event-id'], - '$title' => prepare_text($item['event-summary']), - '$dtstart_label' => L10n::t('Starts:'), - '$dtstart_title' => $dtstart_title, - '$dtstart_dt' => $dtstart_dt, - '$finish' => $finish, - '$dtend_label' => L10n::t('Finishes:'), - '$dtend_title' => $dtend_title, - '$dtend_dt' => $dtend_dt, - '$month_short' => $month_short, - '$date_short' => $date_short, - '$same_date' => $same_date, - '$start_time' => $start_time, - '$start_short' => $start_short, - '$end_time' => $end_time, - '$end_short' => $end_short, - '$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'), - '$location' => $location - ]); - - return $event; + return \Friendica\Model\Event::getItemHTML($item); } -/** - * @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,
- * 'address' => The address of the location,
- * 'coordinates' => Latitude‎ and longitude‎ (e.g. '48.864716,2.349014').
- */ function event_location2array($s = '') { - if ($s == '') { - return; - } - - $location = ['name' => $s]; - - // Map tag with location name - e.g. [map]Paris[/map]. - if (strpos($s, '[/map]') !== false) { - $found = preg_match("/\[map\](.*?)\[\/map\]/ism", $s, $match); - if (intval($found) > 0 && array_key_exists(1, $match)) { - $location['address'] = $match[1]; - // Remove the map bbcode from the location name. - $location['name'] = str_replace($match[0], "", $s); - } - // Map tag with coordinates - e.g. [map=48.864716,2.349014]. - } elseif (strpos($s, '[map=') !== false) { - $found = preg_match("/\[map=(.*?)\]/ism", $s, $match); - if (intval($found) > 0 && array_key_exists(1, $match)) { - $location['coordinates'] = $match[1]; - // Remove the map bbcode from the location name. - $location['name'] = str_replace($match[0], "", $s); - } - } - - return $location; + return \Friendica\Model\Event::locationToArray($s); } From f7e2071117d46a5dbaf18250e1194aef225facfa Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 16 Mar 2018 21:45:02 -0400 Subject: [PATCH 03/14] Replace include/event function with method calls - Updated scope of Model\Event methods - Updated use list --- include/text.php | 3 ++- mod/cal.php | 28 +++++++++++++++------------- mod/events.php | 32 +++++++++++++++----------------- src/Content/Text/BBCode.php | 5 +++-- src/Model/Event.php | 30 +++++++++++++++--------------- src/Model/Item.php | 4 ++-- src/Protocol/DFRN.php | 6 +++--- 7 files changed, 55 insertions(+), 53 deletions(-) diff --git a/include/text.php b/include/text.php index 9fae74252..fe2b973e5 100644 --- a/include/text.php +++ b/include/text.php @@ -14,6 +14,7 @@ use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Core\System; use Friendica\Database\DBM; +use Friendica\Model\Event; use Friendica\Model\Item; use Friendica\Model\Profile; use Friendica\Render\FriendicaSmarty; @@ -1235,7 +1236,7 @@ function prepare_body(&$item, $attach = false, $preview = false) { // In order to provide theme developers more possibilities, event items // are treated differently. if ($item['object-type'] === ACTIVITY_OBJ_EVENT && isset($item['event-id'])) { - $ev = format_event_item($item); + $ev = Event::getItemHTML($item); return $ev; } diff --git a/mod/cal.php b/mod/cal.php index ae4928bdf..fdcb06a6f 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -9,11 +9,13 @@ use Friendica\App; use Friendica\Content\Feature; use Friendica\Content\Nav; +use Friendica\Content\Widget; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\System; use Friendica\Database\DBM; use Friendica\Model\Contact; +use Friendica\Model\Event; use Friendica\Model\Group; use Friendica\Model\Profile; use Friendica\Protocol\DFRN; @@ -64,7 +66,7 @@ function cal_init(App $a) '$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""), ]); - $cal_widget = widget_events(); + $cal_widget = Widget\CalendarExport::getHTML(); if (!x($a->page, 'aside')) { $a->page['aside'] = ''; @@ -82,7 +84,7 @@ function cal_content(App $a) Nav::setSelected('events'); // get the translation strings for the callendar - $i18n = get_event_strings(); + $i18n = Event::getStrings(); $htpl = get_markup_template('event_head.tpl'); $a->page['htmlhead'] .= replace_macros($htpl, [ @@ -212,25 +214,25 @@ function cal_content(App $a) // put the event parametes in an array so we can better transmit them $event_params = [ - 'event_id' => (x($_GET, 'id') ? $_GET["id"] : 0), - 'start' => $start, - 'finish' => $finish, - 'adjust_start' => $adjust_start, + 'event_id' => intval(defaults($_GET, 'id', 0)), + 'start' => $start, + 'finish' => $finish, + 'adjust_start' => $adjust_start, 'adjust_finish' => $adjust_finish, - 'ignored' => $ignored, + 'ignore' => $ignored, ]; // get events by id or by date - if (x($_GET, 'id')) { - $r = event_by_id($owner_uid, $event_params, $sql_extra); + if ($event_params['event_id']) { + $r = Event::getListById($owner_uid, $event_params['event-id'], $sql_extra); } else { - $r = events_by_date($owner_uid, $event_params, $sql_extra); + $r = Event::getListByDate($owner_uid, $event_params, $sql_extra); } $links = []; if (DBM::is_result($r)) { - $r = sort_by_date($r); + $r = Event::sortByDate($r); foreach ($r as $rr) { $j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j'); if (!x($links, $j)) { @@ -240,7 +242,7 @@ function cal_content(App $a) } // transform the event in a usable array - $events = process_events($r); + $events = Event::prepareListForTemplate($r); if ($a->argv[2] === 'json') { echo json_encode($events); @@ -306,7 +308,7 @@ function cal_content(App $a) } // Get the export data by uid - $evexport = event_export($owner_uid, $format); + $evexport = Event::exportListByUserId($owner_uid, $format); if (!$evexport["success"]) { if ($evexport["content"]) { diff --git a/mod/events.php b/mod/events.php index 8dab59b03..54f4e7952 100644 --- a/mod/events.php +++ b/mod/events.php @@ -6,11 +6,13 @@ use Friendica\App; use Friendica\Content\Nav; +use Friendica\Content\Widget\CalendarExport; use Friendica\Core\ACL; use Friendica\Core\L10n; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBM; +use Friendica\Model\Event; use Friendica\Model\Item; use Friendica\Model\Profile; use Friendica\Util\DateTimeFormat; @@ -31,7 +33,7 @@ function events_init(App $a) { return; } - $cal_widget = widget_events(); + $cal_widget = CalendarExport::getHTML(); if (! x($a->page,'aside')) { $a->page['aside'] = ''; @@ -155,7 +157,6 @@ function events_post(App $a) { $datarray = []; - $datarray['guid'] = get_guid(32); $datarray['start'] = $start; $datarray['finish'] = $finish; $datarray['summary'] = $summary; @@ -172,16 +173,14 @@ function events_post(App $a) { $datarray['deny_gid'] = $str_group_deny; $datarray['private'] = (($private_event) ? 1 : 0); $datarray['id'] = $event_id; - $datarray['created'] = $created; - $datarray['edited'] = $edited; if (intval($_REQUEST['preview'])) { - $html = format_event_html($datarray); + $html = Event::getHTML($datarray); echo $html; killme(); } - $item_id = event_store($datarray); + $item_id = Event::store($datarray); if (! $cid) { Worker::add(PRIORITY_HIGH, "Notifier", "event", $item_id); @@ -222,7 +221,7 @@ function events_content(App $a) { } // get the translation strings for the callendar - $i18n = get_event_strings(); + $i18n = Event::getStrings(); $htpl = get_markup_template('event_head.tpl'); $a->page['htmlhead'] .= replace_macros($htpl, [ @@ -331,25 +330,25 @@ function events_content(App $a) { // put the event parametes in an array so we can better transmit them $event_params = [ - 'event_id' => (x($_GET, 'id') ? $_GET['id'] : 0), + 'event_id' => intval(defaults($_GET, 'id', 0)), 'start' => $start, 'finish' => $finish, 'adjust_start' => $adjust_start, 'adjust_finish' => $adjust_finish, - 'ignored' => $ignored, + 'ignore' => $ignored, ]; // get events by id or by date - if (x($_GET, 'id')) { - $r = event_by_id(local_user(), $event_params); + if ($event_params['event_id']) { + $r = Event::getListById(local_user(), $event_params['event-id']); } else { - $r = events_by_date(local_user(), $event_params); + $r = Event::getListByDate(local_user(), $event_params); } $links = []; if (DBM::is_result($r)) { - $r = sort_by_date($r); + $r = Event::sortByDate($r); foreach ($r as $rr) { $j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j'); if (! x($links,$j)) { @@ -362,8 +361,8 @@ function events_content(App $a) { // transform the event in a usable array if (DBM::is_result($r)) { - $r = sort_by_date($r); - $events = process_events($r); + $r = Event::sortByDate($r); + $events = Event::prepareListForTemplate($r); } if ($a->argc > 1 && $a->argv[1] === 'json'){ @@ -543,8 +542,7 @@ function events_content(App $a) { if ($mode === 'drop' && $event_id) { $del = 0; - $params = ['event_id' => ($event_id)]; - $ev = event_by_id(local_user(), $params); + $ev = Event::getListById(local_user(), $event_id); // Delete only real events (no birthdays) if (DBM::is_result($ev) && $ev[0]['type'] == 'event') { diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index 82c6f4698..b7e420719 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -20,6 +20,7 @@ use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Core\System; use Friendica\Model\Contact; +use Friendica\Model\Event; use Friendica\Network\Probe; use Friendica\Object\Image; use Friendica\Util\Map; @@ -1373,7 +1374,7 @@ class BBCode extends BaseObject // After we're finished processing the bbcode we'll // replace all of the event code with a reformatted version. - $ev = bbtoevent($text); + $ev = Event::fromBBCode($text); // Replace any html brackets with HTML Entities to prevent executing HTML or script // Don't use strip_tags here because it breaks [url] search by replacing & with amp @@ -1811,7 +1812,7 @@ class BBCode extends BaseObject // start which is always required). Allow desc with a missing summary for compatibility. if ((x($ev, 'desc') || x($ev, 'summary')) && x($ev, 'start')) { - $sub = format_event_html($ev, $simple_html); + $sub = Event::getHTML($ev, $simple_html); $text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism", '', $text); $text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/ism", '', $text); diff --git a/src/Model/Event.php b/src/Model/Event.php index 9c35e34e4..a1790edab 100644 --- a/src/Model/Event.php +++ b/src/Model/Event.php @@ -105,7 +105,7 @@ class Event extends BaseObject * @param array $event Array which contains the event data. * @return string The event as a bbcode formatted string. */ - public static function getBBCode(array $event) + private static function getBBCode(array $event) { $o = ''; @@ -289,10 +289,10 @@ class Event extends BaseObject $item = dba::selectFirst('item', ['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]); if (DBM::is_result($item)) { $object = '' . xmlify(ACTIVITY_OBJ_EVENT) . '' . xmlify($event['uri']) . ''; - $object .= '' . xmlify(format_event_bbcode($event)) . ''; + $object .= '' . xmlify(self::getBBCode($event)) . ''; $object .= '' . "\n"; - $fields = ['body' => format_event_bbcode($event), 'object' => $object, 'edited' => $event['edited']]; + $fields = ['body' => self::getBBCode($event), 'object' => $object, 'edited' => $event['edited']]; Item::update($fields, ['id' => $item['id']]); $item_id = $item['id']; @@ -335,11 +335,11 @@ class Event extends BaseObject $item_arr['verb'] = ACTIVITY_POST; $item_arr['object-type'] = ACTIVITY_OBJ_EVENT; $item_arr['origin'] = $event['cid'] === 0 ? 1 : 0; - $item_arr['body'] = format_event_bbcode($event); + $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(format_event_bbcode($event)) . ''; + $item_arr['object'] .= '' . xmlify(self::getBBCode($event)) . ''; $item_arr['object'] .= '' . "\n"; $item_id = Item::insert($item_arr); @@ -429,7 +429,7 @@ class Event extends BaseObject * * @todo We should replace this with a separate update function if there is some time left. */ - public static function removeDuplicates(array $dates) + private static function removeDuplicates(array $dates) { $dates2 = []; @@ -470,7 +470,7 @@ class Event extends BaseObject ); if (DBM::is_result($r)) { - $return = event_remove_duplicates($r); + $return = self::removeDuplicates($r); } return $return; @@ -519,7 +519,7 @@ class Event extends BaseObject ); if (DBM::is_result($r)) { - $return = event_remove_duplicates($r); + $return = self::removeDuplicates($r); } return $return; @@ -570,7 +570,7 @@ class Event extends BaseObject $title = strip_tags(html_entity_decode($title, ENT_QUOTES, 'UTF-8')); } - $html = format_event_html($event); + $html = self::getHTML($event); $event['desc'] = BBCode::convert($event['desc']); $event['location'] = BBCode::convert($event['location']); $event_list[] = [ @@ -605,7 +605,7 @@ class Event extends BaseObject * * @todo Implement timezone support */ - public static function formatListForExport(array $events, $format, $timezone) + private static function formatListForExport(array $events, $format, $timezone) { if (!count($events)) { return ''; @@ -712,7 +712,7 @@ class Event extends BaseObject * * @return array Query results. */ - public static function getListByUserId($uid = 0) + private static function getListByUserId($uid = 0) { $return = []; @@ -761,11 +761,11 @@ class Event extends BaseObject } // Get all events which are owned by a uid (respects permissions). - $events = events_by_uid($uid); + $events = self::getListByUserId($uid); // We have the events that are available for the requestor. // Now format the output according to the requested format. - $res = event_format_export($events, $format, $timezone); + $res = self::formatListForExport($events, $format, $timezone); // If there are results the precess was successfull. if (!empty($res)) { @@ -861,7 +861,7 @@ class Event extends BaseObject } // Format the event location. - $location = event_location2array($item['event-location']); + $location = self::locationToArray($item['event-location']); // Construct the profile link (magic-auth). $sp = false; @@ -916,7 +916,7 @@ class Event extends BaseObject * 'address' => The address of the location,
* 'coordinates' => Latitude‎ and longitude‎ (e.g. '48.864716,2.349014').
*/ - public static function locationToArray($s = '') { + private static function locationToArray($s = '') { if ($s == '') { return []; } diff --git a/src/Model/Item.php b/src/Model/Item.php index efcf05ad6..64ca81a90 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -98,7 +98,7 @@ class Item extends BaseObject * @param integer $item_id Item ID that should be delete * @param integer $priority Priority for the notification * - * @return $boolean success + * @return boolean success */ public static function deleteById($item_id, $priority = PRIORITY_HIGH) { @@ -153,7 +153,7 @@ class Item extends BaseObject // If item is a link to an event, delete the event. if (intval($item['event-id'])) { - event_delete($item['event-id']); + Event::delete($item['event-id']); } // If item has attachments, drop them diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index d1b5183a9..5fda6e6a7 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -19,11 +19,11 @@ use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBM; use Friendica\Model\Contact; +use Friendica\Model\Event; use Friendica\Model\GContact; use Friendica\Model\Group; use Friendica\Model\Item; use Friendica\Model\Profile; -use Friendica\Model\Term; use Friendica\Model\User; use Friendica\Object\Image; use Friendica\Protocol\OStatus; @@ -2614,7 +2614,7 @@ class DFRN // Is it an event? if ($item["object-type"] == ACTIVITY_OBJ_EVENT) { logger("Item ".$item["uri"]." seems to contain an event.", LOGGER_DEBUG); - $ev = bbtoevent($item["body"]); + $ev = Event::fromBBCode($item["body"]); if ((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) { logger("Event in item ".$item["uri"]." was found.", LOGGER_DEBUG); $ev["cid"] = $importer["id"]; @@ -2633,7 +2633,7 @@ class DFRN $ev["id"] = $r[0]["id"]; } - $event_id = event_store($ev); + $event_id = Event::store($ev); logger("Event ".$event_id." was stored", LOGGER_DEBUG); return; } From 6e7c6ab0fa46dc3ab2f35326bc1b2c747377d509 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 16 Mar 2018 21:47:34 -0400 Subject: [PATCH 04/14] Remove references to include/event --- include/text.php | 1 - mod/cal.php | 2 -- mod/dfrn_notify.php | 1 - mod/events.php | 1 - src/Content/Text/BBCode.php | 1 - src/Model/Item.php | 1 - src/Protocol/DFRN.php | 1 - 7 files changed, 8 deletions(-) diff --git a/include/text.php b/include/text.php index fe2b973e5..4efa30891 100644 --- a/include/text.php +++ b/include/text.php @@ -22,7 +22,6 @@ use Friendica\Util\DateTimeFormat; use Friendica\Util\Map; require_once "mod/proxy.php"; -require_once "include/event.php"; require_once "include/conversation.php"; /** diff --git a/mod/cal.php b/mod/cal.php index fdcb06a6f..bf73408f4 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -22,8 +22,6 @@ use Friendica\Protocol\DFRN; use Friendica\Util\DateTimeFormat; use Friendica\Util\Temporal; -require_once 'include/event.php'; - function cal_init(App $a) { if ($a->argc > 1) { diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index db9672906..073226b82 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -14,7 +14,6 @@ use Friendica\Model\Contact; use Friendica\Protocol\DFRN; require_once 'include/items.php'; -require_once 'include/event.php'; function dfrn_notify_post(App $a) { logger(__function__, LOGGER_TRACE); diff --git a/mod/events.php b/mod/events.php index 54f4e7952..60827cac2 100644 --- a/mod/events.php +++ b/mod/events.php @@ -18,7 +18,6 @@ use Friendica\Model\Profile; use Friendica\Util\DateTimeFormat; use Friendica\Util\Temporal; -require_once 'include/event.php'; require_once 'include/items.php'; function events_init(App $a) { diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index b7e420719..ebaef2b29 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -28,7 +28,6 @@ use Friendica\Util\Network; use Friendica\Util\ParseUrl; use League\HTMLToMarkdown\HtmlConverter; -require_once "include/event.php"; require_once "mod/proxy.php"; class BBCode extends BaseObject diff --git a/src/Model/Item.php b/src/Model/Item.php index 64ca81a90..bdb85af44 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -29,7 +29,6 @@ use Text_LanguageDetect; require_once 'boot.php'; require_once 'include/items.php'; require_once 'include/text.php'; -require_once 'include/event.php'; class Item extends BaseObject { diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index 5fda6e6a7..429c5051f 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -41,7 +41,6 @@ require_once 'boot.php'; require_once 'include/dba.php'; require_once "include/enotify.php"; require_once "include/items.php"; -require_once "include/event.php"; require_once "include/text.php"; /** From 4eaf0d76b03209b694bd67ca3eb3abfbfaffb304 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 16 Mar 2018 21:47:48 -0400 Subject: [PATCH 05/14] Remove include/event --- include/event.php | 75 ----------------------------------------------- 1 file changed, 75 deletions(-) delete mode 100644 include/event.php diff --git a/include/event.php b/include/event.php deleted file mode 100644 index 84daf81e7..000000000 --- a/include/event.php +++ /dev/null @@ -1,75 +0,0 @@ - Date: Sat, 17 Mar 2018 00:32:08 -0400 Subject: [PATCH 06/14] Remove private key from event array in Event::store --- mod/events.php | 2 +- src/Model/Event.php | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mod/events.php b/mod/events.php index 60827cac2..22a9b4677 100644 --- a/mod/events.php +++ b/mod/events.php @@ -170,7 +170,7 @@ function events_post(App $a) { $datarray['allow_gid'] = $str_group_allow; $datarray['deny_cid'] = $str_contact_deny; $datarray['deny_gid'] = $str_group_deny; - $datarray['private'] = (($private_event) ? 1 : 0); + $datarray['private'] = $private_event; $datarray['id'] = $event_id; if (intval($_REQUEST['preview'])) { diff --git a/src/Model/Event.php b/src/Model/Event.php index a1790edab..9387a25d6 100644 --- a/src/Model/Event.php +++ b/src/Model/Event.php @@ -223,17 +223,17 @@ class Event extends BaseObject * * Store the event in the event table and create an event item in the item table. * - * @param array $event Array with event data. - * @return int The event id. + * @param array $arr Array with event data. + * @return int The new event id. */ public static function store($arr) { $a = self::getApp(); - $event['uri'] = defaults($arr, 'uri' , item_new_uri($a->get_hostname(), $event['uid'])); $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_new_uri($a->get_hostname(), $event['uid'])); $event['type'] = defaults($arr, 'type' , 'event'); $event['summary'] = defaults($arr, 'summary' , ''); $event['desc'] = defaults($arr, 'desc' , ''); @@ -242,7 +242,6 @@ class Event extends BaseObject $event['allow_gid'] = defaults($arr, 'allow_gid', ''); $event['deny_cid'] = defaults($arr, 'deny_cid' , ''); $event['deny_gid'] = defaults($arr, 'deny_gid' , ''); - $event['private'] = intval(defaults($arr, 'private' , 0)); $event['adjust'] = intval(defaults($arr, 'adjust' , 0)); $event['nofinish'] = intval(defaults($arr, 'nofinish' , !empty($event['start']) && empty($event['finish']))); @@ -253,6 +252,7 @@ class Event extends BaseObject if ($event['finish'] < NULL_DATE) { $event['finish'] = NULL_DATE; } + $private = intval(defaults($arr, 'private', 0)); $condition = ['uid' => $event['uid']]; if ($event['cid']) { @@ -330,7 +330,7 @@ class Event extends BaseObject $item_arr['allow_gid'] = $event['allow_gid']; $item_arr['deny_cid'] = $event['deny_cid']; $item_arr['deny_gid'] = $event['deny_gid']; - $item_arr['private'] = $event['private']; + $item_arr['private'] = $private; $item_arr['visible'] = 1; $item_arr['verb'] = ACTIVITY_POST; $item_arr['object-type'] = ACTIVITY_OBJ_EVENT; From 089f556327688ef7001c0d27a410eb649624e9c8 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 17 Mar 2018 00:32:46 -0400 Subject: [PATCH 07/14] Initialize $event in Event::store --- src/Model/Event.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Model/Event.php b/src/Model/Event.php index 9387a25d6..df6a1fa0e 100644 --- a/src/Model/Event.php +++ b/src/Model/Event.php @@ -230,6 +230,7 @@ class Event extends BaseObject { $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)); From bc12ba68cdad4ba3817f72047b12bd9bf9be3b57 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 17 Mar 2018 10:05:02 -0400 Subject: [PATCH 08/14] Fix wrong parameter check in Event::store --- src/Model/Event.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model/Event.php b/src/Model/Event.php index df6a1fa0e..2626f6449 100644 --- a/src/Model/Event.php +++ b/src/Model/Event.php @@ -29,7 +29,7 @@ class Event extends BaseObject public static function getHTML(array $event, $simple = false) { - if (!is_array($event) || !!count($event)) { + if (empty($event)) { return ''; } From 254974826f0fd139d74ed4fe18304dd7cad6213c Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 17 Mar 2018 10:05:17 -0400 Subject: [PATCH 09/14] Fix wrong contact retrieval condition in Event::store --- src/Model/Event.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Model/Event.php b/src/Model/Event.php index 2626f6449..978dce7cf 100644 --- a/src/Model/Event.php +++ b/src/Model/Event.php @@ -255,12 +255,14 @@ class Event extends BaseObject } $private = intval(defaults($arr, 'private', 0)); - $condition = ['uid' => $event['uid']]; + $conditions = ['uid' => $event['uid']]; if ($event['cid']) { - $condition['id'] = $event['cid']; + $conditions['id'] = $event['cid']; + } else { + $conditions['self'] = true; } - $contact = dba::selectFirst('contact', [], ['id' => $event['cid'], 'uid' => $event['uid']]); + $contact = dba::selectFirst('contact', [], $conditions); // Existing event being modified. if ($event['id']) { From 72b552895ec63276d29fb861c2ae2d0eebbbcff0 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 17 Mar 2018 16:42:28 -0400 Subject: [PATCH 10/14] Restore missing permission check in Widget\CalendarExport --- src/Content/Widget/CalendarExport.php | 43 ++++++++------------------- 1 file changed, 13 insertions(+), 30 deletions(-) diff --git a/src/Content/Widget/CalendarExport.php b/src/Content/Widget/CalendarExport.php index 27a4e4348..87b8c14da 100644 --- a/src/Content/Widget/CalendarExport.php +++ b/src/Content/Widget/CalendarExport.php @@ -6,6 +6,7 @@ namespace Friendica\Content\Widget; +use Friendica\Content\Feature; use Friendica\Core\L10n; require_once 'boot.php'; @@ -26,38 +27,20 @@ class CalendarExport public static function getHTML() { $a = get_app(); -// $owner_uid = $a->data['user']['uid']; -// // The permission testing is a little bit tricky because we have to respect many cases. -// -// // It's not the private events page (we don't get the $owner_uid for /events). -// if (! local_user() && ! $owner_uid) { -// return; -// } -// -// /* -// * Cal logged in user (test permission at foreign profile page). -// * If the $owner uid is available we know it is part of one of the profile pages (like /cal). -// * So we have to test if if it's the own profile page of the logged in user -// * or a foreign one. For foreign profile pages we need to check if the feature -// * 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::isEnabled($owner_uid, "export_calendar")) { -// return; -// } -// -// /* -// * 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::isEnabled($owner_uid, "export_calendar")) { -// return; -// } + $owner_uid = $a->data['user']['uid']; + + // The permission testing is a little bit tricky because we have to respect many cases. + + // It's not the private events page (we don't get the $owner_uid for /events). + if (!local_user() && !$owner_uid) { + return; + } + /* - * All the legacy checks above seem to be equivalent to the check below, see https://ethercalc.org/z6ehv1tut9cm - * If there is a mistake in the spreadsheet, please notify @MrPetovan on GitHub or by email mrpetovan@gmail.com + * 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 (!local_user()) { + if (!local_user() && $owner_uid && !Feature::isEnabled($owner_uid, 'export_calendar')) { return; } From 95792f6b79b31e05f314421b06191ac64c3dbd13 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 17 Mar 2018 16:43:15 -0400 Subject: [PATCH 11/14] Fix typo in mod/events - Add todo in Model\Event --- mod/events.php | 4 ++-- src/Model/Event.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mod/events.php b/mod/events.php index 22a9b4677..5f6a589d2 100644 --- a/mod/events.php +++ b/mod/events.php @@ -339,7 +339,7 @@ function events_content(App $a) { // get events by id or by date if ($event_params['event_id']) { - $r = Event::getListById(local_user(), $event_params['event-id']); + $r = Event::getListById(local_user(), $event_params['event_id']); } else { $r = Event::getListByDate(local_user(), $event_params); } @@ -370,7 +370,7 @@ function events_content(App $a) { } if (x($_GET, 'id')) { - $tpl = get_markup_template("event.tpl"); + $tpl = get_markup_template("event.tpl"); } else { $tpl = get_markup_template("events_js.tpl"); } diff --git a/src/Model/Event.php b/src/Model/Event.php index 978dce7cf..87c8b239b 100644 --- a/src/Model/Event.php +++ b/src/Model/Event.php @@ -504,6 +504,7 @@ class Event extends BaseObject } // Query for the event by date. + // @todo Slow query (518 seconds to run), to be optimzed $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`, `item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event` LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid` From d36bc29ce97927d87b594b7296f8bc3a1eaa2a10 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 18 Mar 2018 01:23:38 -0400 Subject: [PATCH 12/14] Finally fix the permissions for Widget\CalendarExport --- src/Content/Widget/CalendarExport.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Content/Widget/CalendarExport.php b/src/Content/Widget/CalendarExport.php index 87b8c14da..2129cd515 100644 --- a/src/Content/Widget/CalendarExport.php +++ b/src/Content/Widget/CalendarExport.php @@ -37,10 +37,14 @@ class CalendarExport } /* - * If it's a kind of profile page (intval($owner_uid)) return if the user not logged in and - * export feature isn't enabled. + * Cal logged in user (test permission at foreign profile page). + * If the $owner uid is available we know it is part of one of the profile pages (like /cal). + * So we have to test if if it's the own profile page of the logged in user + * or a foreign one. For foreign profile pages we need to check if the feature + * 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 (!local_user() && $owner_uid && !Feature::isEnabled($owner_uid, 'export_calendar')) { + if (local_user() != $owner_uid && !Feature::isEnabled($owner_uid, "export_calendar")) { return; } From c5cd5694473c1d95f9fe9ae2fa527f12cee5c4f2 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 18 Mar 2018 01:32:43 -0400 Subject: [PATCH 13/14] Restore previous permission comment in Widget\CalendarExport --- src/Content/Widget/CalendarExport.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Content/Widget/CalendarExport.php b/src/Content/Widget/CalendarExport.php index 2129cd515..0e85e16c4 100644 --- a/src/Content/Widget/CalendarExport.php +++ b/src/Content/Widget/CalendarExport.php @@ -36,6 +36,10 @@ class CalendarExport return; } + /* + * If it's a kind of profile page (intval($owner_uid)) return if the user not logged in and + * export feature isn't enabled. + */ /* * Cal logged in user (test permission at foreign profile page). * If the $owner uid is available we know it is part of one of the profile pages (like /cal). From a7c48f40b75535e37be6bfcf7802fd43167cdbe4 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 19 Mar 2018 09:09:07 -0400 Subject: [PATCH 14/14] Enable CalendarExport widget on /events --- mod/events.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/mod/events.php b/mod/events.php index 5f6a589d2..cad440f16 100644 --- a/mod/events.php +++ b/mod/events.php @@ -25,22 +25,22 @@ function events_init(App $a) { return; } - if ($a->argc > 1) { - // If it's a json request abort here because we don't - // need the widget data - if ($a->argv[1] === 'json') { - return; - } - - $cal_widget = CalendarExport::getHTML(); - - if (! x($a->page,'aside')) { - $a->page['aside'] = ''; - } - - $a->page['aside'] .= $cal_widget; + // If it's a json request abort here because we don't + // need the widget data + if ($a->argc > 1 && $a->argv[1] === 'json') { + return; } + if (empty($a->page['aside'])) { + $a->page['aside'] = ''; + } + + $a->data['user'] = $_SESSION['user']; + + $cal_widget = CalendarExport::getHTML(); + + $a->page['aside'] .= $cal_widget; + return; }