version 1.174, 2008/05/29 00:19:30
|
version 1.175, 2008/06/01 00:04:39
|
Line 311 The method used to restrict user input w
|
Line 311 The method used to restrict user input w
|
sub date_setter { |
sub date_setter { |
my ($formname,$dname,$currentvalue,$special,$includeempty,$state, |
my ($formname,$dname,$currentvalue,$special,$includeempty,$state, |
$no_hh_mm_ss,$defhour,$defmin,$defsec,$nolink) = @_; |
$no_hh_mm_ss,$defhour,$defmin,$defsec,$nolink) = @_; |
|
my $now = time; |
my $wasdefined=1; |
my $wasdefined=1; |
if (! defined($state) || $state ne 'disabled') { |
if (! defined($state) || $state ne 'disabled') { |
$state = ''; |
$state = ''; |
Line 319 sub date_setter {
|
Line 320 sub date_setter {
|
$no_hh_mm_ss = 0; |
$no_hh_mm_ss = 0; |
} |
} |
if ($currentvalue eq 'now') { |
if ($currentvalue eq 'now') { |
$currentvalue=time; |
$currentvalue = $now; |
} |
} |
if ((!defined($currentvalue)) || ($currentvalue eq '')) { |
if ((!defined($currentvalue)) || ($currentvalue eq '')) { |
$wasdefined=0; |
$wasdefined=0; |
if ($includeempty) { |
if ($includeempty) { |
$currentvalue = 0; |
$currentvalue = 0; |
} else { |
} else { |
$currentvalue = time; |
$currentvalue = $now; |
} |
} |
} |
} |
# other potentially useful values: wkday,yrday,is_daylight_savings |
# other potentially useful values: wkday,yrday,is_daylight_savings |
|
my $tzname; |
my ($sec,$min,$hour,$mday,$month,$year)=('','',undef,'','',''); |
my ($sec,$min,$hour,$mday,$month,$year)=('','',undef,'','',''); |
if ($currentvalue) { |
if ($currentvalue) { |
($sec,$min,$hour,$mday,$month,$year,undef,undef,undef) = |
($tzname,$sec,$min,$hour,$mday,$month,$year) = &get_timedates($currentvalue); |
localtime($currentvalue); |
|
$year += 1900; |
|
} |
} |
unless ($wasdefined) { |
unless ($wasdefined) { |
|
($tzname,$sec,$min,$hour,$mday,$month,$year) = &get_timedates($now); |
if (($defhour) || ($defmin) || ($defsec)) { |
if (($defhour) || ($defmin) || ($defsec)) { |
($sec,$min,$hour,$mday,$month,$year,undef,undef,undef) = |
|
localtime(time); |
|
$year += 1900; |
|
$sec=($defsec?$defsec:0); |
$sec=($defsec?$defsec:0); |
$min=($defmin?$defmin:0); |
$min=($defmin?$defmin:0); |
$hour=($defhour?$defhour:0); |
$hour=($defhour?$defhour:0); |
Line 463 ENDJS
|
Line 461 ENDJS
|
$cal_link = qq{<a href="javascript:$dname\_opencalendar()">}; |
$cal_link = qq{<a href="javascript:$dname\_opencalendar()">}; |
} |
} |
# |
# |
my $dt = DateTime->from_epoch(epoch => $currentvalue) |
my $tzone = ' '.$tzname.' '; |
->set_time_zone(&Apache::lonlocal::gettimezone()); |
|
my $tzone = ' '.$dt->time_zone_short_name().' '; |
|
if ($no_hh_mm_ss) { |
if ($no_hh_mm_ss) { |
$result .= &mt('[_1] [_2] [_3] ', |
$result .= &mt('[_1] [_2] [_3] ', |
$monthselector,$dayselector,$yearselector). |
$monthselector,$dayselector,$yearselector). |
Line 486 ENDJS
|
Line 482 ENDJS
|
return $result; |
return $result; |
} |
} |
|
|
|
sub get_timedates { |
|
my ($epoch) = @_; |
|
my $dt = DateTime->from_epoch(epoch => $epoch) |
|
->set_time_zone(&Apache::lonlocal::gettimezone()); |
|
my $tzname = $dt->time_zone_short_name(); |
|
my $sec = $dt->second; |
|
my $min = $dt->minute; |
|
my $hour = $dt->hour; |
|
my $mday = $dt->day; |
|
my $month = $dt->month; |
|
if ($month) { |
|
$month --; |
|
} |
|
my $year = $dt->year; |
|
return ($tzname,$sec,$min,$hour,$mday,$month,$year); |
|
} |
|
|
sub build_url { |
sub build_url { |
my ($base, $fields)=@_; |
my ($base, $fields)=@_; |
Line 567 sub get_date_from_form {
|
Line 579 sub get_date_from_form {
|
if (defined($env{'form.'.$dname.'_month'})) { |
if (defined($env{'form.'.$dname.'_month'})) { |
my $tmpmonth = $env{'form.'.$dname.'_month'}; |
my $tmpmonth = $env{'form.'.$dname.'_month'}; |
if (($tmpmonth =~ /^\d+$/) && ($tmpmonth > 0) && ($tmpmonth < 13)) { |
if (($tmpmonth =~ /^\d+$/) && ($tmpmonth > 0) && ($tmpmonth < 13)) { |
$month = $tmpmonth - 1; |
$month = $tmpmonth; |
} |
} |
} |
} |
if (defined($env{'form.'.$dname.'_year'})) { |
if (defined($env{'form.'.$dname.'_year'})) { |
my $tmpyear = $env{'form.'.$dname.'_year'}; |
my $tmpyear = $env{'form.'.$dname.'_year'}; |
if (($tmpyear =~ /^\d+$/) && ($tmpyear > 1900)) { |
if (($tmpyear =~ /^\d+$/) && ($tmpyear >= 1970)) { |
$year = $tmpyear - 1900; |
$year = $tmpyear; |
} |
} |
} |
} |
if (($year<70) || ($year>137)) { return undef; } |
if (($year<1970) || ($year>2037)) { return undef; } |
if (defined($sec) && defined($min) && defined($hour) && |
if (defined($sec) && defined($min) && defined($hour) && |
defined($day) && defined($month) && defined($year) && |
defined($day) && defined($month) && defined($year)) { |
eval('&timelocal($sec,$min,$hour,$day,$month,$year)')) { |
my $timezone = &Apache::lonlocal::gettimezone(); |
return &timelocal($sec,$min,$hour,$day,$month,$year); |
my $dt = DateTime->new( year => $year, |
|
month => $month, |
|
day => $day, |
|
hour => $hour, |
|
minute => $min, |
|
second => $sec, |
|
time_zone => $timezone, |
|
); |
|
my $epoch_time = $dt->epoch; |
|
if ($epoch_time ne '') { |
|
return $epoch_time; |
|
} else { |
|
return undef; |
|
} |
} else { |
} else { |
return undef; |
return undef; |
} |
} |