extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-07-01 07:02:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar: Fix calendar to-firstname to-lastname place-holders do not get values

Browse Source
This commit is contained in:
Hadi Nategh
2016-10-04 16:38:58 +02:00
parent f44766ebba
commit caf5217f7a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -906,6 +906,8 @@ class calendar_boupdate extends calendar_bo
$preferences = new Api\Preferences($userid); $preferences = new Api\Preferences($userid);
$GLOBALS['egw_info']['user']['preferences'] = $part_prefs = $preferences->read_repository(); $GLOBALS['egw_info']['user']['preferences'] = $part_prefs = $preferences->read_repository();
$fullname = Api\Accounts::username($userid); $fullname = Api\Accounts::username($userid);
$tfn = Api\Accounts::id2name($userid,'account_firstname');
$tln = Api\Accounts::id2name($userid,'account_lastname');
} }
else // external email address: use Api\Preferences of event-owner, plus some hardcoded settings (eg. ical notification) else // external email address: use Api\Preferences of event-owner, plus some hardcoded settings (eg. ical notification)
{ {
@ -937,8 +939,8 @@ class calendar_boupdate extends calendar_bo
$details = $this->_get_event_details(isset($cleared_event) ? $cleared_event : $event, $details = $this->_get_event_details(isset($cleared_event) ? $cleared_event : $event,
$action, $event_arr, $disinvited); $action, $event_arr, $disinvited);
$details['to-fullname'] = $fullname; $details['to-fullname'] = $fullname;
if (isset($tfn)) $details['to-firstname'] = $tfn; $details['to-firstname'] = isset($tfn)? $tfn: '';
if (isset($tln)) $details['to-lastname'] = $tln; $details['to-lastname'] = isset($tln)? $tln: '';
// event is in user-time of current user, now we need to calculate the tz-difference to the notified user and take it into account // event is in user-time of current user, now we need to calculate the tz-difference to the notified user and take it into account
if (!isset($part_prefs['common']['tz'])) $part_prefs['common']['tz'] = $GLOBALS['egw_info']['server']['server_timezone']; if (!isset($part_prefs['common']['tz'])) $part_prefs['common']['tz'] = $GLOBALS['egw_info']['server']['server_timezone'];