mirror of
https://github.com/friendica/friendica
synced 2025-04-22 22:30:11 +00:00
Move mod/cal.php and mod/events.php to Module
This commit is contained in:
Philipp
parent
89fde911f9
commit
f13c91b320
41 changed files with 1054 additions and 1109 deletions
277
src/Module/Calendar/Event/API.php
Normal file
277
src/Module/Calendar/Event/API.php
Normal file
|
|
@ -0,0 +1,277 @@
|
|||
<?php
|
||||
/**
|
||||
* @copyright Copyright (C) 2010-2022, 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/>.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace Friendica\Module\Calendar\Event;
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\BaseModule;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\Protocol;
|
||||
use Friendica\Core\Session\Capability\IHandleUserSessions;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\Conversation;
|
||||
use Friendica\Model\Event;
|
||||
use Friendica\Model\Item;
|
||||
use Friendica\Model\Post;
|
||||
use Friendica\Model\User;
|
||||
use Friendica\Module\Response;
|
||||
use Friendica\Navigation\SystemMessages;
|
||||
use Friendica\Network\HTTPException\BadRequestException;
|
||||
use Friendica\Network\HTTPException\UnauthorizedException;
|
||||
use Friendica\Util\ACLFormatter;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
use Friendica\Util\Profiler;
|
||||
use Friendica\Util\Strings;
|
||||
use Friendica\Worker\Delivery;
|
||||
use Psr\Log\LoggerInterface;
|
||||
|
||||
/**
|
||||
* Basic API class for events
|
||||
* currently supports create, delete, ignore, unignore
|
||||
*
|
||||
* @todo: make create/update as REST-call instead of POST
|
||||
*/
|
||||
class API extends BaseModule
|
||||
{
|
||||
const ACTION_CREATE = 'create';
|
||||
const ACTION_DELETE = 'delete';
|
||||
const ACTION_IGNORE = 'ignore';
|
||||
const ACTION_UNIGNORE = 'unignore';
|
||||
|
||||
const ALLOWED_ACTIONS = [
|
||||
self::ACTION_CREATE,
|
||||
self::ACTION_DELETE,
|
||||
self::ACTION_IGNORE,
|
||||
self::ACTION_UNIGNORE,
|
||||
];
|
||||
|
||||
/** @var IHandleUserSessions */
|
||||
protected $session;
|
||||
/** @var SystemMessages */
|
||||
protected $sysMessages;
|
||||
/** @var ACLFormatter */
|
||||
protected $aclFormatter;
|
||||
/** @var string */
|
||||
protected $timezone;
|
||||
|
||||
public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, SystemMessages $sysMessages, ACLFormatter $aclFormatter, App $app, array $server, array $parameters = [])
|
||||
{
|
||||
parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
|
||||
|
||||
$this->session = $session;
|
||||
$this->sysMessages = $sysMessages;
|
||||
$this->aclFormatter = $aclFormatter;
|
||||
$this->timezone = $app->getTimeZone();
|
||||
|
||||
if (!$this->session->getLocalUserId()) {
|
||||
throw new UnauthorizedException($this->t('Permission denied.'));
|
||||
}
|
||||
}
|
||||
|
||||
protected function post(array $request = [])
|
||||
{
|
||||
$this->createEvent($request);
|
||||
}
|
||||
|
||||
protected function rawContent(array $request = [])
|
||||
{
|
||||
if (empty($this->parameters['action']) || !in_array($this->parameters['action'], self::ALLOWED_ACTIONS)) {
|
||||
throw new BadRequestException($this->t('Invalid Request'));
|
||||
}
|
||||
|
||||
// CREATE is done per POSt, so nothing to do left
|
||||
if ($this->parameters['action'] === static::ACTION_CREATE) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (empty($this->parameters['id'])) {
|
||||
throw new BadRequestException($this->t('Event id is missing.'));
|
||||
}
|
||||
|
||||
$returnPath = $request['return_path'] ?? 'calendar';
|
||||
|
||||
switch ($this->parameters['action']) {
|
||||
case self::ACTION_IGNORE:
|
||||
Event::setIgnore($this->session->getLocalUserId(), $this->parameters['id']);
|
||||
break;
|
||||
case self::ACTION_UNIGNORE:
|
||||
Event::setIgnore($this->session->getLocalUserId(), $this->parameters['id'], false);
|
||||
break;
|
||||
case self::ACTION_DELETE:
|
||||
// Remove an event from the calendar and its related items
|
||||
$event = Event::getByIdAndUid($this->session->getLocalUserId(), $this->parameters['id']);
|
||||
|
||||
// Delete only real events (no birthdays)
|
||||
if (!empty($event) && $event['type'] == 'event') {
|
||||
Item::deleteForUser(['id' => $event['itemid']], $this->session->getLocalUserId());
|
||||
}
|
||||
|
||||
if (Post::exists(['id' => $event['itemid']])) {
|
||||
$this->sysMessages->addNotice($this->t('Failed to remove event'));
|
||||
}
|
||||
break;
|
||||
default:
|
||||
throw new BadRequestException($this->t('Invalid Request'));
|
||||
}
|
||||
|
||||
$this->baseUrl->redirect($returnPath);
|
||||
}
|
||||
|
||||
protected function createEvent(array $request)
|
||||
{
|
||||
$eventId = !empty($request['event_id']) ? intval($request['event_id']) : 0;
|
||||
$uid = (int)$this->session->getLocalUserId();
|
||||
$cid = !empty($request['cid']) ? intval($request['cid']) : 0;
|
||||
|
||||
$strStartDateTime = Strings::escapeHtml($request['start_text'] ?? '');
|
||||
$strFinishDateTime = Strings::escapeHtml($request['finish_text'] ?? '');
|
||||
|
||||
$noFinish = intval($request['nofinish'] ?? 0);
|
||||
|
||||
$share = intval($request['share'] ?? 0);
|
||||
$isPreview = intval($request['preview'] ?? 0);
|
||||
|
||||
$start = DateTimeFormat::convert($strStartDateTime ?? DBA::NULL_DATETIME, $this->timezone);
|
||||
if (!$noFinish) {
|
||||
$finish = DateTimeFormat::convert($strFinishDateTime ?? DBA::NULL_DATETIME, 'UTC', $this->timezone);
|
||||
} else {
|
||||
$finish = DBA::NULL_DATETIME;
|
||||
}
|
||||
|
||||
// Don't allow the event to finish before it begins.
|
||||
// It won't hurt anything, but somebody will file a bug report,
|
||||
// and we'll waste a bunch of time responding to it. Time that
|
||||
// could've been spent doing something else.
|
||||
|
||||
$summary = trim($request['summary'] ?? '');
|
||||
$desc = trim($request['desc'] ?? '');
|
||||
$location = trim($request['location'] ?? '');
|
||||
$type = 'event';
|
||||
|
||||
$params = [
|
||||
'summary' => $summary,
|
||||
'description' => $desc,
|
||||
'location' => $location,
|
||||
'start' => $strStartDateTime,
|
||||
'finish' => $strFinishDateTime,
|
||||
'nofinish' => $noFinish,
|
||||
];
|
||||
|
||||
$action = empty($eventId) ? 'new' : 'edit/' . $eventId;
|
||||
$redirectOnError = 'calendar/event/' . $action . '?' . http_build_query($params, '', '&', PHP_QUERY_RFC3986);
|
||||
|
||||
if (strcmp($finish, $start) < 0 && !$noFinish) {
|
||||
if ($isPreview) {
|
||||
System::httpExit($this->t('Event can not end before it has started.'));
|
||||
return;
|
||||
} else {
|
||||
$this->sysMessages->addNotice($this->t('Event can not end before it has started.'));
|
||||
$this->baseUrl->redirect($redirectOnError);
|
||||
}
|
||||
}
|
||||
|
||||
if (empty($summary) || ($start === DBA::NULL_DATETIME)) {
|
||||
if ($isPreview) {
|
||||
System::httpExit($this->t('Event title and start time are required.'));
|
||||
return;
|
||||
} else {
|
||||
$this->sysMessages->addNotice($this->t('Event title and start time are required.'));
|
||||
$this->baseUrl->redirect($redirectOnError);
|
||||
}
|
||||
}
|
||||
|
||||
$self = Contact::getPublicIdByUserId($uid);
|
||||
|
||||
$aclFormatter = $this->aclFormatter;
|
||||
|
||||
if ($share) {
|
||||
$user = User::getById($uid, ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']);
|
||||
if (empty($user)) {
|
||||
$this->logger->warning('Cannot find user for an event.', ['uid' => $uid, 'event' => $eventId]);
|
||||
$this->response->setStatus(500);
|
||||
return;
|
||||
}
|
||||
|
||||
$strAclContactAllow = isset($request['contact_allow']) ? $aclFormatter->toString($request['contact_allow']) : $user['allow_cid'] ?? '';
|
||||
$strAclGroupAllow = isset($request['group_allow']) ? $aclFormatter->toString($request['group_allow']) : $user['allow_gid'] ?? '';
|
||||
$strContactDeny = isset($request['contact_deny']) ? $aclFormatter->toString($request['contact_deny']) : $user['deny_cid'] ?? '';
|
||||
$strGroupDeny = 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
|
||||
$strAclContactAllow = $strAclGroupAllow = $strContactDeny = $strGroupDeny = '';
|
||||
} 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
|
||||
$strAclContactAllow .= $aclFormatter->toString($self);
|
||||
}
|
||||
} else {
|
||||
$strAclContactAllow = $aclFormatter->toString($self);
|
||||
$strAclGroupAllow = $strContactDeny = $strGroupDeny = '';
|
||||
}
|
||||
|
||||
$datarray = [
|
||||
'start' => $start,
|
||||
'finish' => $finish,
|
||||
'summary' => $summary,
|
||||
'desc' => $desc,
|
||||
'location' => $location,
|
||||
'type' => $type,
|
||||
'nofinish' => $noFinish,
|
||||
'uid' => $uid,
|
||||
'cid' => $cid,
|
||||
'allow_cid' => $strAclContactAllow,
|
||||
'allow_gid' => $strAclGroupAllow,
|
||||
'deny_cid' => $strContactDeny,
|
||||
'deny_gid' => $strGroupDeny,
|
||||
'id' => $eventId,
|
||||
];
|
||||
|
||||
if (intval($request['preview'])) {
|
||||
System::httpExit(Event::getHTML($datarray));
|
||||
return;
|
||||
}
|
||||
|
||||
$eventId = Event::store($datarray);
|
||||
|
||||
$newItem = Event::getItemArrayForId($eventId, [
|
||||
'network' => Protocol::DFRN,
|
||||
'protocol' => Conversation::PARCEL_DIRECT,
|
||||
'direction' => Conversation::PUSH
|
||||
]);
|
||||
if (Item::insert($newItem)) {
|
||||
$uriId = (int)$newItem['uri-id'];
|
||||
} else {
|
||||
$uriId = 0;
|
||||
}
|
||||
|
||||
if (!$cid && $uriId) {
|
||||
Worker::add(Worker::PRIORITY_HIGH, "Notifier", Delivery::POST, $uriId, $uid);
|
||||
}
|
||||
|
||||
$this->baseUrl->redirect('calendar');
|
||||
}
|
||||
}
|
||||
253
src/Module/Calendar/Event/Form.php
Normal file
253
src/Module/Calendar/Event/Form.php
Normal file
|
|
@ -0,0 +1,253 @@
|
|||
<?php
|
||||
/**
|
||||
* @copyright Copyright (C) 2010-2022, 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/>.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace Friendica\Module\Calendar\Event;
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\BaseModule;
|
||||
use Friendica\Content\Widget\CalendarExport;
|
||||
use Friendica\Core\ACL;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\Renderer;
|
||||
use Friendica\Core\Session\Capability\IHandleUserSessions;
|
||||
use Friendica\Model\Event as EventModel;
|
||||
use Friendica\Model\User;
|
||||
use Friendica\Module\Response;
|
||||
use Friendica\Module\Security\Login;
|
||||
use Friendica\Navigation\SystemMessages;
|
||||
use Friendica\Network\HTTPException\BadRequestException;
|
||||
use Friendica\Util\ACLFormatter;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
use Friendica\Util\Profiler;
|
||||
use Friendica\Util\Temporal;
|
||||
use Psr\Log\LoggerInterface;
|
||||
|
||||
/**
|
||||
* The editor-view of an event
|
||||
*/
|
||||
class Form extends BaseModule
|
||||
{
|
||||
const MODE_NEW = 'new';
|
||||
const MODE_EDIT = 'edit';
|
||||
const MODE_COPY = 'copy';
|
||||
|
||||
const ALLOWED_MODES = [
|
||||
self::MODE_NEW,
|
||||
self::MODE_EDIT,
|
||||
self::MODE_COPY,
|
||||
];
|
||||
|
||||
/** @var IHandleUserSessions */
|
||||
protected $session;
|
||||
/** @var SystemMessages */
|
||||
protected $sysMessages;
|
||||
/** @var ACLFormatter */
|
||||
protected $aclFormatter;
|
||||
/** @var App\Page */
|
||||
protected $page;
|
||||
|
||||
public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, SystemMessages $sysMessages, ACLFormatter $aclFormatter, App\Page $page, array $server, array $parameters = [])
|
||||
{
|
||||
parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
|
||||
|
||||
$this->session = $session;
|
||||
$this->sysMessages = $sysMessages;
|
||||
$this->aclFormatter = $aclFormatter;
|
||||
$this->page = $page;
|
||||
}
|
||||
|
||||
protected function content(array $request = []): string
|
||||
{
|
||||
if (empty($this->parameters['mode']) || !in_array($this->parameters['mode'], self::ALLOWED_MODES)) {
|
||||
throw new BadRequestException($this->t('Invalid Request'));
|
||||
}
|
||||
|
||||
if (!$this->session->getLocalUserId()) {
|
||||
$this->sysMessages->addNotice($this->t('Permission denied.'));
|
||||
return Login::form();
|
||||
}
|
||||
|
||||
$mode = $this->parameters['mode'];
|
||||
|
||||
if (($mode === self::MODE_EDIT || $mode === self::MODE_COPY)) {
|
||||
if (empty($this->parameters['id'])) {
|
||||
throw new BadRequestException('Invalid Request');
|
||||
}
|
||||
$orig_event = EventModel::getByIdAndUid($this->session->getLocalUserId(), $this->parameters['id']);
|
||||
if (empty($orig_event)) {
|
||||
throw new BadRequestException('Invalid Request');
|
||||
}
|
||||
}
|
||||
|
||||
if ($mode === self::MODE_NEW) {
|
||||
$this->session->set('return_path', $this->args->getCommand());
|
||||
}
|
||||
|
||||
// get the translation strings for the calendar
|
||||
$i18n = EventModel::getStrings();
|
||||
|
||||
$this->page->registerStylesheet('view/asset/fullcalendar/dist/fullcalendar.min.css');
|
||||
$this->page->registerStylesheet('view/asset/fullcalendar/dist/fullcalendar.print.min.css', 'print');
|
||||
$this->page->registerFooterScript('view/asset/moment/min/moment-with-locales.min.js');
|
||||
$this->page->registerFooterScript('view/asset/fullcalendar/dist/fullcalendar.min.js');
|
||||
|
||||
$htpl = Renderer::getMarkupTemplate('calendar/calendar_head.tpl');
|
||||
$this->page['htmlhead'] .= Renderer::replaceMacros($htpl, [
|
||||
'$calendar_api' => $this->baseUrl . '/calendar/api/get',
|
||||
'$event_api' => $this->baseUrl . '/calendar/event/show',
|
||||
'$modparams' => 2,
|
||||
'$i18n' => $i18n,
|
||||
]);
|
||||
|
||||
$share_checked = '';
|
||||
$share_disabled = '';
|
||||
|
||||
if (empty($orig_event)) {
|
||||
$orig_event = User::getById($this->session->getLocalUserId(), ['allow_cid', 'allow_gid', 'deny_cid',
|
||||
'deny_gid']);;
|
||||
} else if ($orig_event['allow_cid'] !== '<' . $this->session->getLocalUserId() . '>'
|
||||
|| $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['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" ' : '');
|
||||
|
||||
$t_orig = $orig_event['summary'] ?? '';
|
||||
$d_orig = $orig_event['desc'] ?? '';
|
||||
$l_orig = $orig_event['location'] ?? '';
|
||||
$eid = $orig_event['id'] ?? 0;
|
||||
$cid = $orig_event['cid'] ?? 0;
|
||||
$uri = $orig_event['uri'] ?? '';
|
||||
|
||||
if ($cid || $mode === 'edit') {
|
||||
$share_disabled = 'disabled="disabled"';
|
||||
}
|
||||
|
||||
$sdt = $orig_event['start'] ?? 'now';
|
||||
$fdt = $orig_event['finish'] ?? 'now';
|
||||
|
||||
$syear = DateTimeFormat::local($sdt, 'Y');
|
||||
$smonth = DateTimeFormat::local($sdt, 'm');
|
||||
$sday = DateTimeFormat::local($sdt, 'd');
|
||||
|
||||
$shour = !empty($orig_event) ? DateTimeFormat::local($sdt, 'H') : '00';
|
||||
$sminute = !empty($orig_event) ? DateTimeFormat::local($sdt, 'i') : '00';
|
||||
|
||||
$fyear = DateTimeFormat::local($fdt, 'Y');
|
||||
$fmonth = DateTimeFormat::local($fdt, 'm');
|
||||
$fday = DateTimeFormat::local($fdt, 'd');
|
||||
|
||||
$fhour = !empty($orig_event) ? DateTimeFormat::local($fdt, 'H') : '00';
|
||||
$fminute = !empty($orig_event) ? DateTimeFormat::local($fdt, 'i') : '00';
|
||||
|
||||
if (!$cid && in_array($mode, [self::MODE_NEW, self::MODE_COPY])) {
|
||||
$acl = ACL::getFullSelectorHTML($this->page, $this->session->getLocalUserId(), false, ACL::getDefaultUserPermissions($orig_event));
|
||||
} else {
|
||||
$acl = '';
|
||||
}
|
||||
|
||||
// If we copy an old event, we need to remove the ID and URI
|
||||
// from the original event.
|
||||
if ($mode === self::MODE_COPY) {
|
||||
$eid = 0;
|
||||
$uri = '';
|
||||
}
|
||||
|
||||
$this->page['aside'] .= CalendarExport::getHTML($this->session->getLocalUserId());
|
||||
|
||||
$tpl = Renderer::getMarkupTemplate('calendar/event_form.tpl');
|
||||
|
||||
return Renderer::replaceMacros($tpl, [
|
||||
'$post' => $this->baseUrl . '/calendar/api/create',
|
||||
'$eid' => $eid,
|
||||
'$cid' => $cid,
|
||||
'$uri' => $uri,
|
||||
|
||||
'$title' => $this->t('Event details'),
|
||||
'$desc' => $this->t('Starting date and Title are required.'),
|
||||
'$s_text' => $this->t('Event Starts:') . ' <span class="required" title="' . $this->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"),
|
||||
$this->t('Event Starts:'),
|
||||
'start_text',
|
||||
true,
|
||||
true,
|
||||
'',
|
||||
'',
|
||||
true
|
||||
),
|
||||
'$n_text' => $this->t('Finish date/time is not known or not relevant'),
|
||||
'$n_checked' => $n_checked,
|
||||
'$f_text' => $this->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"),
|
||||
$this->t('Event Finishes:'),
|
||||
'finish_text',
|
||||
true,
|
||||
true,
|
||||
'start_text'
|
||||
),
|
||||
'$d_text' => $this->t('Description:'),
|
||||
'$d_orig' => $d_orig,
|
||||
'$l_text' => $this->t('Location:'),
|
||||
'$l_orig' => $l_orig,
|
||||
'$t_text' => $this->t('Title:') . ' <span class="required" title="' . $this->t('Required') . '">*</span>',
|
||||
'$t_orig' => $t_orig,
|
||||
'$summary' => ['summary', $this->t('Title:'), $t_orig, '', '*'],
|
||||
'$sh_text' => $this->t('Share this event'),
|
||||
'$share' => ['share', $this->t('Share this event'), $share_checked, '', $share_disabled],
|
||||
'$sh_checked' => $share_checked,
|
||||
'$nofinish' => ['nofinish', $this->t('Finish date/time is not known or not relevant'), $n_checked],
|
||||
'$preview' => $this->t('Preview'),
|
||||
'$acl' => $acl,
|
||||
'$submit' => $this->t('Submit'),
|
||||
'$basic' => $this->t('Basic'),
|
||||
'$advanced' => $this->t('Advanced'),
|
||||
'$permissions' => $this->t('Permissions'),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
@ -19,90 +19,58 @@
|
|||
*
|
||||
*/
|
||||
|
||||
namespace Friendica\Module\Calendar;
|
||||
namespace Friendica\Module\Calendar\Event;
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\Session\Capability\IHandleUserSessions;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\DI;
|
||||
use Friendica\Model\Event;
|
||||
use Friendica\Model\Item;
|
||||
use Friendica\Model\Post;
|
||||
use Friendica\Module\Response;
|
||||
use Friendica\Network\HTTPException;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
use Friendica\Util\Temporal;
|
||||
use Friendica\Util\Profiler;
|
||||
use Psr\Log\LoggerInterface;
|
||||
|
||||
class Json extends \Friendica\BaseModule
|
||||
/**
|
||||
* GET-Controller for event
|
||||
* returns the result as JSON
|
||||
*/
|
||||
class Get extends \Friendica\BaseModule
|
||||
{
|
||||
/** @var IHandleUserSessions */
|
||||
protected $session;
|
||||
|
||||
public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, array $server, array $parameters = [])
|
||||
{
|
||||
parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
|
||||
|
||||
$this->session = $session;
|
||||
}
|
||||
|
||||
protected function rawContent(array $request = [])
|
||||
{
|
||||
if (!DI::userSession()->getLocalUserId()) {
|
||||
if (!$this->session->getLocalUserId()) {
|
||||
throw new HTTPException\UnauthorizedException();
|
||||
}
|
||||
|
||||
$y = intval(DateTimeFormat::localNow('Y'));
|
||||
$m = intval(DateTimeFormat::localNow('m'));
|
||||
|
||||
// Put some limit on dates. The PHP date functions don't seem to do so well before 1900.
|
||||
if ($y < 1901) {
|
||||
$y = 1900;
|
||||
}
|
||||
|
||||
$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 (!empty($request['start'])) {
|
||||
$start = $request['start'];
|
||||
}
|
||||
|
||||
if (!empty($request['end'])) {
|
||||
$finish = $request['end'];
|
||||
}
|
||||
|
||||
// put the event parametes in an array so we can better transmit them
|
||||
$event_params = [
|
||||
'event_id' => intval($request['id'] ?? 0),
|
||||
'start' => $start,
|
||||
'finish' => $finish,
|
||||
'ignore' => 0,
|
||||
];
|
||||
|
||||
// get events by id or by date
|
||||
if ($event_params['event_id']) {
|
||||
$r = Event::getListById(DI::userSession()->getLocalUserId(), $event_params['event_id']);
|
||||
if (!empty($request['id'])) {
|
||||
$events = [Event::getByIdAndUid($this->session->getLocalUserId(), $request['id'], $this->parameters['nickname'] ?? null)];
|
||||
} else {
|
||||
$r = Event::getListByDate(DI::userSession()->getLocalUserId(), $event_params);
|
||||
$events = Event::getListByDate($this->session->getLocalUserId(), $request['start'] ?? '', $request['end'] ?? '', false, $this->parameters['nickname'] ?? null);
|
||||
}
|
||||
|
||||
$links = [];
|
||||
|
||||
if (DBA::isResult($r)) {
|
||||
$r = Event::sortByDate($r);
|
||||
foreach ($r as $rr) {
|
||||
$j = DateTimeFormat::utc($rr['start'], 'j');
|
||||
if (empty($links[$j])) {
|
||||
$links[$j] = DI::baseUrl() . '/' . DI::args()->getCommand() . '#link-' . $j;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$events = [];
|
||||
|
||||
// transform the event in a usable array
|
||||
if (DBA::isResult($r)) {
|
||||
$events = Event::sortByDate($r);
|
||||
|
||||
$events = self::map($events);
|
||||
}
|
||||
|
||||
System::jsonExit($events);
|
||||
System::jsonExit($events ? self::map($events) : []);
|
||||
}
|
||||
|
||||
private static function map(array $events): array
|
||||
{
|
||||
return array_map(function ($event) {
|
||||
$item = Post::selectFirst(['plink', 'author-name', 'author-avatar', 'author-link', 'private', 'uri-id'], ['id' => $event['itemid']]);
|
||||
if (!DBA::isResult($item)) {
|
||||
if (empty($item)) {
|
||||
// Using default values when no item had been found
|
||||
$item = ['plink' => '', 'author-name' => '', 'author-avatar' => '', 'author-link' => '', 'private' => Item::PUBLIC, 'uri-id' => ($event['uri-id'] ?? 0)];
|
||||
}
|
||||
84
src/Module/Calendar/Event/Show.php
Normal file
84
src/Module/Calendar/Event/Show.php
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
<?php
|
||||
/**
|
||||
* @copyright Copyright (C) 2010-2022, 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/>.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace Friendica\Module\Calendar\Event;
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\BaseModule;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\Renderer;
|
||||
use Friendica\Core\Session\Capability\IHandleUserSessions;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Model\Event;
|
||||
use Friendica\Module\Response;
|
||||
use Friendica\Network\HTTPException;
|
||||
use Friendica\Util\Profiler;
|
||||
use Psr\Log\LoggerInterface;
|
||||
|
||||
/**
|
||||
* Displays one specific event in a <div> container
|
||||
*/
|
||||
class Show extends BaseModule
|
||||
{
|
||||
/** @var IHandleUserSessions */
|
||||
protected $session;
|
||||
|
||||
public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, array $server, array $parameters = [])
|
||||
{
|
||||
parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
|
||||
|
||||
$this->session = $session;
|
||||
}
|
||||
|
||||
protected function rawContent(array $request = [])
|
||||
{
|
||||
if (!$this->session->getLocalUserId()) {
|
||||
throw new HTTPException\UnauthorizedException($this->t('Permission denied.'));
|
||||
}
|
||||
|
||||
if (empty($this->parameters['id'])) {
|
||||
throw new HTTPException\BadRequestException($this->t('Invalid Request'));
|
||||
}
|
||||
|
||||
$event = Event::getByIdAndUid($this->session->getLocalUserId(), (int)$this->parameters['id'], $this->parameters['nickname'] ?? '');
|
||||
|
||||
if (empty($event)) {
|
||||
throw new HTTPException\NotFoundException($this->t('Event not found.'));
|
||||
}
|
||||
|
||||
$tplEvent = Event::prepareForItem($event);
|
||||
|
||||
$event_item = [];
|
||||
foreach ($tplEvent['item'] as $k => $v) {
|
||||
$k = str_replace('-', '_', $k);
|
||||
$event_item[$k] = $v;
|
||||
}
|
||||
$tplEvent['item'] = $event_item;
|
||||
|
||||
$tpl = Renderer::getMarkupTemplate('calendar/event.tpl');
|
||||
|
||||
$o = Renderer::replaceMacros($tpl, [
|
||||
'$event' => $tplEvent,
|
||||
]);
|
||||
|
||||
System::httpExit($o);
|
||||
}
|
||||
}
|
||||
|
|
@ -82,9 +82,9 @@ class Export extends BaseModule
|
|||
// If it is the own calendar return to the events page
|
||||
// otherwise to the profile calendar page
|
||||
if ($this->session->getLocalUserId() === $ownerUid) {
|
||||
$returnPath = 'events';
|
||||
$returnPath = 'calendar';
|
||||
} else {
|
||||
$returnPath = 'events/' . $this->parameters['nickname'];
|
||||
$returnPath = 'calendar/show/' . $this->parameters['nickname'];
|
||||
}
|
||||
|
||||
$this->baseUrl->redirect($returnPath);
|
||||
|
|
|
|||
133
src/Module/Calendar/Show.php
Normal file
133
src/Module/Calendar/Show.php
Normal file
|
|
@ -0,0 +1,133 @@
|
|||
<?php
|
||||
/**
|
||||
* @copyright Copyright (C) 2010-2022, 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/>.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace Friendica\Module\Calendar;
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\BaseModule;
|
||||
use Friendica\Content\Nav;
|
||||
use Friendica\Content\Widget;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\Renderer;
|
||||
use Friendica\Core\Session\Capability\IHandleUserSessions;
|
||||
use Friendica\Core\Theme;
|
||||
use Friendica\Model\Event;
|
||||
use Friendica\Module\BaseProfile;
|
||||
use Friendica\Module\Response;
|
||||
use Friendica\Module\Security\Login;
|
||||
use Friendica\Navigation\SystemMessages;
|
||||
use Friendica\Util\Profiler;
|
||||
use Psr\Log\LoggerInterface;
|
||||
|
||||
class Show extends BaseModule
|
||||
{
|
||||
/** @var IHandleUserSessions */
|
||||
protected $session;
|
||||
/** @var SystemMessages */
|
||||
protected $sysMessages;
|
||||
/** @var App\Page */
|
||||
protected $page;
|
||||
/** @var App */
|
||||
protected $app;
|
||||
|
||||
public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, SystemMessages $sysMessages, App\Page $page, App $app, array $server, array $parameters = [])
|
||||
{
|
||||
parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
|
||||
|
||||
$this->session = $session;
|
||||
$this->sysMessages = $sysMessages;
|
||||
$this->page = $page;
|
||||
$this->app = $app;
|
||||
}
|
||||
|
||||
protected function content(array $request = []): string
|
||||
{
|
||||
if (!$this->session->getLocalUserId()) {
|
||||
$this->sysMessages->addNotice($this->t('Permission denied.'));
|
||||
return Login::form();
|
||||
}
|
||||
|
||||
// get the translation strings for the calendar
|
||||
$i18n = Event::getStrings();
|
||||
|
||||
$this->page->registerStylesheet('view/asset/fullcalendar/dist/fullcalendar.min.css');
|
||||
$this->page->registerStylesheet('view/asset/fullcalendar/dist/fullcalendar.print.min.css', 'print');
|
||||
$this->page->registerFooterScript('view/asset/moment/min/moment-with-locales.min.js');
|
||||
$this->page->registerFooterScript('view/asset/fullcalendar/dist/fullcalendar.min.js');
|
||||
|
||||
$htpl = Renderer::getMarkupTemplate('calendar/calendar_head.tpl');
|
||||
$this->page['htmlhead'] .= Renderer::replaceMacros($htpl, [
|
||||
'$calendar_api' => $this->baseUrl . '/calendar/api/get' . (!empty($this->parameters['nickname']) ? '/' . $this->parameters['nickname'] : ''),
|
||||
'$event_api' => $this->baseUrl . '/calendar/event/show' . (!empty($this->parameters['nickname']) ? '/' . $this->parameters['nickname'] : ''),
|
||||
'$modparams' => 2,
|
||||
'$i18n' => $i18n,
|
||||
]);
|
||||
|
||||
$tabs = '';
|
||||
|
||||
if (empty($this->parameters['nickname'])) {
|
||||
if ($this->app->getThemeInfoValue('events_in_profile')) {
|
||||
Nav::setSelected('home');
|
||||
} else {
|
||||
Nav::setSelected('calendar');
|
||||
}
|
||||
|
||||
// tabs
|
||||
if ($this->app->getThemeInfoValue('events_in_profile')) {
|
||||
$tabs = BaseProfile::getTabsHTML($this->app, 'calendar', true, $this->app->getLoggedInUserNickname(), false);
|
||||
}
|
||||
|
||||
$this->page['aside'] .= Widget\CalendarExport::getHTML($this->session->getLocalUserId());
|
||||
} else {
|
||||
$owner = Event::getOwnerForNickname($this->parameters['nickname'], true);
|
||||
|
||||
Nav::setSelected('calendar');
|
||||
|
||||
// get the tab navigation bar
|
||||
$tabs = BaseProfile::getTabsHTML($this->app, 'calendar', false, $owner['nickname'], $owner['hide-friends']);
|
||||
|
||||
$this->page['aside'] .= Widget\VCard::getHTML($owner);
|
||||
$this->page['aside'] .= Widget\CalendarExport::getHTML($owner['uid']);
|
||||
}
|
||||
|
||||
// ACL blocks are loaded in modals in frio
|
||||
$this->page->registerFooterScript(Theme::getPathForFile('asset/typeahead.js/dist/typeahead.bundle.js'));
|
||||
$this->page->registerFooterScript(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.js'));
|
||||
$this->page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css'));
|
||||
$this->page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css'));
|
||||
|
||||
$tpl = Renderer::getMarkupTemplate("calendar/calendar.tpl");
|
||||
$o = Renderer::replaceMacros($tpl, [
|
||||
'$tabs' => $tabs,
|
||||
'$title' => $this->t('Events'),
|
||||
'$view' => $this->t('View'),
|
||||
'$new_event' => [$this->baseUrl . '/calendar/event/new', $this->t('Create New Event'), '', ''],
|
||||
|
||||
'$today' => $this->t('today'),
|
||||
'$month' => $this->t('month'),
|
||||
'$week' => $this->t('week'),
|
||||
'$day' => $this->t('day'),
|
||||
'$list' => $this->t('list'),
|
||||
]);
|
||||
|
||||
return $o;
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue