Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Calendar: Fix attaching files on event creation

Browse source
This commit is contained in:
Aleksander Machniak 2022-01-13 12:12:20 +01:00
parent 2dc22ac017
commit 24d2633ff6
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/calendar/calendar.php
View file

@ -2349,7 +2349,7 @@ $("#rcmfd_new_category").keypress(function(event) {
} }
$attachments = []; $attachments = [];
$eventid = 'cal-' . (!empty($event['id']) ? $event['id'] : 'new-event'); $eventid = 'cal-' . (!empty($event['id']) ? $event['id'] : 'new');
if (!empty($_SESSION[self::SESSION_KEY]) && $_SESSION[self::SESSION_KEY]['id'] == $eventid) { if (!empty($_SESSION[self::SESSION_KEY]) && $_SESSION[self::SESSION_KEY]['id'] == $eventid) {
if (!empty($_SESSION[self::SESSION_KEY]['attachments'])) { if (!empty($_SESSION[self::SESSION_KEY]['attachments'])) {

2
plugins/calendar/calendar_ui.js
View file

@ -399,7 +399,7 @@ function rcube_calendar_ui(settings)
$('#event-alarm').show().find('.event-text').html(Q(event.alarms_text).replace(',', ',<br>')); $('#event-alarm').show().find('.event-text').html(Q(event.alarms_text).replace(',', ',<br>'));
if (calendar.name) if (calendar.name)
$('#event-calendar').show().find('.event-text').html(Q(calendar.name)).addClass('cal-'+calendar.id); $('#event-calendar').show().find('.event-text').html(Q(calendar.name)).addClass('cal-'+calendar.id);
if (event.categories) if (event.categories && String(event.categories).length)
$('#event-category').show().find('.event-text').text(event.categories).addClass('cat-'+String(event.categories).toLowerCase().replace(rcmail.identifier_expr, '')); $('#event-category').show().find('.event-text').text(event.categories).addClass('cat-'+String(event.categories).toLowerCase().replace(rcmail.identifier_expr, ''));
if (event.free_busy) if (event.free_busy)
$('#event-free-busy').show().find('.event-text').text(rcmail.gettext(event.free_busy, 'calendar')); $('#event-free-busy').show().find('.event-text').text(rcmail.gettext(event.free_busy, 'calendar'));

3
plugins/libkolab/lib/kolab_attachments_handler.php
View file

@ -114,8 +114,9 @@ class kolab_attachments_handler
$this->rc->upload_progress(); $this->rc->upload_progress();
} }
$recid = $id_prefix . rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC); $id = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
$uploadid = rcube_utils::get_input_value('_uploadid', rcube_utils::INPUT_GPC); $uploadid = rcube_utils::get_input_value('_uploadid', rcube_utils::INPUT_GPC);
$recid = $id_prefix . ($id ?: 'new');
if (empty($_SESSION[$session_key]) || $_SESSION[$session_key]['id'] != $recid) { if (empty($_SESSION[$session_key]) || $_SESSION[$session_key]['id'] != $recid) {
$_SESSION[$session_key] = array(); $_SESSION[$session_key] = array();