holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calendar: Event from mail now defaults to start of next hour to match other places, instead of time the email was sent

Browse Source
This commit is contained in:
nathangray 2020-04-27 11:02:26 -06:00
parent 631be5769d
commit 515bad6d3b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -3375,7 +3375,8 @@ class calendar_uiforms extends calendar_ui
));
// Prepare calendar event draft
$event = array(
$event = $this->default_add_event();
$event = array_merge($event, array(
'title' => $mailContent['subject'],
'description' => $mailContent['message'],
'participants' => $participants,
@ -3383,10 +3384,16 @@ class calendar_uiforms extends calendar_ui
'to_app' => 'calendar',
'to_id' => 0,
),
'start' => $mailContent['date'],
'duration' => 60 * $this->cal_prefs['interval'],
'owner' => $GLOBALS['egw_info']['user']['account_id']
);
));
$ts = new Api\DateTime();
$ts->setUser();
if($mailContent['date'] >= $ts->format('ts'))
{
// Mail from the future! Ok, use that date
$event['start'] = $mailContent['date'];
}
if (is_array($mailContent['attachments']))
{