<?php
/**
- * @file mod/events.php
- * @brief The events module
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * The events module
*/
use Friendica\App;
-use Friendica\BaseObject;
use Friendica\Content\Nav;
use Friendica\Content\Widget\CalendarExport;
use Friendica\Core\ACL;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
-use Friendica\Core\System;
use Friendica\Core\Theme;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model\Conversation;
use Friendica\Model\Event;
use Friendica\Model\Item;
-use Friendica\Model\Profile;
+use Friendica\Model\Post;
+use Friendica\Model\User;
+use Friendica\Module\BaseProfile;
use Friendica\Module\Security\Login;
-use Friendica\Util\ACLFormatter;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings;
use Friendica\Util\Temporal;
return;
}
- // 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'] = '';
+ if (empty(DI::page()['aside'])) {
+ DI::page()['aside'] = '';
}
- $cal_widget = CalendarExport::getHTML();
+ $cal_widget = CalendarExport::getHTML(local_user());
- $a->page['aside'] .= $cal_widget;
+ DI::page()['aside'] .= $cal_widget;
return;
}
function events_post(App $a)
{
-
- Logger::log('post: ' . print_r($_REQUEST, true), Logger::DATA);
-
+ Logger::debug('post', ['request' => $_REQUEST]);
if (!local_user()) {
return;
}
$start_text = Strings::escapeHtml($_REQUEST['start_text'] ?? '');
$finish_text = Strings::escapeHtml($_REQUEST['finish_text'] ?? '');
- $adjust = intval($_POST['adjust'] ?? 0);
$nofinish = intval($_POST['nofinish'] ?? 0);
+ $share = intval($_POST['share'] ?? 0);
+
// The default setting for the `private` field in event_store() is false, so mirror that
$private_event = false;
$finish = $finish_text;
}
- if ($adjust) {
- $start = DateTimeFormat::convert($start, 'UTC', date_default_timezone_get());
- if (!$nofinish) {
- $finish = DateTimeFormat::convert($finish, 'UTC', date_default_timezone_get());
- }
- } else {
- $start = DateTimeFormat::utc($start);
- if (!$nofinish) {
- $finish = DateTimeFormat::utc($finish);
- }
+ $start = DateTimeFormat::convert($start, 'UTC', $a->getTimeZone());
+ if (!$nofinish) {
+ $finish = DateTimeFormat::convert($finish, 'UTC', $a->getTimeZone());
}
// Don't allow the event to finish before it begins.
'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);
+ $onerror_path = 'events/' . $action . '?' . http_build_query($params, '', '&', 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.'));
if (intval($_REQUEST['preview'])) {
- echo L10n::t('Event can not end before it has started.');
+ echo DI::l10n()->t('Event can not end before it has started.');
exit();
}
- $a->internalRedirect($onerror_path);
+ DI::baseUrl()->redirect($onerror_path);
}
if (!$summary || ($start === DBA::NULL_DATETIME)) {
- notice(L10n::t('Event title and start time are required.') . EOL);
+ notice(DI::l10n()->t('Event title and start time are required.'));
if (intval($_REQUEST['preview'])) {
- echo L10n::t('Event title and start time are required.');
+ echo DI::l10n()->t('Event title and start time are required.');
exit();
}
- $a->internalRedirect($onerror_path);
+ DI::baseUrl()->redirect($onerror_path);
}
- $share = intval($_POST['share'] ?? 0);
-
- $c = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
- intval(local_user())
- );
-
- if (DBA::isResult($c)) {
- $self = $c[0]['id'];
- } else {
- $self = 0;
- }
+ $self = \Friendica\Model\Contact::getPublicIdByUserId($uid);
+ $aclFormatter = DI::aclFormatter();
if ($share) {
-
- /** @var ACLFormatter $aclFormatter */
- $aclFormatter = BaseObject::getClass(ACLFormatter::class);
-
- $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) {
- $str_contact_allow = str_replace('<' . $self . '>', '', $str_contact_allow);
- }
- // Make sure to set the `private` field as true. This is necessary to
- // have the posts show up correctly in Diaspora if an event is created
- // as visible only to self at first, but then edited to display to others.
- if (strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) {
- $private_event = true;
+ $user = User::getById($uid, ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']);
+ if (!DBA::isResult($user)) {
+ return;
+ }
+
+ $str_contact_allow = isset($_REQUEST['contact_allow']) ? $aclFormatter->toString($_REQUEST['contact_allow']) : $user['allow_cid'] ?? '';
+ $str_group_allow = isset($_REQUEST['group_allow']) ? $aclFormatter->toString($_REQUEST['group_allow']) : $user['allow_gid'] ?? '';
+ $str_contact_deny = isset($_REQUEST['contact_deny']) ? $aclFormatter->toString($_REQUEST['contact_deny']) : $user['deny_cid'] ?? '';
+ $str_group_deny = isset($_REQUEST['group_deny']) ? $aclFormatter->toString($_REQUEST['group_deny']) : $user['deny_gid'] ?? '';
+
+ $visibility = $_REQUEST['visibility'] ?? '';
+ if ($visibility === 'public') {
+ // The ACL selector introduced in version 2019.12 sends ACL input data even when the Public visibility is selected
+ $str_contact_allow = $str_group_allow = $str_contact_deny = $str_group_deny = '';
+ } else if ($visibility === 'custom') {
+ // Since we know from the visibility parameter the item should be private, we have to prevent the empty ACL
+ // case that would make it public. So we always append the author's contact id to the allowed contacts.
+ // See https://github.com/friendica/friendica/issues/9672
+ $str_contact_allow .= $aclFormatter->toString($self);
}
} else {
- // Note: do not set `private` field for self-only events. It will
- // keep even you from seeing them!
- $str_contact_allow = '<' . $self . '>';
+ $str_contact_allow = $aclFormatter->toString($self);
$str_group_allow = $str_contact_deny = $str_group_deny = '';
}
+ // Make sure to set the `private` field as true. This is necessary to
+ // have the posts show up correctly in Diaspora if an event is created
+ // as visible only to self at first, but then edited to display to others.
+ if (strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) {
+ $private_event = true;
+ }
$datarray = [];
$datarray['start'] = $start;
$datarray['desc'] = $desc;
$datarray['location'] = $location;
$datarray['type'] = $type;
- $datarray['adjust'] = $adjust;
$datarray['nofinish'] = $nofinish;
$datarray['uid'] = $uid;
$datarray['cid'] = $cid;
exit();
}
- $item_id = Event::store($datarray);
+ $event_id = Event::store($datarray);
+
+ $item = ['network' => Protocol::DFRN, 'protocol' => Conversation::PARCEL_DIRECT, 'direction' => Conversation::PUSH];
+ $item = Event::getItemArrayForId($event_id, $item);
+ if (Item::insert($item)) {
+ $uri_id = $item['uri-id'];
+ } else {
+ $uri_id = 0;
+ }
- if (!$cid) {
- Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, $item_id);
+ if (!$cid && $uri_id) {
+ Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, (int)$uri_id, (int)$uid);
}
- $a->internalRedirect('events');
+ DI::baseUrl()->redirect('events');
}
function events_content(App $a)
{
if (!local_user()) {
- notice(L10n::t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.'));
return Login::form();
}
- if ($a->argc == 1) {
- $_SESSION['return_path'] = $a->cmd;
+ if (DI::args()->getArgc() == 1) {
+ $_SESSION['return_path'] = DI::args()->getCommand();
}
- if (($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) {
- q("UPDATE `event` SET `ignore` = 1 WHERE `id` = %d AND `uid` = %d",
- intval($a->argv[2]),
- intval(local_user())
- );
+ if ((DI::args()->getArgc() > 2) && (DI::args()->getArgv()[1] === 'ignore') && intval(DI::args()->getArgv()[2])) {
+ DBA::update('event', ['ignore' => true], ['id' => DI::args()->getArgv()[2], 'uid' => local_user()]);
}
- if (($a->argc > 2) && ($a->argv[1] === 'unignore') && intval($a->argv[2])) {
- q("UPDATE `event` SET `ignore` = 0 WHERE `id` = %d AND `uid` = %d",
- intval($a->argv[2]),
- intval(local_user())
- );
+ if ((DI::args()->getArgc() > 2) && (DI::args()->getArgv()[1] === 'unignore') && intval(DI::args()->getArgv()[2])) {
+ DBA::update('event', ['ignore' => false], ['id' => DI::args()->getArgv()[2], 'uid' => local_user()]);
}
- if ($a->theme_events_in_profile) {
+ if ($a->getThemeInfoValue('events_in_profile')) {
Nav::setSelected('home');
} else {
Nav::setSelected('events');
// get the translation strings for the callendar
$i18n = Event::getStrings();
+ DI::page()->registerStylesheet('view/asset/fullcalendar/dist/fullcalendar.min.css');
+ DI::page()->registerStylesheet('view/asset/fullcalendar/dist/fullcalendar.print.min.css', 'print');
+ DI::page()->registerFooterScript('view/asset/moment/min/moment-with-locales.min.js');
+ DI::page()->registerFooterScript('view/asset/fullcalendar/dist/fullcalendar.min.js');
+
$htpl = Renderer::getMarkupTemplate('event_head.tpl');
- $a->page['htmlhead'] .= Renderer::replaceMacros($htpl, [
+ DI::page()['htmlhead'] .= Renderer::replaceMacros($htpl, [
'$module_url' => '/events',
'$modparams' => 1,
'$i18n' => $i18n,
$o = '';
$tabs = '';
// tabs
- if ($a->theme_events_in_profile) {
- $tabs = Profile::getTabs($a, 'events', true);
+ if ($a->getThemeInfoValue('events_in_profile')) {
+ $tabs = BaseProfile::getTabsHTML($a, 'events', true, $a->getLoggedInUserNickname(), false);
}
$mode = 'view';
$m = 0;
$ignored = !empty($_REQUEST['ignored']) ? intval($_REQUEST['ignored']) : 0;
- if ($a->argc > 1) {
- if ($a->argc > 2 && $a->argv[1] == 'event') {
+ if (DI::args()->getArgc() > 1) {
+ if (DI::args()->getArgc() > 2 && DI::args()->getArgv()[1] == 'event') {
$mode = 'edit';
- $event_id = intval($a->argv[2]);
+ $event_id = intval(DI::args()->getArgv()[2]);
}
- if ($a->argc > 2 && $a->argv[1] == 'drop') {
+ if (DI::args()->getArgc() > 2 && DI::args()->getArgv()[1] == 'drop') {
$mode = 'drop';
- $event_id = intval($a->argv[2]);
+ $event_id = intval(DI::args()->getArgv()[2]);
}
- if ($a->argc > 2 && $a->argv[1] == 'copy') {
+ if (DI::args()->getArgc() > 2 && DI::args()->getArgv()[1] == 'copy') {
$mode = 'copy';
- $event_id = intval($a->argv[2]);
+ $event_id = intval(DI::args()->getArgv()[2]);
}
- if ($a->argv[1] === 'new') {
+ if (DI::args()->getArgv()[1] === 'new') {
$mode = 'new';
$event_id = 0;
}
- if ($a->argc > 2 && intval($a->argv[1]) && intval($a->argv[2])) {
+ if (DI::args()->getArgc() > 2 && intval(DI::args()->getArgv()[1]) && intval(DI::args()->getArgv()[2])) {
$mode = 'view';
- $y = intval($a->argv[1]);
- $m = intval($a->argv[2]);
+ $y = intval(DI::args()->getArgv()[1]);
+ $m = intval(DI::args()->getArgv()[2]);
}
}
$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 (!empty($_GET['start'])) {
- $start = $_GET['start'];
- }
- if (!empty($_GET['end'])) {
- $finish = $_GET['end'];
- }
- }
-
- $start = DateTimeFormat::utc($start);
- $finish = DateTimeFormat::utc($finish);
-
- $adjust_start = DateTimeFormat::local($start);
- $adjust_finish = DateTimeFormat::local($finish);
-
// put the event parametes in an array so we can better transmit them
$event_params = [
'event_id' => intval($_GET['id'] ?? 0),
'start' => $start,
'finish' => $finish,
- 'adjust_start' => $adjust_start,
- 'adjust_finish' => $adjust_finish,
'ignore' => $ignored,
];
if (DBA::isResult($r)) {
$r = Event::sortByDate($r);
foreach ($r as $rr) {
- $j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j');
+ $j = DateTimeFormat::local($rr['start'], 'j');
if (empty($links[$j])) {
- $links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
+ $links[$j] = DI::baseUrl() . '/' . DI::args()->getCommand() . '#link-' . $j;
}
}
}
$events = Event::prepareListForTemplate($r);
}
- if ($a->argc > 1 && $a->argv[1] === 'json') {
- header('Content-Type: application/json');
- echo json_encode($events);
- exit();
- }
-
if (!empty($_GET['id'])) {
$tpl = Renderer::getMarkupTemplate("event.tpl");
} else {
}
// ACL blocks are loaded in modals in frio
- $a->page->registerFooterScript(Theme::getPathForFile('asset/typeahead.js/dist/typeahead.bundle.js'));
- $a->page->registerFooterScript(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.js'));
- $a->page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css'));
- $a->page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css'));
+ 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 (!empty($_GET['id'])) {
}
if (($mode === 'edit' || $mode === 'copy') && $event_id) {
- $r = q("SELECT * FROM `event` WHERE `id` = %d AND `uid` = %d LIMIT 1",
- intval($event_id),
- intval(local_user())
- );
- if (DBA::isResult($r)) {
- $orig_event = $r[0];
- }
+ $orig_event = DBA::selectFirst('event', [], ['id' => $event_id, 'uid' => local_user()]);
}
// 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 (!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['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'] : '';
-
- $sh_disabled = '';
- $sh_checked = '';
-
- if (!empty($orig_event)
- && ($orig_event['allow_cid'] !== '<' . local_user() . '>'
- || $orig_event['allow_gid']
- || $orig_event['deny_cid']
- || $orig_event['deny_gid']))
- {
- $sh_checked = ' checked="checked" ';
- }
+ $eid = $orig_event['id'] ?? 0;
+ $cid = $orig_event['cid'] ?? 0;
+ $uri = $orig_event['uri'] ?? '';
if ($cid || $mode === 'edit') {
- $sh_disabled = 'disabled="disabled"';
+ $share_disabled = 'disabled="disabled"';
}
- $sdt = !empty($orig_event) ? $orig_event['start'] : 'now';
- $fdt = !empty($orig_event) ? $orig_event['finish'] : 'now';
+ $sdt = $orig_event['start'] ?? 'now';
+ $fdt = $orig_event['finish'] ?? 'now';
- $tz = date_default_timezone_get();
- if (!empty($orig_event)) {
- $tz = ($orig_event['adjust'] ? date_default_timezone_get() : 'UTC');
- }
+ $syear = DateTimeFormat::local($sdt, 'Y');
+ $smonth = DateTimeFormat::local($sdt, 'm');
+ $sday = DateTimeFormat::local($sdt, 'd');
- $syear = DateTimeFormat::convert($sdt, $tz, 'UTC', 'Y');
- $smonth = DateTimeFormat::convert($sdt, $tz, 'UTC', 'm');
- $sday = DateTimeFormat::convert($sdt, $tz, 'UTC', 'd');
+ $shour = !empty($orig_event) ? DateTimeFormat::local($sdt, 'H') : '00';
+ $sminute = !empty($orig_event) ? DateTimeFormat::local($sdt, '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::local($fdt, 'Y');
+ $fmonth = DateTimeFormat::local($fdt, 'm');
+ $fday = DateTimeFormat::local($fdt, 'd');
- $fyear = DateTimeFormat::convert($fdt, $tz, 'UTC', 'Y');
- $fmonth = DateTimeFormat::convert($fdt, $tz, 'UTC', 'm');
- $fday = DateTimeFormat::convert($fdt, $tz, 'UTC', 'd');
-
- $fhour = !empty($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'H') : '00';
- $fminute = !empty($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : '00';
+ $fhour = !empty($orig_event) ? DateTimeFormat::local($fdt, 'H') : '00';
+ $fminute = !empty($orig_event) ? DateTimeFormat::local($fdt, 'i') : '00';
if (!$cid && in_array($mode, ['new', 'copy'])) {
- $acl = ACL::getFullSelectorHTML($a->page, $a->user, false, ACL::getDefaultUserPermissions($orig_event));
+ $acl = ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId(), false, ACL::getDefaultUserPermissions($orig_event));
} else {
$acl = '';
}
$tpl = Renderer::getMarkupTemplate('event_form.tpl');
$o .= Renderer::replaceMacros($tpl, [
- '$post' => System::baseUrl() . '/events',
+ '$post' => DI::baseUrl() . '/events',
'$eid' => $eid,
'$cid' => $cid,
'$uri' => $uri,
- '$title' => L10n::t('Event details'),
- '$desc' => L10n::t('Starting date and Title are required.'),
- '$s_text' => L10n::t('Event Starts:') . ' <span class="required" title="' . L10n::t('Required') . '">*</span>',
+ '$title' => DI::l10n()->t('Event details'),
+ '$desc' => DI::l10n()->t('Starting date and Title are required.'),
+ '$s_text' => DI::l10n()->t('Event Starts:') . ' <span class="required" title="' . DI::l10n()->t('Required') . '">*</span>',
'$s_dsel' => Temporal::getDateTimeField(
new DateTime(),
DateTime::createFromFormat('Y', intval($syear) + 5),
DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"),
- L10n::t('Event Starts:'),
+ DI::l10n()->t('Event Starts:'),
'start_text',
true,
true,
'',
true
),
- '$n_text' => L10n::t('Finish date/time is not known or not relevant'),
+ '$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_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"),
- L10n::t('Event Finishes:'),
+ DI::l10n()->t('Event Finishes:'),
'finish_text',
true,
true,
'start_text'
),
- '$a_text' => 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:') . ' <span class="required" title="' . L10n::t('Required') . '">*</span>',
+ '$t_text' => DI::l10n()->t('Title:') . ' <span class="required" title="' . DI::l10n()->t('Required') . '">*</span>',
'$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],
+ '$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;
Item::deleteForUser(['id' => $ev[0]['itemid']], local_user());
}
- if (Item::exists(['id' => $ev[0]['itemid']])) {
- notice(L10n::t('Failed to remove event') . EOL);
- } else {
- info(L10n::t('Event removed') . EOL);
+ if (Post::exists(['id' => $ev[0]['itemid']])) {
+ notice(DI::l10n()->t('Failed to remove event'));
}
- $a->internalRedirect('events');
+ DI::baseUrl()->redirect('events');
}
}
projects / friendica.git / blobdiff