oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more time zone problems

Browse source
This commit is contained in:
JT Smith 2005-12-03 23:41:00 +00:00
parent 88c7ea216d
commit f0d2ec3481
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/WebGUI/DateTime.pm
View file

@ -207,7 +207,7 @@ sub epochToHuman {
my $locale = $language->{languageAbbreviation} || "en"; my $locale = $language->{languageAbbreviation} || "en";
$locale .= "_".$language->{locale} if ($language->{locale}); $locale .= "_".$language->{locale} if ($language->{locale});
my $timeZone = $session{user}{timeZone} || "America/Chicago"; my $timeZone = $session{user}{timeZone} || "America/Chicago";
my $dt = DateTime->from_epoch( epoch=>shift||time(), time_zone=>$timeZone, locale=>$locale ); my $dt = DateTime->from_epoch( epoch=>shift||time(), time_zone=>$timeZone, locale=>$locale );
my $output = shift || "%z %Z"; my $output = shift || "%z %Z";
my $temp; my $temp;
#---date format preference #---date format preference
@ -268,7 +268,8 @@ A boolean indicating that the time should be added to the output, thust turning
=cut =cut
sub epochToSet { sub epochToSet {
my $dt = DateTime->from_epoch( epoch =>shift, time_zone=>$session{user}{timeZone}); my $timeZone = $session{user}{timeZone} || "America/Chicago";
my $dt = DateTime->from_epoch( epoch =>shift, time_zone=>$timeZone);
my $withTime = shift; my $withTime = shift;
if ($withTime) { if ($withTime) {
return $dt->strftime("%Y-%m-%d %H:%M:%S"); return $dt->strftime("%Y-%m-%d %H:%M:%S");
@ -658,7 +659,7 @@ sub setToEpoch {
$dt = $parser->parse_datetime($set); $dt = $parser->parse_datetime($set);
} }
# in epochToSet we apply the user's time zone, so now we have to remove it. # in epochToSet we apply the user's time zone, so now we have to remove it.
$dt->set_time_zone($session{user}{timeZone}); # assign the user's timezone $dt->set_time_zone($session{user}{timeZone}|| "America/Chicago"); # assign the user's timezone
# my $u = WebGUI::User->new(1); # my $u = WebGUI::User->new(1);
# $dt->set_time_zone($u->profileField("timeZone")); # convert to the visitor's or default time zone # $dt->set_time_zone($u->profileField("timeZone")); # convert to the visitor's or default time zone
return $dt->epoch; return $dt->epoch;