<?php
/**
- * @file mod/events.php
- * @brief The events module
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @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\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\Module\Login;
+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;
-
-require_once 'include/items.php';
+use Friendica\Worker\Delivery;
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)
{
- logger('post: ' . print_r($_REQUEST, true), LOGGER_DATA);
+ Logger::debug('post', ['request' => $_REQUEST]);
if (!local_user()) {
return;
$cid = !empty($_POST['cid']) ? intval($_POST['cid']) : 0;
$uid = local_user();
- $start_text = escape_tags(defaults($_REQUEST, 'start_text', ''));
- $finish_text = escape_tags(defaults($_REQUEST, 'finish_text', ''));
+ $start_text = Strings::escapeHtml($_REQUEST['start_text'] ?? '');
+ $finish_text = Strings::escapeHtml($_REQUEST['finish_text'] ?? '');
- $adjust = intval(defaults($_POST, 'adjust', 0));
- $nofinish = intval(defaults($_POST, 'nofinish', 0));
+ $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;
// and we'll waste a bunch of time responding to it. Time that
// could've been spent doing something else.
- $summary = escape_tags(trim(defaults($_POST, 'summary', '')));
- $desc = escape_tags(trim(defaults($_POST, 'desc', '')));
- $location = escape_tags(trim(defaults($_POST, 'location', '')));
+ $summary = trim($_POST['summary'] ?? '');
+ $desc = trim($_POST['desc'] ?? '');
+ $location = trim($_POST['location'] ?? '');
$type = 'event';
- $action = ($event_id == '') ? 'new' : "event/" . $event_id;
- $onerror_path = "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();
}
- $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.') . 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();
}
- $a->internalRedirect($onerror_path);
+ DI::baseUrl()->redirect($onerror_path);
}
- $share = intval(defaults($_POST, 'share', 0));
+ $share = intval($_POST['share'] ?? 0);
$c = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
intval(local_user())
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 (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);
}
- $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.') . EOL);
return Login::form();
}
if ($a->argc == 1) {
- $_SESSION['return_path'] = $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())
);
// 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,
$tabs = '';
// tabs
if ($a->theme_events_in_profile) {
- $tabs = Profile::getTabs($a, true);
+ $tabs = BaseProfile::getTabsHTML($a, 'events', true);
}
$mode = 'view';
$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);
// 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,
foreach ($r as $rr) {
$j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j');
if (empty($links[$j])) {
- $links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
+ $links[$j] = DI::baseUrl() . '/' . DI::args()->getCommand() . '#link-' . $j;
}
}
}
}
if ($a->argc > 1 && $a->argv[1] === 'json') {
+ header('Content-Type: application/json');
echo json_encode($events);
- killme();
+ exit();
}
if (!empty($_GET['id'])) {
- $tpl = get_markup_template("event.tpl");
+ $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
$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 (!empty($_GET['id'])) {
echo $o;
- killme();
+ exit();
}
return $o;
// 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['description'])) {$orig_event['description'] = $_REQUEST['description'];}
+ 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 = !empty($orig_event) ? $orig_event['summary'] : '';
- $d_orig = !empty($orig_event) ? $orig_event['desc'] : '';
- $l_orig = !empty($orig_event) ? $orig_event['location'] : '';
+ $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" ';
- }
-
if ($cid || $mode === 'edit') {
- $sh_disabled = 'disabled="disabled"';
+ $share_disabled = 'disabled="disabled"';
}
$sdt = !empty($orig_event) ? $orig_event['start'] : 'now';
$fhour = !empty($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'H') : '00';
$fminute = !empty($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : '00';
- $perms = ACL::getDefaultUserPermissions($orig_event);
-
if (!$cid && in_array($mode, ['new', 'copy'])) {
- $acl = ACL::getFullSelectorHTML($a->user, false, $orig_event);
+ $acl = ACL::getFullSelectorHTML(DI::page(), $a->user, false, ACL::getDefaultUserPermissions($orig_event));
} else {
$acl = '';
}
$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:') . ' <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', $syear+5),
+ 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', $fyear+5),
+ 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_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:') . ' <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],
+ '$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;
}
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);
}
- $a->internalRedirect('events');
+ DI::baseUrl()->redirect('events');
}
}
projects / friendica.git / blobdiff