diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php index e74d6f63fd..d3661836fb 100644 --- a/calendar/inc/class.calendar_boupdate.inc.php +++ b/calendar/inc/class.calendar_boupdate.inc.php @@ -1165,8 +1165,8 @@ class calendar_boupdate extends calendar_bo array('egw_pr_notify' => 1, 'type' => $m_type, 'videoconference' => $details['videoconference'], - 'account_id' => $userid, - 'name' => $fullname + 'account_id' => $senderid, + 'name' => Api\Accounts::username($senderid) ) + ($alarm ? ['alarm-offset' => (int)$alarm['offset']] : [])); } diff --git a/notifications/js/notificationajaxpopup.js b/notifications/js/notificationajaxpopup.js index 9c124ed4b6..aeec94ecf2 100644 --- a/notifications/js/notificationajaxpopup.js +++ b/notifications/js/notificationajaxpopup.js @@ -358,8 +358,13 @@ case EGW_PR_NOTIFY_HEIGH: if (notifymessages[id]['extra_data']['videoconference'] && notifymessages[id]['extra_data']['alarm-offset'] <= 300) { - app.status.notificationPopup(notifymessages[id]['extra_data']['videoconference'], - notifymessages[id]['extra_data']['account_id'], notifymessages[id]['extra_data']['name']); + app.status.scheduled_receivedCall({ + url: notifymessages[id]['extra_data']['videoconference'], + account_id: notifymessages[id]['extra_data']['account_id'], + avatar: 'account:'+ notifymessages[id]['extra_data']['account_id'], + title: notifymessages[id]['data']['title'], + owner: notifymessages[id]['extra_data']['name'] + }); } else { this.toggle(true);