forked from extern/egroupware
fixed wrong users_localtime time:
offset in user_prefs is not against GMT but servertime
This commit is contained in:
parent
9a074ef8b3
commit
6b8a74ecc9
@ -62,13 +62,15 @@
|
|||||||
if(isset($GLOBALS['phpgw_info']['server']['tz_offset']))
|
if(isset($GLOBALS['phpgw_info']['server']['tz_offset']))
|
||||||
{
|
{
|
||||||
$this->gmtnow = time() - (intval($GLOBALS['phpgw_info']['server']['tz_offset']) * 3600);
|
$this->gmtnow = time() - (intval($GLOBALS['phpgw_info']['server']['tz_offset']) * 3600);
|
||||||
|
//echo "<p>set via tz_offset=".$GLOBALS['phpgw_info']['server']['tz_offset'].": gmtnow=".date('Y/m/d H:i',$this->gmtnow)."</p>\n";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->gmtnow = time() - ($this->getbestguess() * 3600);
|
$this->gmtnow = time() - ($this->getbestguess() * 3600);
|
||||||
|
//echo "<p>set via bestguess=".$this->getbestguess().": gmtnow=".date('Y/m/d H:i',$this->gmtnow)."</p>\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$this->users_localtime = $this->gmtnow + $this->tz_offset;
|
$this->users_localtime = time() + $this->tz_offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getntpoffset()
|
function getntpoffset()
|
||||||
|
Loading…
Reference in New Issue
Block a user