--- loncom/homework/bridgetask.pm	2010/11/01 16:32:32	1.256
+++ loncom/homework/bridgetask.pm	2016/08/31 19:08:18	1.267
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.256 2010/11/01 16:32:32 raeburn Exp $
+# $Id: bridgetask.pm,v 1.267 2016/08/31 19:08:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -83,7 +83,7 @@ sub proctor_check_auth {
 		}
 	    }
 	    if ($authenticated) {
-		my $check = &check_in($type,$user,$domain,$slot_name);
+		my $check = &check_in($type,$user,$domain,$slot_name,$slot->{'iptied'});
                 if ($check =~ /^error:/) {
                     return 0;
                 }
@@ -95,25 +95,30 @@ sub proctor_check_auth {
 }
 
 sub check_in {
-    my ($type,$user,$domain,$slot_name) = @_;
+    my ($type,$user,$domain,$slot_name,$needsiptied) = @_;
     my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
+    my $ip=$ENV{'REMOTE_ADDR'} || $env{'request.host'};
     if ( $useslots eq 'map_map') {
-	my $result = &check_in_sequence($user,$domain,$slot_name);
+	my $result = &check_in_sequence($user,$domain,$slot_name,$ip,$needsiptied);
         if ($result =~ /^error: /) {
             return $result;
         }
     } else {
-	&create_new_version($type,$user,$domain,$slot_name);
-	&Apache::structuretags::finalize_storage();
+        my ($symb) = &Apache::lonnet::whichuser();
+	my $result = &create_new_version($type,$user,$domain,$slot_name,$symb,$ip,$needsiptied);
+        if ($result eq 'ok') {
+	    &Apache::structuretags::finalize_storage();
+        }
+        return $result; 
     }
     return 1;
 }
 
 sub check_in_sequence {
-    my ($user,$domain,$slot_name) = @_;
+    my ($user,$domain,$slot_name,$ip,$needsiptied) = @_;
     my $navmap = Apache::lonnavmaps::navmap->new();
     if (!defined($navmap)) {
-        return 'error: ';
+        return 'error: No navmap';
     }
     my ($symb) = &Apache::lonnet::whichuser();
     my ($map)  = &Apache::lonnet::decode_symb($symb);
@@ -122,20 +127,43 @@ sub check_in_sequence {
     my %old_history = %Apache::lonhomework::history;
     my %old_results = %Apache::lonhomework::results;
 
+    my $errorcount;
     foreach my $res (@resources) {
 	&Apache::lonxml::debug("doing ".$res->src);
 	&Apache::structuretags::initialize_storage($res->symb);
 	my $type = ($res->is_task()) ? 'Task' : 'problem';
-	&create_new_version($type,$user,$domain,$slot_name);
-	&Apache::structuretags::finalize_storage($res->symb);
+	my $result = &create_new_version($type,$user,$domain,$slot_name,$res->symb,$ip,$needsiptied);
+        if ($result eq 'ok') {
+	    &Apache::structuretags::finalize_storage($res->symb);
+        } else {
+            $errorcount ++;
+        }
     }
     
     %Apache::lonhomework::history = %old_history;
     %Apache::lonhomework::results = %old_results;
+    if ($errorcount) {
+        return 'error: IP taken';
+    }
 }
 
 sub create_new_version {
-    my ($type,$user,$domain,$slot_name) = @_;
+    my ($type,$user,$domain,$slot_name,$symb,$ip,$needsiptied) = @_;
+
+    if ($needsiptied) {
+        my $uniqkey = "$slot_name\0$symb\0$ip";
+        my ($cdom,$cnum);
+        if ($env{'request.course.id'}) {
+            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+            my %hash = (
+                          "$slot_name\0$symb\0$ip" => $env{'user.name'}.':'.$env{'user.domain'}, 
+                       );
+            unless (&Apache::lonnet::newput('slot_uniqueips',\%hash,$cdom,$cnum) eq 'ok') {
+                return 'error: IP taken';
+            }
+        }
+    }
     
     my $id = '0';
     if ($type eq 'Task') {
@@ -169,11 +197,13 @@ sub create_new_version {
 
     $Apache::lonhomework::results{"resource.$id.checkedin"}=
 	$user.':'.$domain;
+    $Apache::lonhomework::results{"resource.$id.checkedin.ip"}=$ip;
 
     if (defined($slot_name)) {
 	$Apache::lonhomework::results{"resource.$id.checkedin.slot"}=
 	    $slot_name;
     }
+    return 'ok'; 
 }
 
 sub get_version {
@@ -199,6 +229,10 @@ sub get_version {
 
 sub add_previous_version_button {
     my ($status)=@_;
+    my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser();
+    if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
+        return;
+    }
     my $result;
     if ($Apache::lonhomework::history{'resource.0.version'} eq '') {
 	return '';
@@ -235,7 +269,10 @@ sub add_previous_version_button {
 }
 
 sub add_grading_button {
-    my (undef,$cid)=&Apache::lonnet::whichuser();
+    my (undef,$cid,$udom,$uname)=&Apache::lonnet::whichuser();
+    if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
+        return;
+    }
     my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};
     my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
@@ -245,15 +282,19 @@ sub add_grading_button {
 	$size=scalar(keys(%sections))+2;
     }
     my $sec_select = "\n".'<select multiple="multiple" name="chosensections" size="'.$size.'">'."\n";
-    $sec_select .= "\t<option value='all' selected='selected'>all</option>\n";
+    $sec_select .= "\t".'<option value="all" selected="selected">'.&mt('all')."</option>\n";
     foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {
 	$sec_select .= "\t<option value=\"$sec\">$sec</option>\n";
     }
-    $sec_select .= "\t<option value='none'>none</option>\n</select>\n";
-    
-    my $result="\n\t".'<input type="submit" name="gradeasubmission" value="'.
-	&mt("Get a submission to grade").'" />';
-    $result.="\n\t".'<input type="hidden" name="grade_target" value="webgrade" />';
+    $sec_select .= "\t".'<option value="none">'.&mt('none')."</option>\n</select>\n";
+
+    my $uri=$env{'request.uri'};
+    if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
+    my $result = 
+        '<form name="gradesubmission" method="post" action="'.$uri.'">'.
+        "\n\t".'<input type="submit" name="gradeasubmission" value="'.
+	&mt("Get a submission to grade").'" />'.
+        "\n\t".'<input type="hidden" name="grade_target" value="webgrade" />';
     my $see_all = &Apache::lonnet::allowed('mgq',$env{'request.course.id'});
     my $see_sec = &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.
 					   '/'.$env{'request.course.sec'});
@@ -299,11 +340,46 @@ sub add_grading_button {
 	$result.=&Apache::loncommon::studentbrowser_javascript();
 	$result.= '</p>'."\n";
     }
+    $result .= '</form>'."\n";
+    return $result;
+}
+
+sub add_slotlist_button {
+    my (undef,$cid,$udom,$uname)=&Apache::lonnet::whichuser();
+    if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
+        return;
+    }
+    my $symb=&Apache::lonnet::symbread();
+    my $result;
+    if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'}) ||
+        &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
+        $result = '<form method="post" name="slotrequest" action="/adm/slotrequest">'.
+                  '<input type="hidden" name="symb" value="'.$symb.'" />'.
+                  '<input type="hidden" name="command" value="showslots" />'.
+                  '<input type="submit" name="requestattempt" value="'.
+                  &mt('Show Slot list').'" />'.
+                  '</form>';
+        my $target_id =
+               &Apache::lonstathelpers::make_target_id({symb => $symb,
+                                                             part => '0'});
+        if (!&section_restricted()) {
+            $result.='<form method="post" name="gradingstatus" action="/adm/statistics">'.
+                     '<input type="hidden" name="problemchoice" value="'.$target_id.'" />'.
+                     '<input type="hidden" name="reportSelected" value="grading_analysis" />'.
+                     '<input type="submit" name="grading" value="'.
+                     &mt('Show Grading Status').'" />'.
+                     '</form>';
+        }
+    }
     return $result;
 }
 
 sub add_request_another_attempt_button {
     my ($text)=@_;
+    my (undef,$cid,$udom,$uname)=&Apache::lonnet::whichuser();
+    if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
+        return;
+    }
     if (!$text) { $text=&mt('Request another attempt'); }
     my $result;
     my $symb=&Apache::lonnet::symbread();
@@ -635,37 +711,19 @@ sub start_Task {
         $target eq 'tex') {
         if ($env{'form.markaccess'}) {
             my @interval=&Apache::lonnet::EXT("resource.0.interval");
-            &Apache::lonnet::set_first_access($interval[1]);
+            my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+            &Apache::lonnet::set_first_access($interval[1],$timelimit);
         }
     }
 
     if ($target eq 'web' && $env{'request.state'} ne 'construct') {
 	if ($Apache::lonhomework::queuegrade
 	    || $Apache::lonhomework::modifygrades) {
-	    $result.='<form name="gradesubmission" method="post" action="';
-	    my $uri=$env{'request.uri'};
-	    if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
-	    $result.=$uri.'">'.&add_grading_button()."</form>\n";
+	    $result .= &add_grading_button();
 	    my $symb=&Apache::lonnet::symbread();
 	    if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})
 		|| &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
-		$result.='<form method="post" name="slotrequest" action="/adm/slotrequest">'.
-		    '<input type="hidden" name="symb" value="'.$symb.'" />'.
-		    '<input type="hidden" name="command" value="showslots" />'.
-		    '<input type="submit" name="requestattempt" value="'.
-		    &mt('Show Slot list').'" />'.
-		    '</form>';
-		my $target_id = 
-		    &Apache::lonstathelpers::make_target_id({symb => $symb,
-							     part => '0'});
-		if (!&section_restricted()) {
-		    $result.='<form method="post" name="gradingstatus" action="/adm/statistics">'.
-			'<input type="hidden" name="problemchoice" value="'.$target_id.'" />'.
-			'<input type="hidden" name="reportSelected" value="grading_analysis" />'.
-			'<input type="submit" name="grading" value="'.
-			&mt('Show Grading Status').'" />'.
-			'</form>';
-		}
+                $result .= &add_slotlist_button(); 
 	    }
 	}
     }
@@ -682,20 +740,35 @@ sub start_Task {
 	if ((($status eq 'CAN_ANSWER') || ($status eq 'NOT_YET_VIEWED')) && ($version eq '')) {
 	    # CAN_ANSWER or NOT_YET_VIEWED mode, and no current version, unproctored access
 	    # thus self-checkedin
-	    my $check = &check_in('Task',undef,undef,$slot_name);
-            if ($check =~ /^error: /) {
+            my $needsiptied;
+            if (ref($slot)) {
+                $needsiptied = $slot->{'iptied'};
+            }
+	    my $check = &check_in('Task',undef,undef,$slot_name,$needsiptied);
+            if ($check =~ /^error:\s+(.*)$/) {
                 my $symb=&Apache::lonnet::symbread();
-                &Apache::lonnet::logthis("Error during self-checkin of version $version of Task (symb: $symb) using slot: $slot_name");   
+                &Apache::lonnet::logthis("Error: $1 during self-checkin of version $version of Task (symb: $symb) using slot: $slot_name");   
             }
 	    &add_to_queue('gradingqueue',{'type' => 'Task',
 					  'time' => time,
 					  'slot' => $slot_name});
 	    ($version,$previous)=&get_version();
 	}
-	
-	my $status_id = 
-	    ($previous || $status eq 'SHOW_ANSWER') ? 'LC_task_feedback'
-	                                            : 'LC_task_take';
+        if (($target eq 'web') && ($version ne '') && ($slot_name ne '')) {
+            if (ref($slot) eq 'HASH') {
+                if ($slot->{'endtime'} > time()) {
+                    $result .=
+                        &Apache::lonhtmlcommon::set_due_date($slot->{'endtime'});
+                }
+            }
+	}
+
+	my $status_id = 'LC_task_take';
+        if ($previous && $target eq 'answer') {
+            $status_id = 'LC_task_answer';
+        } elsif ($previous || $status eq 'SHOW_ANSWER') {
+	    $status_id = 'LC_task_feedback';
+        }
 	$result .= '<div class="LC_task" id="'.$status_id.'">'."\n";
 
 	push(@Apache::inputtags::status,$status);
@@ -713,22 +786,24 @@ sub start_Task {
 		}
 		my $msg;
 		if ($status eq 'UNAVAILABLE') {
-		    $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
+		    $msg.='<p class="LC_error">'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</p>';
 		} elsif ($status eq 'NOT_IN_A_SLOT') {
-		    $msg.='<h1>'.&mt('You are not currently signed up to work at this time and/or place.').'</h1>';
+		    $msg.='<p class="LC_warning">'.&mt('You are not currently signed up to work at this time and/or place.').'</p>';
 		    $msg.=&add_request_another_attempt_button("Sign up for time to work");
 		} elsif ($status eq 'NEEDS_CHECKIN') {
-		    $msg.='<h1>'.&mt('You need the Proctor to validate you.').
-			'</h1>'.&proctor_validation_screen($slot);
+		    $msg.='<p class="LC_warning">'.&mt('You need the Proctor to validate you.').
+			'</p>'.&proctor_validation_screen($slot);
 		} elsif ($status eq 'WAITING_FOR_GRADE') {
-		    $msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>';
+		    $msg.='<p class="LC_info">'.&mt('Your submission is in the grading queue.').'</p>';
 		} elsif ($env{'form.donescreen'}) {
 		    $result .= &done_screen($version);
 		} elsif ($status eq 'NOT_YET_VIEWED') {
                     my $symb=&Apache::lonnet::symbread();
                     $msg.=&Apache::structuretags::firstaccess_msg($accessmsg,$symb);
+                } elsif ($status eq 'NEED_DIFFERENT_IP') {
+#FIXME
 		} else {
-		    $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
+		    $msg.='<p class="LC_warning">'.&mt('Not open to be viewed').'</p>';
 		}
 		if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
 		    $msg.='The problem '.$accessmsg;
@@ -958,7 +1033,7 @@ sub get_key_todo {
 	    my $classlist=&get_limited_classlist();
 	    if (!&allow_grade_user($classlist->{$uname.':'.$udom})) {
 		return (undef,'not_allowed',
-			&mt('Requested student ([_1]) is in a section you aren\'t allowed to grade.',$uname.':'.$udom));
+			&mt("Requested student ([_1]) is in a section you aren't allowed to grade.",$uname.':'.$udom));
 	    }
 	}
 	my $gradingkey=&encode_queue_key($symb,$udom,$uname);
@@ -1125,13 +1200,13 @@ sub end_Task {
                         $portheader = &mt('Submit Portfolio Files for Grading');
                         $porttext = &mt('Indicate the files from your portfolio to be evaluated in grading this task.');
                     }
-		    $result.="\n".'<p>'.&Apache::lonhtmlcommon::start_pick_box().
+		    $result.="\n".'<div>'.&Apache::lonhtmlcommon::start_pick_box().
 			&Apache::inputtags::file_selector("$version.0",
 							  "bridgetask","*",
 							  'portfolioonly',
                                                           '<h3>'.$portheader.'</h3><br />'.
                                                           $porttext.'<br />').
-			&Apache::lonhtmlcommon::end_pick_box().'</p>';
+			&Apache::lonhtmlcommon::end_pick_box().'</div>';
 		}
 		if (!$previous && $status ne 'SHOW_ANSWER' &&
 		    &show_task($status,$previous)) {
@@ -1214,7 +1289,9 @@ DONEBUTTON
 		}
 		$result.="\n</div>\n".
 		    &Apache::loncommon::end_page({'discussion' => 1});
-	    }
+	    } elsif ($target eq 'answer') {
+                $result.="\n</div>\n";
+            }
 	}
 
 	my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
@@ -1225,7 +1302,7 @@ DONEBUTTON
 	} elsif (defined($Apache::lonhomework::history{"resource.$version.0.checkedin.slot"})) {
 	    $queue_data{'slot'} = $Apache::lonhomework::history{"resource.$version.0.checkedin.slot"};
 	}
-	
+
 
 	if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous
 	    && $status eq 'CAN_ANSWER') {
@@ -1367,7 +1444,7 @@ DONEBUTTON
             if ($canstore) {
 	        &Apache::structuretags::finalize_storage();
                 my @interval = &Apache::lonnet::EXT("resource.0.interval");
-                if ($interval[0] =~ /^\d+$/ && $interval[1] eq 'resource') {
+                if ($interval[0] =~ /^\d+/ && $interval[1] eq 'resource') {
                     my $key=$courseid."\0".$symb;
                     my %times=&Apache::lonnet::get('firstaccesstimes',
                                                    [$key],$domain,$name);
@@ -1756,7 +1833,7 @@ sub show_queue {
 		    $result.=(<<FORM);
 <td>$status</td>
 <td>
-<form style="display: inline" method="post">
+<form style="display: inline" method="post" action="">
  <input type="hidden" name="gradingkey" value="$ekey" />
  <input type="hidden" name="queue" value="$queue" />
  <input type="hidden" name="gradingaction" value="$action" />
@@ -2175,7 +2252,7 @@ sub select_user {
 	    $result.=&Apache::loncommon::start_data_table_row();
 	    $result.=<<RESULT;
   <td>
-    <form style="display: inline" method="post">
+    <form style="display: inline" method="post" action="">
       <input type="hidden" name="gradingkey" value="$todo" />
       <input type="hidden" name="queue" value="$queue" />
       <input type="hidden" name="webgrade" value="no" />