extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar: fix for missing 2568to-firstname2568 and 2568to-lastname2568 replacements

Browse Source
This commit is contained in:
Klaus Leithoff 2012-12-06 12:01:05 +00:00
parent cbb88e22cb
commit 83981b9cad
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -795,13 +795,13 @@ class calendar_boupdate extends calendar_bo
$user_prefs['calendar']['receive_own_updates']==1) || $user_prefs['calendar']['receive_own_updates']==1) ||
$msg_type == MSG_ALARM) $msg_type == MSG_ALARM)
{ {
unset($tfn); unset($tln); //cleanup of lastname and fullname (in case they are set in a previous loop)
if (is_numeric($userid)) if (is_numeric($userid))
{ {
$preferences = new preferences($userid); $preferences = new preferences($userid);
$GLOBALS['egw_info']['user']['preferences'] = $part_prefs = $preferences->read_repository(); $GLOBALS['egw_info']['user']['preferences'] = $part_prefs = $preferences->read_repository();
$GLOBALS['egw']->accounts->get_account_name($userid,$lid,$tfn,$tln);
$GLOBALS['egw']->accounts->get_account_name($userid,$lid,$details['to-firstname'],$details['to-lastname']); $fullname = common::display_fullname('',$tfn,$tln);
$fullname = common::display_fullname('',$details['to-firstname'],$details['to-lastname']);
} }
else // external email address: use preferences of event-owner, plus some hardcoded settings (eg. ical notification) else // external email address: use preferences of event-owner, plus some hardcoded settings (eg. ical notification)
{ {
@ -828,6 +828,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;
if (isset($tln)) $details['to-lastname'] = $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'];