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

fix for bug [ 1007297 ] Time offsets incorrect

Browse Source 
==> all tz-conversation is done now in the bo-class, as I handle it in the new calendar too
This commit is contained in:
Ralf Becker 2004-08-28 18:02:16 +00:00
parent ff47845902
commit 9e50e0f07d
2 changed files with 54 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
infolog/inc/class.boinfolog.inc.php
View File

@ -62,6 +62,14 @@
); );
var $xmlrpc = False; // called via xmlrpc var $xmlrpc = False; // called via xmlrpc
/**
* @var int $tz_offset_s offset in secconds between user and server-time,
* it need to be add to a server-time to get the user-time or substracted from a user-time to get the server-time
*/
var $tz_offset = 0;
var $tz_offset_s = 0;
var $user_time_now;
function boinfolog( $info_id = 0) function boinfolog( $info_id = 0)
{ {
$this->enums = $this->stock_enums = array( $this->enums = $this->stock_enums = array(
@ -130,8 +138,13 @@
$this->customfields = $this->config->config_data['customfields']; $this->customfields = $this->config->config_data['customfields'];
} }
} }
/**
* @var int $tz_offset_s offset in secconds between user and server-time,
* it need to be add to a server-time to get the user-time or substracted from a user-time to get the server-time
*/
$this->tz_offset = $GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']; $this->tz_offset = $GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'];
$this->tz_offset_sec = 60*60*$this->tz_offset; $this->tz_offset_s = 60*60*$this->tz_offset;
$this->user_time_now = time() + $this->tz_offset_s;
// are we called via xmlrpc? // are we called via xmlrpc?
$this->xmlrpc = is_object($GLOBALS['server']) && $GLOBALS['server']->last_method; $this->xmlrpc = is_object($GLOBALS['server']) && $GLOBALS['server']->last_method;
@ -211,7 +224,7 @@
return substr($des,0,60).' ...'; return substr($des,0,60).' ...';
} }
function read($info_id) function &read($info_id)
{ {
if (is_array($info_id)) if (is_array($info_id))
{ {
@ -234,14 +247,20 @@
} }
return False; return False;
} }
$data = &$this->so->data; $data = $this->so->data;
if ($data['info_subject'] == $this->subject_from_des($data['info_des'])) if ($data['info_subject'] == $this->subject_from_des($data['info_des']))
{ {
$data['info_subject'] = ''; $data['info_subject'] = '';
} }
$this->link_id2from($data); $this->link_id2from($data);
echo "<p>boinfolog::read($info_id) start=$data[info_startdate]=".date('Y-m-d H:i:s',$data['info_startdate']).", modified=$data[info_datemodified]=".date('Y-m-d H:i:s',$data['info_datemodified'])."</p>\n";
// convert system- to user-time
foreach(array('info_startdate','info_enddate','info_datemodified') as $time)
{
if ($data[$time]) $data[$time] += $this->tz_offset_s;
}
echo "<p>boinfolog::read($info_id) start=$data[info_startdate]=".date('Y-m-d H:i:s',$data['info_startdate']).", modified=$data[info_datemodified]=".date('Y-m-d H:i:s',$data['info_datemodified'])."</p>\n";
if ($this->xmlrpc) if ($this->xmlrpc)
{ {
$data = $this->data2xmlrpc($data); $data = $this->data2xmlrpc($data);
@ -316,7 +335,7 @@
); );
if ($set_enddate) if ($set_enddate)
{ {
$values['info_enddate'] = time(); $values['info_enddate'] = $this->user_time_now;
} }
$check_defaults = False; $check_defaults = False;
} }
@ -325,7 +344,7 @@
if (!$values['info_enddate'] && if (!$values['info_enddate'] &&
($values['info_status'] == 'done' || $values['info_status'] == 'billed')) ($values['info_status'] == 'done' || $values['info_status'] == 'billed'))
{ {
$values['info_enddate'] = time(); // set enddate to today if status == done $values['info_enddate'] = $this->user_time_now; // set enddate to today if status == done
} }
if ($values['info_responsible'] && $values['info_status'] == 'offer') if ($values['info_responsible'] && $values['info_status'] == 'offer')
{ {
@ -346,12 +365,17 @@
} }
if ($touch_modified || !$values['info_datemodified']) if ($touch_modified || !$values['info_datemodified'])
{ {
$values['info_datemodified'] = time(); $values['info_datemodified'] = $this->user_time_now;
} }
if ($touch_modified || !$values['info_modifier']) if ($touch_modified || !$values['info_modifier'])
{ {
$values['info_modifier'] = $this->so->user; $values['info_modifier'] = $this->so->user;
} }
// convert user- to system-time
foreach(array('info_startdate','info_enddate','info_datemodified') as $time)
{
if ($values[$time]) $values[$time] -= $this->tz_offset_s;
}
return $this->so->write($values); return $this->so->write($values);
} }
@ -374,10 +398,22 @@
@param $query[col_filter] array with column-name - data pairs, data == '' means no filter (!) @param $query[col_filter] array with column-name - data pairs, data == '' means no filter (!)
@returns array with id's as key of the matching log-entries @returns array with id's as key of the matching log-entries
*/ */
function search(&$query) function &search(&$query)
{ {
//echo "<p>boinfolog::search(".print_r($query,True).")</p>\n"; //echo "<p>boinfolog::search(".print_r($query,True).")</p>\n";
$ret = $this->so->search($query); $ret = $this->so->search($query);
// convert system- to user-time
if (is_array($ret) && $this->tz_offset_s)
{
foreach($ret as $id => $data)
{
foreach(array('info_startdate','info_enddate','info_datemodified') as $time)
{
if ($data[$time]) $ret[$id][$time] += $this->tz_offset_s;
}
}
}
if ($this->xmlrpc && is_array($ret)) if ($this->xmlrpc && is_array($ret))
{ {
$infos = $ret; $infos = $ret;
@ -472,14 +508,14 @@
{ {
foreach($infos as $info) foreach($infos as $info)
{ {
$time = intval(date('Hi',$info['info_startdate']+$this->tz_offset_sec)); $time = intval(date('Hi',$info['info_startdate']));
$date = date('Y/m/d',$info['info_startdate']+$this->tz_offset_sec); $date = date('Y/m/d',$info['info_startdate']);
if ($do_events && !$time || if ($do_events && !$time ||
!$do_events && $time && $date == $date_wanted) !$do_events && $time && $date == $date_wanted)
{ {
continue; continue;
} }
$title = ($do_events?$GLOBALS['phpgw']->common->formattime(date('H',$info['info_startdate']+$this->tz_offset_sec),date('i',$info['info_startdate']+$this->tz_offset_sec)).' ':''). $title = ($do_events?$GLOBALS['phpgw']->common->formattime(date('H',$info['info_startdate']),date('i',$info['info_startdate'])).' ':'').
$info['info_subject']; $info['info_subject'];
$view = $this->link->view('infolog',$info['info_id']); $view = $this->link->view('infolog',$info['info_id']);
$content=array(); $content=array();
@ -494,8 +530,8 @@
$content = $GLOBALS['phpgw']->html->table(array(1 => $content)); $content = $GLOBALS['phpgw']->html->table(array(1 => $content));
$to_include[] = array( $to_include[] = array(
'starttime' => $info['info_startdate']+$this->tz_offset_sec, 'starttime' => $info['info_startdate'],
'endtime' => ($info['info_enddate'] ? $info['info_enddate'] : $info['info_startdate'])+$this->tz_offset_sec, 'endtime' => ($info['info_enddate'] ? $info['info_enddate'] : $info['info_startdate']),
'title' => $title, 'title' => $title,
'view' => $view, 'view' => $view,
'icons' => $icons, 'icons' => $icons,

13
infolog/inc/class.uiinfolog.inc.php
View File

@ -78,8 +78,6 @@
$this->tmpl = CreateObject('etemplate.etemplate'); $this->tmpl = CreateObject('etemplate.etemplate');
$this->html = &$this->tmpl->html; $this->html = &$this->tmpl->html;
$this->tz_offset = $GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'];
$this->user = $GLOBALS['phpgw_info']['user']['account_id']; $this->user = $GLOBALS['phpgw_info']['user']['account_id'];
} }
@ -92,7 +90,7 @@
$id = $info['info_id']; $id = $info['info_id'];
$done = $info['info_status'] == 'done' || $info['info_status'] == 'billed'; $done = $info['info_status'] == 'done' || $info['info_status'] == 'billed';
$info['sub_class'] = $info['info_pri'] . ($done ? '_done' : ''); $info['sub_class'] = $info['info_pri'] . ($done ? '_done' : '');
if (!$done && $info['info_enddate'] < time()+60*60*$this->tz_offset) if (!$done && $info['info_enddate'] < $this->bo->user_time_now)
{ {
$info['end_class'] = 'overdue'; $info['end_class'] = 'overdue';
} }
@ -408,9 +406,8 @@
get_var('HTTP_REFERER',Array('SERVER'))); get_var('HTTP_REFERER',Array('SERVER')));
//echo "<p>uiinfolog::edit: info_id=$info_id, action='$action', action_id='$action_id', type='$type', referer='$referer'</p>\n"; //echo "<p>uiinfolog::edit: info_id=$info_id, action='$action', action_id='$action_id', type='$type', referer='$referer'</p>\n";
$this->bo->read( $info_id || $action != 'sp' ? $info_id : $action_id ); $content = $this->bo->read( $info_id || $action != 'sp' ? $info_id : $action_id );
$content = $this->bo->so->data; $today = mktime(-$this->bo->tz_offset,0,0,date('m'),date('d'),date('Y')); // time=00:00
$today = mktime(-$this->tz_offset,0,0,date('m'),date('d'),date('Y')); // time=00:00
if (intval($content['info_link_id']) > 0 && !$this->link->get_link($content['info_link_id'])) if (intval($content['info_link_id']) > 0 && !$this->link->get_link($content['info_link_id']))
{ {
@ -439,11 +436,11 @@
$content['info_subject']=lang($this->messages['re']).' '.$parent['info_subject']; $content['info_subject']=lang($this->messages['re']).' '.$parent['info_subject'];
$content['info_des'] = ''; $content['info_des'] = '';
$content['info_lastmodified'] = ''; $content['info_lastmodified'] = '';
if ($content['info_startdate'] < time()) // parent-startdate is in the past => today if ($content['info_startdate'] < $this->bo->user_time_now) // parent-startdate is in the past => today
{ {
$content['info_startdate'] = $today; $content['info_startdate'] = $today;
} }
if ($content['info_enddate'] < time()) // parent-enddate is in the past => empty if ($content['info_enddate'] < $this->bo->user_time_now) // parent-enddate is in the past => empty
{ {
$content['info_enddate'] = ''; $content['info_enddate'] = '';
} }