Skip to content

[3.0] Let the Post event button reach the event form #9456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
albertlast wants to merge 1 commit into from
Closed

[3.0] Let the Post event button reach the event form #9456

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions Sources/Actions/Post.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,12 +780,37 @@ protected function initiateEvent(): void
}

if (!isset(Utils::$context['event']) || !(Utils::$context['event'] instanceof Event)) {
$props = [
'title' => isset($_REQUEST['evtitle']) ? Utils::htmlspecialchars(stripslashes($_REQUEST['evtitle'])) : null,
'location' => isset($_REQUEST['event_location']) ? Utils::htmlspecialchars(stripslashes($_REQUEST['event_location'])) : null,
$props = [];

// Only name the ones the request actually gave. Event::$title and
// Event::$location are typed string and already default to '', so
// handing them a null for "the form has not been filled in yet" is
// a fatal rather than an empty field.
foreach (['title' => 'evtitle', 'location' => 'event_location'] as $prop => $key) {
if (isset($_REQUEST[$key])) {
$props[$prop] = Utils::htmlspecialchars(stripslashes($_REQUEST[$key]));
}
}

// setRequestedStartAndDuration() insists on being handed a date and
// fatals with "invalid_date" when it cannot find one. Nothing
// hands it one when this form is merely being opened: the "Post
// event" button on a topic is a plain link, so there is no post
// data to read. Only ask for the requested values when the request
// actually carries some, which is the case when a failed post is
// redisplayed, and otherwise let the Event constructor default the
// start to now. That is what Calendar::post() does for the
// unlinked version of this same form.
$requested_date_keys = [
'year', 'month', 'day', 'hour', 'minute', 'second',
'start_year', 'start_month', 'start_day', 'start_hour', 'start_minute', 'start_second',
'start_date', 'start_time', 'start_datetime',
];

Event::setRequestedStartAndDuration($props);
if (array_intersect_key($_POST, array_flip($requested_date_keys)) !== []) {
Event::setRequestedStartAndDuration($props);
}

Event::setRequestedRRule($props);
Utils::$context['event'] = new Event(-1, $props);
Event::setRequestedRDatesAndExDates(Utils::$context['event']);
Expand Down