X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fevents.php;h=437cc160b44493b3b6a0aac0808a35d36888a6e8;hb=5ce13b210ee83a3ee3622d2106589b9c2c4c876a;hp=91474022fcdc6277d9afa99e7f0438e9abd6333f;hpb=3b50e94a1abbd219357716d919acbc7ea132ba01;p=friendica.git diff --git a/mod/events.php b/mod/events.php index 91474022fc..437cc160b4 100644 --- a/mod/events.php +++ b/mod/events.php @@ -1,26 +1,47 @@ . + * + * The events module */ 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\Logger; +use Friendica\Core\Renderer; +use Friendica\Core\Theme; use Friendica\Core\Worker; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Event; use Friendica\Model\Item; -use Friendica\Model\Profile; +use Friendica\Model\User; +use Friendica\Module\BaseProfile; +use Friendica\Module\Security\Login; use Friendica\Util\DateTimeFormat; +use Friendica\Util\Strings; use Friendica\Util\Temporal; +use Friendica\Worker\Delivery; -require_once 'include/items.php'; - -function events_init(App $a) { +function events_init(App $a) +{ if (!local_user()) { return; } @@ -31,40 +52,41 @@ function events_init(App $a) { return; } - if (empty($a->page['aside'])) { - $a->page['aside'] = ''; + if (empty(DI::page()['aside'])) { + DI::page()['aside'] = ''; } $cal_widget = CalendarExport::getHTML(); - $a->page['aside'] .= $cal_widget; + DI::page()['aside'] .= $cal_widget; return; } -function events_post(App $a) { +function events_post(App $a) +{ - logger('post: ' . print_r($_REQUEST, true), LOGGER_DATA); + Logger::debug('post', ['request' => $_REQUEST]); if (!local_user()) { return; } - $event_id = (x($_POST, 'event_id') ? intval($_POST['event_id']) : 0); - $cid = (x($_POST, 'cid') ? intval($_POST['cid']) : 0); + $event_id = !empty($_POST['event_id']) ? intval($_POST['event_id']) : 0; + $cid = !empty($_POST['cid']) ? intval($_POST['cid']) : 0; $uid = local_user(); - $start_text = escape_tags($_REQUEST['start_text']); - $finish_text = escape_tags($_REQUEST['finish_text']); + $start_text = Strings::escapeHtml($_REQUEST['start_text'] ?? ''); + $finish_text = Strings::escapeHtml($_REQUEST['finish_text'] ?? ''); - $adjust = intval($_POST['adjust']); - $nofinish = intval($_POST['nofinish']); + $adjust = intval($_POST['adjust'] ?? 0); + $nofinish = intval($_POST['nofinish'] ?? 0); // The default setting for the `private` field in event_store() is false, so mirror that $private_event = false; - $start = NULL_DATE; - $finish = NULL_DATE; + $start = DBA::NULL_DATETIME; + $finish = DBA::NULL_DATETIME; if ($start_text) { $start = $start_text; @@ -91,33 +113,43 @@ function events_post(App $a) { // and we'll waste a bunch of time responding to it. Time that // could've been spent doing something else. - $summary = escape_tags(trim($_POST['summary'])); - $desc = escape_tags(trim($_POST['desc'])); - $location = escape_tags(trim($_POST['location'])); + $summary = trim($_POST['summary'] ?? ''); + $desc = trim($_POST['desc'] ?? ''); + $location = trim($_POST['location'] ?? ''); $type = 'event'; - $action = ($event_id == '') ? 'new' : "event/" . $event_id; - $onerror_url = System::baseUrl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish"; + $params = [ + 'summary' => $summary, + 'description' => $desc, + 'location' => $location, + 'start' => $start_text, + 'finish' => $finish_text, + 'adjust' => $adjust, + 'nofinish' => $nofinish, + ]; + + $action = ($event_id == '') ? 'new' : 'event/' . $event_id; + $onerror_path = 'events/' . $action . '?' . http_build_query($params, null, null, PHP_QUERY_RFC3986); if (strcmp($finish, $start) < 0 && !$nofinish) { - notice(L10n::t('Event can not end before it has started.') . EOL); + notice(DI::l10n()->t('Event can not end before it has started.') . EOL); if (intval($_REQUEST['preview'])) { - echo L10n::t('Event can not end before it has started.'); - killme(); + echo DI::l10n()->t('Event can not end before it has started.'); + exit(); } - goaway($onerror_url); + DI::baseUrl()->redirect($onerror_path); } - if (!$summary || ($start === NULL_DATE)) { - notice(L10n::t('Event title and start time are required.') . EOL); + if (!$summary || ($start === DBA::NULL_DATETIME)) { + notice(DI::l10n()->t('Event title and start time are required.') . EOL); if (intval($_REQUEST['preview'])) { - echo L10n::t('Event title and start time are required.'); - killme(); + echo DI::l10n()->t('Event title and start time are required.'); + exit(); } - goaway($onerror_url); + DI::baseUrl()->redirect($onerror_path); } - $share = (intval($_POST['share']) ? intval($_POST['share']) : 0); + $share = intval($_POST['share'] ?? 0); $c = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval(local_user()) @@ -131,13 +163,16 @@ function events_post(App $a) { if ($share) { - $str_group_allow = !empty($_POST['group_allow']) ? perms2str($_POST['group_allow']) : ''; - $str_contact_allow = !empty($_POST['contact_allow']) ? perms2str($_POST['contact_allow']) : ''; - $str_group_deny = !empty($_POST['group_deny']) ? perms2str($_POST['group_deny']) : ''; - $str_contact_deny = !empty($_POST['contact_deny']) ? perms2str($_POST['contact_deny']) : ''; + + $aclFormatter = DI::aclFormatter(); + + $str_group_allow = $aclFormatter->toString($_POST['group_allow'] ?? ''); + $str_contact_allow = $aclFormatter->toString($_POST['contact_allow'] ?? ''); + $str_group_deny = $aclFormatter->toString($_POST['group_deny'] ?? ''); + $str_contact_deny = $aclFormatter->toString($_POST['contact_deny'] ?? ''); // Undo the pseudo-contact of self, since there are real contacts now - if (strpos($str_contact_allow, '<' . $self . '>') !== false ) { + if (strpos($str_contact_allow, '<' . $self . '>') !== false) { $str_contact_allow = str_replace('<' . $self . '>', '', $str_contact_allow); } // Make sure to set the `private` field as true. This is necessary to @@ -175,38 +210,38 @@ function events_post(App $a) { if (intval($_REQUEST['preview'])) { $html = Event::getHTML($datarray); echo $html; - killme(); + exit(); } $item_id = Event::store($datarray); if (!$cid) { - Worker::add(PRIORITY_HIGH, "Notifier", "event", $item_id); + Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, $item_id); } - goaway($_SESSION['return_url']); + DI::baseUrl()->redirect('events'); } -function events_content(App $a) { - +function events_content(App $a) +{ if (!local_user()) { - notice(L10n::t('Permission denied.') . EOL); - return; + notice(DI::l10n()->t('Permission denied.') . EOL); + return Login::form(); } if ($a->argc == 1) { - $_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd; + $_SESSION['return_path'] = DI::args()->getCommand(); } if (($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) { - $r = q("UPDATE `event` SET `ignore` = 1 WHERE `id` = %d AND `uid` = %d", + q("UPDATE `event` SET `ignore` = 1 WHERE `id` = %d AND `uid` = %d", intval($a->argv[2]), intval(local_user()) ); } if (($a->argc > 2) && ($a->argv[1] === 'unignore') && intval($a->argv[2])) { - $r = q("UPDATE `event` SET `ignore` = 0 WHERE `id` = %d AND `uid` = %d", + q("UPDATE `event` SET `ignore` = 0 WHERE `id` = %d AND `uid` = %d", intval($a->argv[2]), intval(local_user()) ); @@ -221,30 +256,24 @@ function events_content(App $a) { // get the translation strings for the callendar $i18n = Event::getStrings(); - $htpl = get_markup_template('event_head.tpl'); - $a->page['htmlhead'] .= replace_macros($htpl, [ - '$baseurl' => System::baseUrl(), + $htpl = Renderer::getMarkupTemplate('event_head.tpl'); + DI::page()['htmlhead'] .= Renderer::replaceMacros($htpl, [ '$module_url' => '/events', '$modparams' => 1, '$i18n' => $i18n, ]); - $etpl = get_markup_template('event_end.tpl'); - $a->page['end'] .= replace_macros($etpl, [ - '$baseurl' => System::baseUrl(), - ]); - $o = ''; $tabs = ''; // tabs if ($a->theme_events_in_profile) { - $tabs = Profile::getTabs($a, true); + $tabs = BaseProfile::getTabsHTML($a, 'events', true); } $mode = 'view'; $y = 0; $m = 0; - $ignored = (x($_REQUEST, 'ignored') ? intval($_REQUEST['ignored']) : 0); + $ignored = !empty($_REQUEST['ignored']) ? intval($_REQUEST['ignored']) : 0; if ($a->argc > 1) { if ($a->argc > 2 && $a->argv[1] == 'event') { @@ -272,7 +301,6 @@ function events_content(App $a) { // The view mode part is similiar to /mod/cal.php if ($mode == 'view') { - $thisyear = DateTimeFormat::localNow('Y'); $thismonth = DateTimeFormat::localNow('m'); if (!$y) { @@ -292,30 +320,15 @@ function events_content(App $a) { $y = 2100; } - $nextyear = $y; - $nextmonth = $m + 1; - if ($nextmonth > 12) { - $nextmonth = 1; - $nextyear ++; - } - - $prevyear = $y; - if ($m > 1) { - $prevmonth = $m - 1; - } else { - $prevmonth = 12; - $prevyear --; - } - $dim = Temporal::getDaysInMonth($y, $m); $start = sprintf('%d-%d-%d %d:%d:%d', $y, $m, 1, 0, 0, 0); $finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59); if ($a->argc > 1 && $a->argv[1] === 'json') { - if (x($_GET, 'start')) { - $start = $_GET['start']; + if (!empty($_GET['start'])) { + $start = $_GET['start']; } - if (x($_GET, 'end')) { + if (!empty($_GET['end'])) { $finish = $_GET['end']; } } @@ -328,7 +341,7 @@ function events_content(App $a) { // put the event parametes in an array so we can better transmit them $event_params = [ - 'event_id' => intval(defaults($_GET, 'id', 0)), + 'event_id' => intval($_GET['id'] ?? 0), 'start' => $start, 'finish' => $finish, 'adjust_start' => $adjust_start, @@ -349,8 +362,8 @@ function events_content(App $a) { $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)) { - $links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j; + if (empty($links[$j])) { + $links[$j] = DI::baseUrl() . '/' . DI::args()->getCommand() . '#link-' . $j; } } } @@ -363,49 +376,55 @@ function events_content(App $a) { $events = Event::prepareListForTemplate($r); } - if ($a->argc > 1 && $a->argv[1] === 'json'){ + if ($a->argc > 1 && $a->argv[1] === 'json') { + header('Content-Type: application/json'); echo json_encode($events); - killme(); + exit(); } - if (x($_GET, 'id')) { - $tpl = get_markup_template("event.tpl"); + if (!empty($_GET['id'])) { + $tpl = Renderer::getMarkupTemplate("event.tpl"); } else { - $tpl = get_markup_template("events_js.tpl"); + $tpl = Renderer::getMarkupTemplate("events_js.tpl"); } // Get rid of dashes in key names, Smarty3 can't handle them foreach ($events as $key => $event) { $event_item = []; foreach ($event['item'] as $k => $v) { - $k = str_replace('-' ,'_', $k); + $k = str_replace('-', '_', $k); $event_item[$k] = $v; } $events[$key]['item'] = $event_item; } - $o = replace_macros($tpl, [ - '$baseurl' => System::baseUrl(), + // ACL blocks are loaded in modals in frio + DI::page()->registerFooterScript(Theme::getPathForFile('asset/typeahead.js/dist/typeahead.bundle.js')); + DI::page()->registerFooterScript(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.js')); + DI::page()->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css')); + DI::page()->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css')); + + $o = Renderer::replaceMacros($tpl, [ '$tabs' => $tabs, - '$title' => L10n::t('Events'), - '$view' => L10n::t('View'), - '$new_event' => [System::baseUrl() . '/events/new', L10n::t('Create New Event'), '', ''], - '$previous' => [System::baseUrl() . '/events/$prevyear/$prevmonth', L10n::t('Previous'), '', ''], - '$next' => [System::baseUrl() . '/events/$nextyear/$nextmonth', L10n::t('Next'), '', ''], + '$title' => DI::l10n()->t('Events'), + '$view' => DI::l10n()->t('View'), + '$new_event' => [DI::baseUrl() . '/events/new', DI::l10n()->t('Create New Event'), '', ''], + '$previous' => [DI::baseUrl() . '/events/$prevyear/$prevmonth', DI::l10n()->t('Previous'), '', ''], + '$next' => [DI::baseUrl() . '/events/$nextyear/$nextmonth', DI::l10n()->t('Next'), '', ''], '$calendar' => Temporal::getCalendarTable($y, $m, $links, ' eventcal'), '$events' => $events, - '$today' => L10n::t('today'), - '$month' => L10n::t('month'), - '$week' => L10n::t('week'), - '$day' => L10n::t('day'), - '$list' => L10n::t('list'), + '$today' => DI::l10n()->t('today'), + '$month' => DI::l10n()->t('month'), + '$week' => DI::l10n()->t('week'), + '$day' => DI::l10n()->t('day'), + '$list' => DI::l10n()->t('list'), ]); - if (x($_GET, 'id')) { + if (!empty($_GET['id'])) { echo $o; - killme(); + exit(); } return $o; @@ -423,46 +442,46 @@ function events_content(App $a) { // Passed parameters overrides anything found in the DB if (in_array($mode, ['edit', 'new', 'copy'])) { + $share_checked = ''; + $share_disabled = ''; + if (empty($orig_event)) { - $orig_event = []; + $orig_event = User::getById(local_user(), ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']);; + } elseif ($orig_event['allow_cid'] !== '<' . local_user() . '>' + || $orig_event['allow_gid'] + || $orig_event['deny_cid'] + || $orig_event['deny_gid']) { + $share_checked = ' checked="checked" '; } // In case of an error the browser is redirected back here, with these parameters filled in with the previous values - if (x($_REQUEST, 'nofinish')) {$orig_event['nofinish'] = $_REQUEST['nofinish'];} - if (x($_REQUEST, 'adjust')) {$orig_event['adjust'] = $_REQUEST['adjust'];} - if (x($_REQUEST, 'summary')) {$orig_event['summary'] = $_REQUEST['summary'];} - if (x($_REQUEST, 'description')) {$orig_event['description'] = $_REQUEST['description'];} - if (x($_REQUEST, 'location')) {$orig_event['location'] = $_REQUEST['location'];} - if (x($_REQUEST, 'start')) {$orig_event['start'] = $_REQUEST['start'];} - if (x($_REQUEST, 'finish')) {$orig_event['finish'] = $_REQUEST['finish'];} - if (x($_REQUEST,'finish')) $orig_event['finish'] = $_REQUEST['finish']; - - $n_checked = ((x($orig_event) && $orig_event['nofinish']) ? ' checked="checked" ' : ''); - $a_checked = ((x($orig_event) && $orig_event['adjust']) ? ' checked="checked" ' : ''); - - $t_orig = (x($orig_event) ? $orig_event['summary'] : ''); - $d_orig = (x($orig_event) ? $orig_event['desc'] : ''); - $l_orig = (x($orig_event) ? $orig_event['location'] : ''); - $eid = (x($orig_event) ? $orig_event['id'] : 0); - $cid = (x($orig_event) ? $orig_event['cid'] : 0); - $uri = (x($orig_event) ? $orig_event['uri'] : ''); - - $sh_disabled = ''; - $sh_checked = ''; - - if (x($orig_event)) { - $sh_checked = (($orig_event['allow_cid'] === '<' . local_user() . '>' && !$orig_event['allow_gid'] && !$orig_event['deny_cid'] && !$orig_event['deny_gid']) ? '' : ' checked="checked" '); - } + if (!empty($_REQUEST['nofinish'])) {$orig_event['nofinish'] = $_REQUEST['nofinish'];} + if (!empty($_REQUEST['adjust'])) {$orig_event['adjust'] = $_REQUEST['adjust'];} + if (!empty($_REQUEST['summary'])) {$orig_event['summary'] = $_REQUEST['summary'];} + if (!empty($_REQUEST['desc'])) {$orig_event['desc'] = $_REQUEST['desc'];} + if (!empty($_REQUEST['location'])) {$orig_event['location'] = $_REQUEST['location'];} + if (!empty($_REQUEST['start'])) {$orig_event['start'] = $_REQUEST['start'];} + if (!empty($_REQUEST['finish'])) {$orig_event['finish'] = $_REQUEST['finish'];} + + $n_checked = (!empty($orig_event['nofinish']) ? ' checked="checked" ' : ''); + $a_checked = (!empty($orig_event['adjust']) ? ' checked="checked" ' : ''); + + $t_orig = $orig_event['summary'] ?? ''; + $d_orig = $orig_event['desc'] ?? ''; + $l_orig = $orig_event['location'] ?? ''; + $eid = !empty($orig_event) ? $orig_event['id'] : 0; + $cid = !empty($orig_event) ? $orig_event['cid'] : 0; + $uri = !empty($orig_event) ? $orig_event['uri'] : ''; if ($cid || $mode === 'edit') { - $sh_disabled = 'disabled="disabled"'; + $share_disabled = 'disabled="disabled"'; } - $sdt = (x($orig_event) ? $orig_event['start'] : 'now'); - $fdt = (x($orig_event) ? $orig_event['finish'] : 'now'); + $sdt = !empty($orig_event) ? $orig_event['start'] : 'now'; + $fdt = !empty($orig_event) ? $orig_event['finish'] : 'now'; $tz = date_default_timezone_get(); - if (x($orig_event)) { + if (!empty($orig_event)) { $tz = ($orig_event['adjust'] ? date_default_timezone_get() : 'UTC'); } @@ -470,20 +489,20 @@ function events_content(App $a) { $smonth = DateTimeFormat::convert($sdt, $tz, 'UTC', 'm'); $sday = DateTimeFormat::convert($sdt, $tz, 'UTC', 'd'); - $shour = (x($orig_event) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'H') : '00'); - $sminute = (x($orig_event) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'i') : '00'); + $shour = !empty($orig_event) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'H') : '00'; + $sminute = !empty($orig_event) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'i') : '00'; $fyear = DateTimeFormat::convert($fdt, $tz, 'UTC', 'Y'); $fmonth = DateTimeFormat::convert($fdt, $tz, 'UTC', 'm'); $fday = DateTimeFormat::convert($fdt, $tz, 'UTC', 'd'); - $fhour = (x($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'H') : '00'); - $fminute = (x($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : '00'); - - $perms = ACL::getDefaultUserPermissions($orig_event); + $fhour = !empty($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'H') : '00'; + $fminute = !empty($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : '00'; - if ($mode === 'new' || $mode === 'copy') { - $acl = ($cid ? '' : ACL::getFullSelectorHTML($a->user, false, $orig_event)); + if (!$cid && in_array($mode, ['new', 'copy'])) { + $acl = ACL::getFullSelectorHTML(DI::page(), $a->user, false, ACL::getDefaultUserPermissions($orig_event)); + } else { + $acl = ''; } // If we copy an old event, we need to remove the ID and URI @@ -493,48 +512,62 @@ function events_content(App $a) { $uri = ''; } - $tpl = get_markup_template('event_form.tpl'); + $tpl = Renderer::getMarkupTemplate('event_form.tpl'); - $o .= replace_macros($tpl,[ - '$post' => System::baseUrl() . '/events', + $o .= Renderer::replaceMacros($tpl, [ + '$post' => DI::baseUrl() . '/events', '$eid' => $eid, '$cid' => $cid, '$uri' => $uri, - '$allow_cid' => json_encode($perms['allow_cid']), - '$allow_gid' => json_encode($perms['allow_gid']), - '$deny_cid' => json_encode($perms['deny_cid']), - '$deny_gid' => json_encode($perms['deny_gid']), - - '$title' => L10n::t('Event details'), - '$desc' => L10n::t('Starting date and Title are required.'), - '$s_text' => L10n::t('Event Starts:') . ' *', - '$s_dsel' => Temporal::getDateTimeField(new DateTime(), DateTime::createFromFormat('Y', $syear+5), DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"), L10n::t('Event Starts:'), 'start_text', true, true, '', '', true), - '$n_text' => L10n::t('Finish date/time is not known or not relevant'), + '$title' => DI::l10n()->t('Event details'), + '$desc' => DI::l10n()->t('Starting date and Title are required.'), + '$s_text' => DI::l10n()->t('Event Starts:') . ' *', + '$s_dsel' => Temporal::getDateTimeField( + new DateTime(), + DateTime::createFromFormat('Y', intval($syear) + 5), + DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"), + DI::l10n()->t('Event Starts:'), + 'start_text', + true, + true, + '', + '', + true + ), + '$n_text' => DI::l10n()->t('Finish date/time is not known or not relevant'), '$n_checked' => $n_checked, - '$f_text' => L10n::t('Event Finishes:'), - '$f_dsel' => Temporal::getDateTimeField(new DateTime(), DateTime::createFromFormat('Y', $fyear+5), DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"), L10n::t('Event Finishes:'), 'finish_text', true, true, 'start_text'), - '$a_text' => L10n::t('Adjust for viewer timezone'), + '$f_text' => DI::l10n()->t('Event Finishes:'), + '$f_dsel' => Temporal::getDateTimeField( + new DateTime(), + DateTime::createFromFormat('Y', intval($fyear) + 5), + DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"), + DI::l10n()->t('Event Finishes:'), + 'finish_text', + true, + true, + 'start_text' + ), + '$a_text' => DI::l10n()->t('Adjust for viewer timezone'), '$a_checked' => $a_checked, - '$d_text' => L10n::t('Description:'), + '$d_text' => DI::l10n()->t('Description:'), '$d_orig' => $d_orig, - '$l_text' => L10n::t('Location:'), + '$l_text' => DI::l10n()->t('Location:'), '$l_orig' => $l_orig, - '$t_text' => L10n::t('Title:') . ' *', + '$t_text' => DI::l10n()->t('Title:') . ' *', '$t_orig' => $t_orig, - '$summary' => ['summary', L10n::t('Title:'), $t_orig, '', '*'], - '$sh_text' => L10n::t('Share this event'), - '$share' => ['share', L10n::t('Share this event'), $sh_checked, '', $sh_disabled], - '$sh_checked' => $sh_checked, - '$nofinish' => ['nofinish', L10n::t('Finish date/time is not known or not relevant'), $n_checked], - '$adjust' => ['adjust', L10n::t('Adjust for viewer timezone'), $a_checked], - '$preview' => L10n::t('Preview'), + '$summary' => ['summary', DI::l10n()->t('Title:'), $t_orig, '', '*'], + '$sh_text' => DI::l10n()->t('Share this event'), + '$share' => ['share', DI::l10n()->t('Share this event'), $share_checked, '', $share_disabled], + '$sh_checked' => $share_checked, + '$nofinish' => ['nofinish', DI::l10n()->t('Finish date/time is not known or not relevant'), $n_checked], + '$adjust' => ['adjust', DI::l10n()->t('Adjust for viewer timezone'), $a_checked], + '$preview' => DI::l10n()->t('Preview'), '$acl' => $acl, - '$submit' => L10n::t('Submit'), - '$basic' => L10n::t('Basic'), - '$advanced' => L10n::t('Advanced'), - '$permissions' => L10n::t('Permissions'), - + '$submit' => DI::l10n()->t('Submit'), + '$basic' => DI::l10n()->t('Basic'), + '$advanced' => DI::l10n()->t('Advanced'), + '$permissions' => DI::l10n()->t('Permissions'), ]); return $o; @@ -550,11 +583,11 @@ function events_content(App $a) { } if (Item::exists(['id' => $ev[0]['itemid']])) { - notice(L10n::t('Failed to remove event') . EOL); + notice(DI::l10n()->t('Failed to remove event') . EOL); } else { - info(L10n::t('Event removed') . EOL); + info(DI::l10n()->t('Event removed') . EOL); } - goaway(System::baseUrl() . '/events'); + DI::baseUrl()->redirect('events'); } }