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

- Set dates back to original timezone when done writing

Browse Source 
- Use usertime for importing email, same as displayed in felamimail
This commit is contained in:
Nathan Gray 2011-06-15 17:32:12 +00:00
parent 1c600b919d
commit d90a2c1ade
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
infolog/inc/class.infolog_bo.inc.php
View File

@ -762,7 +762,7 @@ class infolog_bo
$status = 'done'; $status = 'done';
if (isset($values['info_type'])) { if (isset($values['info_type'])) {
if (isset($this->status[$values['info_type']]['done'])) { if (isset($this->status[$values['info_type']]['done'])) {
$status = 'done'; $status = 'done';
} elseif (isset($this->status[$values['info_type']]['billed'])) { } elseif (isset($this->status[$values['info_type']]['billed'])) {
$status = 'billed'; $status = 'billed';
} elseif (isset($this->status[$values['info_type']]['cancelled'])) { } elseif (isset($this->status[$values['info_type']]['cancelled'])) {
@ -943,6 +943,11 @@ class infolog_bo
if ($info_from_set) $values['info_from'] = ''; if ($info_from_set) $values['info_from'] = '';
// Change new values back to user time before sending them back
if($user2server)
{
$this->time2time($values);
}
// merge changes (keeping extra values from the UI) // merge changes (keeping extra values from the UI)
$values_in = array_merge($values_in,$values); $values_in = array_merge($values_in,$values);
} }
@ -1066,7 +1071,7 @@ class infolog_bo
'info_addr' => implode(', ',$email), 'info_addr' => implode(', ',$email),
'info_subject' => $_subject, 'info_subject' => $_subject,
'info_des' => $_message, 'info_des' => $_message,
'info_startdate' => $_date, 'info_startdate' => egw_time::server2user($_date),
'info_status' => $status, 'info_status' => $status,
'info_priority' => 1, 'info_priority' => 1,
'info_percent' => $status == 'done' ? 100 : 0, 'info_percent' => $status == 'done' ? 100 : 0,