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

"properly restoring user enviroment, after notifications send: spezially timezone"

Browse Source
This commit is contained in:
Ralf Becker 2009-11-07 12:09:12 +00:00
parent e98c7b8770
commit 3de5e87288
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -412,6 +412,7 @@ class calendar_boupdate extends calendar_bo
*/ */
function send_update($msg_type,$to_notify,$old_event,$new_event=null,$user=0) function send_update($msg_type,$to_notify,$old_event,$new_event=null,$user=0)
{ {
//echo "<p>".__METHOD__."($msg_type,".array2string($to_notify).",,$new_event[title],$user)</p>\n";
if (!is_array($to_notify)) if (!is_array($to_notify))
{ {
$to_notify = array(); $to_notify = array();
@ -438,7 +439,7 @@ class calendar_boupdate extends calendar_bo
} }
if ($GLOBALS['egw']->preferences->account_id != $user) if ($GLOBALS['egw']->preferences->account_id != $user)
{ {
$GLOBALS['egw']->preferences->preferences($user); $GLOBALS['egw']->preferences->__construct($user);
$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(); $GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository();
} }
$senderid = $GLOBALS['egw_info']['user']['account_id']; $senderid = $GLOBALS['egw_info']['user']['account_id'];
@ -612,10 +613,14 @@ class calendar_boupdate extends calendar_bo
} }
} }
} }
// restore the enviroment // restore the enviroment (preferences->read_repository() sets the timezone!)
$GLOBALS['egw_info']['user'] = $temp_user; $GLOBALS['egw_info']['user'] = $temp_user;
$GLOBALS['egw']->datetime->tz_offset = 3600 * $GLOBALS['egw_info']['user']['preferences']['common']['tz_offset']; if ($GLOBALS['egw']->preferences->account_id != $temp_user['account_id'] || isset($preferences))
{
$GLOBALS['egw']->preferences->__construct($temp_user['account_id']);
$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository();
//echo "<p>".__METHOD__."() restored enviroment of #$temp_user[account_id] $temp_user[account_fullname]: tz={$GLOBALS['egw_info']['user']['preferences']['common']['tz']}</p>\n";
}
return true; return true;
} }