version 1.357, 2015/09/14 13:45:19
|
version 1.360, 2016/03/15 14:25:33
|
Line 221 sub check_slot_access {
|
Line 221 sub check_slot_access {
|
return ($status,$datemsg); |
return ($status,$datemsg); |
} |
} |
|
|
if ($status eq 'SHOW_ANSWER' || |
my $checkin = 'resource.0.checkedin'; |
$status eq 'CLOSED' || |
my $version; |
|
if ($type eq 'Task') { |
|
$version=$Apache::lonhomework::history{'resource.version'}; |
|
$checkin = "resource.$version.0.checkedin"; |
|
} |
|
my $checkedin = $Apache::lonhomework::history{$checkin}; |
|
my ($returned_slot,$slot_name,$checkinslot,$ipused,$blockip,$now,$ip); |
|
$now = time; |
|
$ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'}; |
|
|
|
if ($checkedin) { |
|
$checkinslot = $Apache::lonhomework::history{"$checkin.slot"}; |
|
my %slot=&Apache::lonnet::get_slot($checkinslot); |
|
if ($slot{'iptied'}) { |
|
$ipused = $Apache::lonhomework::history{"$checkin.ip"}; |
|
unless (($ip ne '') && ($ipused eq $ip)) { |
|
$blockip = $slot{'iptied'}; |
|
$slot_name = $checkinslot; |
|
$returned_slot = \%slot; |
|
} |
|
} |
|
} |
|
|
|
if ($status eq 'SHOW_ANSWER') { |
|
if ($blockip eq 'answer') { |
|
return ('NEED_DIFFERENT_IP','',$slot_name,$returned_slot,$ipused); |
|
} else { |
|
return ($status,$datemsg); |
|
} |
|
} |
|
|
|
if ($status eq 'CLOSED' || |
$status eq 'INVALID_ACCESS' || |
$status eq 'INVALID_ACCESS' || |
$status eq 'UNAVAILABLE') { |
$status eq 'UNAVAILABLE') { |
return ($status,$datemsg); |
return ($status,$datemsg); |
Line 232 sub check_slot_access {
|
Line 263 sub check_slot_access {
|
} |
} |
|
|
if ($type eq 'Task') { |
if ($type eq 'Task') { |
my $version=$Apache::lonhomework::history{'resource.version'}; |
if ($checkedin && |
if ($Apache::lonhomework::history{"resource.$version.0.checkedin"} && |
|
$Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') { |
$Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') { |
return ('SHOW_ANSWER'); |
if ($blockip eq 'answer') { |
} |
return ('NEED_DIFFERENT_IP','',$slot_name,$returned_slot,$ipused); |
|
} else { |
|
return ('SHOW_ANSWER'); |
|
} |
|
} |
} |
} |
|
|
my $availablestudent = &Apache::lonnet::EXT("resource.0.availablestudent",$symb); |
my $availablestudent = &Apache::lonnet::EXT("resource.0.availablestudent",$symb); |
Line 246 sub check_slot_access {
|
Line 280 sub check_slot_access {
|
# if (!@slots) { |
# if (!@slots) { |
# return ($status,$datemsg); |
# return ($status,$datemsg); |
# } |
# } |
|
undef($returned_slot); |
|
undef($slot_name); |
my $slotstatus='NOT_IN_A_SLOT'; |
my $slotstatus='NOT_IN_A_SLOT'; |
my ($returned_slot,$slot_name); |
|
my $now = time; |
|
my $num_usable_slots = 0; |
my $num_usable_slots = 0; |
|
if (!$symb) { |
|
($symb) = &Apache::lonnet::whichuser(); |
|
} |
foreach my $slot (@slots) { |
foreach my $slot (@slots) { |
$slot =~ s/(^\s*|\s*$)//g; |
$slot =~ s/(^\s*|\s*$)//g; |
&Apache::lonxml::debug("getting $slot"); |
&Apache::lonxml::debug("getting $slot"); |
Line 260 sub check_slot_access {
|
Line 297 sub check_slot_access {
|
if ($slot{'starttime'} < $now && |
if ($slot{'starttime'} < $now && |
$slot{'endtime'} > $now && |
$slot{'endtime'} > $now && |
&Apache::loncommon::check_ip_acc($slot{'ip'})) { |
&Apache::loncommon::check_ip_acc($slot{'ip'})) { |
&Apache::lonxml::debug("$slot is good"); |
if ($slot{'iptied'}) { |
$slotstatus='NEEDS_CHECKIN'; |
if ($env{'request.course.id'}) { |
$returned_slot=\%slot; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
$slot_name=$slot; |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
last; |
if ($slot eq $checkinslot) { |
} |
if ($ip eq $ipused) { |
|
&Apache::lonxml::debug("$slot is good"); |
|
$slotstatus ='NEEDS_CHECKIN'; |
|
} else { |
|
$slotstatus = 'NEED_DIFFERENT_IP'; |
|
$slot_name = $slot; |
|
$returned_slot = \%slot; |
|
last; |
|
} |
|
} elsif ($ip) { |
|
my $uniqkey = "$slot\0$symb\0$ip"; |
|
my %used_ip = &Apache::lonnet::get('slot_uniqueips',[$uniqkey],$cdom,$cnum); |
|
if ($used_ip{$uniqkey}) { |
|
$slotstatus = 'NEED_DIFFERENT_IP'; |
|
} else { |
|
&Apache::lonxml::debug("$slot is good"); |
|
$slotstatus ='NEEDS_CHECKIN'; |
|
} |
|
} |
|
} |
|
} else { |
|
&Apache::lonxml::debug("$slot is good"); |
|
$slotstatus='NEEDS_CHECKIN'; |
|
} |
|
if ($slotstatus eq 'NEEDS_CHECKIN') { |
|
$returned_slot=\%slot; |
|
$slot_name=$slot; |
|
last; |
|
} |
|
} |
} |
} |
if ($slotstatus eq 'NEEDS_CHECKIN' && |
if ($slotstatus eq 'NEEDS_CHECKIN' && |
&proctor_checked_in($slot_name,$returned_slot,$type)) { |
&proctor_checked_in($slot_name,$returned_slot,$type)) { |
Line 273 sub check_slot_access {
|
Line 339 sub check_slot_access {
|
$slotstatus=$status; |
$slotstatus=$status; |
} |
} |
|
|
my ($is_correct,$got_grade,$checkedin); |
my ($is_correct,$got_grade); |
if ($type eq 'Task') { |
if ($type eq 'Task') { |
my $version=$Apache::lonhomework::history{'resource.0.version'}; |
my $version=$Apache::lonhomework::history{'resource.0.version'}; |
$got_grade = |
$got_grade = |
Line 282 sub check_slot_access {
|
Line 348 sub check_slot_access {
|
$is_correct = |
$is_correct = |
($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' |
($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' |
|| $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ ); |
|| $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ ); |
$checkedin = |
|
$Apache::lonhomework::history{"resource.$version.0.checkedin"}; |
|
} elsif ($type eq 'problem') { |
} elsif ($type eq 'problem') { |
$got_grade = 1; |
$got_grade = 1; |
$checkedin = $Apache::lonhomework::history{"resource.0.checkedin"}; |
|
$is_correct = |
$is_correct = |
($Apache::lonhomework::history{"resource.0.solved"} =~/^correct_/); |
($Apache::lonhomework::history{"resource.0.solved"} =~/^correct_/); |
} |
} |
Line 305 sub check_slot_access {
|
Line 368 sub check_slot_access {
|
# However, the problem is not closed, and potentially, another slot might be |
# However, the problem is not closed, and potentially, another slot might be |
# used to gain access to it to work on it, until the due date is reached, and the |
# used to gain access to it to work on it, until the due date is reached, and the |
# problem then becomes CLOSED. Therefore return the slotstatus - |
# problem then becomes CLOSED. Therefore return the slotstatus - |
# (which will be one of: NOT_IN_A_SLOT, RESERVABLE, RESERVABLE_LATER, or NOTRESERVABLE. |
# (which will be one of: NOT_IN_A_SLOT, RESERVABLE, RESERVABLE_LATER, or NOTRESERVABLE). |
if (!defined($slot_name) && $type eq 'problem') { |
if (!defined($slot_name) && $type eq 'problem') { |
if ($slotstatus eq 'NOT_IN_A_SLOT') { |
if ($slotstatus eq 'NOT_IN_A_SLOT') { |
if (!$num_usable_slots) { |
if (!$num_usable_slots) { |
Line 343 sub check_slot_access {
|
Line 406 sub check_slot_access {
|
&& $checkedin ) { |
&& $checkedin ) { |
|
|
if ($got_grade) { |
if ($got_grade) { |
return ('SHOW_ANSWER'); |
if ($blockip eq 'answer') { |
|
return ('NEED_DIFFERENT_IP','',$slot_name,$returned_slot,$ipused); |
|
} else { |
|
return ('SHOW_ANSWER'); |
|
} |
} else { |
} else { |
return ('WAITING_FOR_GRADE'); |
return ('WAITING_FOR_GRADE'); |
} |
} |
|
|
} |
} |
|
|
if ( $is_correct) { |
if (($is_correct) && ($blockip ne 'answer')) { |
if ($type eq 'problem') { |
if ($type eq 'problem') { |
return ($status); |
return ($status); |
} |
} |
Line 358 sub check_slot_access {
|
Line 425 sub check_slot_access {
|
} |
} |
|
|
if ( $status eq 'CANNOT_ANSWER' && |
if ( $status eq 'CANNOT_ANSWER' && |
($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT')) { |
($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT' && |
|
$slotstatus ne 'NEED_DIFFERENT_IP') ) { |
return ($status,$datemsg); |
return ($status,$datemsg); |
} |
} |
|
return ($slotstatus,$datemsg,$slot_name,$returned_slot,$ipused); |
return ($slotstatus,$datemsg,$slot_name,$returned_slot); |
|
} |
} |
|
|
# JB, 9/24/2002: Any changes in this function may require a change |
# JB, 9/24/2002: Any changes in this function may require a change |
Line 1105 sub editxmlmode {
|
Line 1172 sub editxmlmode {
|
# Render the page in whatever target desired. |
# Render the page in whatever target desired. |
# |
# |
sub renderpage { |
sub renderpage { |
my ($request,$file,$targets,$return_string) = @_; |
my ($request,$file,$targets,$return_string,$donebuttonmsg) = @_; |
|
|
my @targets = @{$targets || [&get_target()]}; |
my @targets = @{$targets || [&get_target()]}; |
&Apache::lonhomework::showhashsubset(\%env,'form.'); |
&Apache::lonhomework::showhashsubset(\%env,'form.'); |
Line 1158 sub renderpage {
|
Line 1225 sub renderpage {
|
if ($target eq 'analyze') { |
if ($target eq 'analyze') { |
$result=&Apache::lonnet::hashref2str(\%Apache::lonhomework::analyze); |
$result=&Apache::lonnet::hashref2str(\%Apache::lonhomework::analyze); |
undef(%Apache::lonhomework::analyze); |
undef(%Apache::lonhomework::analyze); |
} |
} elsif ($target eq 'web') { |
|
if ($donebuttonmsg) { |
|
$result =~ s{</body>}{}; |
|
$result.= &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($donebuttonmsg,1))."\n</body>"; |
|
} |
|
} |
#my $td=&tv_interval($t0); |
#my $td=&tv_interval($t0); |
#if ( $Apache::lonxml::debug) { |
#if ( $Apache::lonxml::debug) { |
#$result =~ s:</body>::; |
#$result =~ s:</body>::; |
Line 1363 sub zero_timer {
|
Line 1435 sub zero_timer {
|
my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb); |
my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb); |
if (@interval > 1) { |
if (@interval > 1) { |
if ($interval[1] eq 'course') { |
if ($interval[1] eq 'course') { |
return; |
return ('fail',&mt('Ending of timed events not supported for intervals set course-wide')); |
} else { |
} else { |
my $now = time; |
my $now = time; |
my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb); |
my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb); |
if ($first_access > 0) { |
if ($first_access > 0) { |
my ($timelimit) = split(/_/,$interval[0]); |
my ($timelimit,$done,$proctor,$secret) = split(/_/,$interval[0]); |
if ($first_access+$timelimit > $now) { |
if ($done eq 'done') { |
my $done_time = $now - $first_access; |
if (($proctor) && ($secret ne '')) { |
my $snum = 1; |
my $key = $env{'form.LC_interval_done_proctorpass'}; |
if ($interval[1] eq 'map') { |
$key =~ s/^\s+//; |
$snum = 2; |
$key =~ s/\s+$//; |
|
if ($env{'form.LC_interval_done_proctorpass'} ne $secret) { |
|
return ('fail', |
|
&mt('Incorrect key entered by proctor')); |
|
} |
|
} |
|
if ($first_access+$timelimit > $now) { |
|
my $done_time = $now - $first_access; |
|
my $snum = 1; |
|
if ($interval[1] eq 'map') { |
|
$snum = 2; |
|
} |
|
my $result = |
|
&Apache::lonparmset::storeparm_by_symb_inner($symb,'0_interval', |
|
$snum,$done_time, |
|
'date_interval', |
|
$env{'user.name'}, |
|
$env{'user.domain'}); |
|
if ($result eq '') { |
|
# Record action in "User Notes" |
|
&Apache::lonmsg::store_instructor_comment( |
|
'Pressed Done button for symb:<br />'.$symb, |
|
$env{'user.name'}, $env{'user.domain'}); |
|
return ('ok'); |
|
} else { |
|
return ('fail',&mt('Error ending timed event: [_1]',$result)); |
|
} |
|
} else { |
|
return ('fail',&mt('Timed event already ended')); |
} |
} |
my $result = |
} else { |
&Apache::lonparmset::storeparm_by_symb_inner($symb,'0_interval', |
return ('fail',&mt('Timed event can not be ended before the time limit')); |
$snum,$done_time, |
|
'date_interval', |
|
$env{'user.name'}, |
|
$env{'user.domain'}); |
|
return $result; |
|
} |
} |
|
} else { |
|
return ('fail',&mt('Timer not yet started for this timed event')); |
} |
} |
} |
} |
|
} else { |
|
return ('fail',&mt('No timer in use')); |
} |
} |
return; |
return(); |
} |
} |
|
|
sub handler { |
sub handler { |
Line 1448 sub handler {
|
Line 1547 sub handler {
|
} else { |
} else { |
# Set the event timer to zero if the "done button" was clicked. The button is |
# Set the event timer to zero if the "done button" was clicked. The button is |
# part of the doneButton form created in lonmenu.pm |
# part of the doneButton form created in lonmenu.pm |
|
my ($donebuttonresult,$donemsg); |
if ($symb && $env{'form.LC_interval_done'} eq 'true') { |
if ($symb && $env{'form.LC_interval_done'} eq 'true') { |
&zero_timer($symb); |
($donebuttonresult,$donemsg) = &zero_timer($symb); |
undef($env{'form.LC_interval_done'}); |
undef($env{'form.LC_interval_done'}); |
|
undef($env{'form.LC_interval_done_proctorpass'}); |
} |
} |
# just render the page normally outside of construction space |
# just render the page normally outside of construction space |
&Apache::lonxml::debug("not construct"); |
&Apache::lonxml::debug("not construct"); |
&renderpage($request,$file); |
&renderpage($request,$file,undef,undef,$donemsg); |
} |
} |
#my $td=&tv_interval($t0); |
#my $td=&tv_interval($t0); |
#&Apache::lonxml::debug("Spent $td seconds processing"); |
#&Apache::lonxml::debug("Spent $td seconds processing"); |