extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

"fix an other case of empty enddate get set to \"something\""

Browse Source
This commit is contained in:
Ralf Becker 2010-03-24 08:15:36 +00:00
parent 8d033f95f8
commit de947ef466
1 changed files with 16 additions and 9 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

@ -711,7 +711,7 @@ class infolog_bo
$status = 'done'; $status = 'done';
if (isset($values['info_type']) && !in_array($values['info_status'],array('done','billed','cancelled'))) { if (isset($values['info_type']) && !in_array($values['info_status'],array('done','billed','cancelled'))) {
$forcestatus = false; $forcestatus = false;
echo "set_completed:"; _debug_array($this->status[$values['info_type']]); //echo "set_completed:"; _debug_array($this->status[$values['info_type']]);
if (isset($this->status[$values['info_type']]['done'])) { if (isset($this->status[$values['info_type']]['done'])) {
$forcestatus = true; $forcestatus = true;
$status = 'done'; $status = 'done';
@ -791,17 +791,24 @@ class infolog_bo
{ {
// convert user- to server-time // convert user- to server-time
$this->time2time($to_write, null, false); $this->time2time($to_write, null, false);
if (!empty($values['info_enddate']))
{
$time = new egw_time($values['info_enddate'], egw_time::$user_timezone); $time = new egw_time($values['info_enddate'], egw_time::$user_timezone);
// Set due date to 00:00 // Set due date to 00:00
$time->setTime(0, 0, 0); $time->setTime(0, 0, 0);
$values['info_enddate'] = egw_time::to($time,'ts'); $values['info_enddate'] = egw_time::to($time,'ts');
} }
}
else else
{
if (!empty($values['info_enddate']))
{ {
$time = new egw_time($values['info_enddate'], egw_time::$server_timezone); $time = new egw_time($values['info_enddate'], egw_time::$server_timezone);
// Set due date to 00:00 // Set due date to 00:00
$time->setTime(0, 0, 0); $time->setTime(0, 0, 0);
$to_write['info_enddate'] = egw_time::to($time,'ts'); $to_write['info_enddate'] = egw_time::to($time,'ts');
}
// convert server- to user-time // convert server- to user-time
$this->time2time($values); $this->time2time($values);
} }