version 1.44, 2008/05/16 16:11:56
|
version 1.47, 2008/07/02 21:31:32
|
Line 165 use Apache::localize;
|
Line 165 use Apache::localize;
|
use locale; |
use locale; |
use POSIX qw(locale_h strftime); |
use POSIX qw(locale_h strftime); |
use DateTime(); |
use DateTime(); |
|
use DateTime::TimeZone; |
|
|
require Exporter; |
require Exporter; |
|
|
Line 267 sub get_language_handle {
|
Line 268 sub get_language_handle {
|
|
|
# ========================================================== Localize localtime |
# ========================================================== Localize localtime |
sub gettimezone { |
sub gettimezone { |
my ($time) = @_; |
my $timezone; |
if ($Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.timezone'}) { |
if ($Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.timezone'}) { |
return $Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.timezone'}; |
$timezone = $Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.timezone'}; |
|
} elsif ($Apache::lonnet::env{'request.course.id'} ne '') { |
|
my $cdom = $Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.domain'}; |
|
if ($cdom ne '') { |
|
my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom); |
|
if ($domdefaults{'timezone_def'} ne '') { |
|
$timezone = $domdefaults{'timezone_def'}; |
|
} |
|
} |
|
} |
|
if ($timezone ne '') { |
|
if (DateTime::TimeZone->is_valid_name($timezone)) { |
|
return $timezone; |
|
} |
} |
} |
return 'local'; |
return 'local'; |
} |
} |
Line 279 sub locallocaltime {
|
Line 293 sub locallocaltime {
|
if (!defined($thistime) || $thistime eq '') { |
if (!defined($thistime) || $thistime eq '') { |
return &mt('Never'); |
return &mt('Never'); |
} |
} |
|
if (($thistime < 0) || ($thistime eq 'NaN')) { |
|
&Apache::lonnet::logthis("Unexpected time (negative or NaN) '$thistime' passed to lonlocal::locallocaltime"); |
|
return &mt('Never'); |
|
} |
|
if ($thistime !~ /^\d+$/) { |
|
&Apache::lonnet::logthis("Unexpected non-numeric time '$thistime' passed to lonlocal::locallocaltime"); |
|
return &mt('Never'); |
|
} |
|
|
my $dt = DateTime->from_epoch(epoch => $thistime) |
my $dt = DateTime->from_epoch(epoch => $thistime) |
->set_time_zone(&gettimezone()); |
->set_time_zone(&gettimezone()); |