--- loncom/homework/lonhomework.pm	2003/09/19 20:29:29	1.150
+++ loncom/homework/lonhomework.pm	2004/04/16 19:10:27	1.173
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.150 2003/09/19 20:29:29 albertel Exp $
+# $Id: lonhomework.pm,v 1.173 2004/04/16 19:10:27 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -24,11 +24,7 @@
 # /home/httpd/html/adm/gpl.txt
 #
 # http://www.lon-capa.org/
-#
-# Guy Albertelli
-# 11/30 Gerd Kortemeyer
-# 6/1,8/17,8/18 Gerd Kortemeyer
-# 7/18 Jeremy Bowers
+
 
 package Apache::lonhomework;
 use strict;
@@ -51,6 +47,7 @@ use Apache::externalresponse();
 use Apache::rankresponse();
 use Apache::matchresponse();
 use Apache::chemresponse();
+use Apache::drawimage();
 use Apache::Constants qw(:common);
 use HTML::Entities();
 use Apache::loncommon();
@@ -147,6 +144,51 @@ sub send_footer {
 
 $Apache::lonxml::browse='';
 
+sub check_ip_acc {
+    my ($acc)=@_;
+    if (!defined($acc) || $acc =~ /^\s*$/) { return 1; }
+    my $allowed=0;
+    my $ip=$ENV{'REMOTE_ADDR'};
+    my $name;
+    foreach my $pattern (split(',',$acc)) {
+	if ($pattern =~ /\*$/) {
+	    #35.8.*
+	    $pattern=~s/\*//;
+	    if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
+	} elsif ($pattern =~ /(\d+\.\d+\.\d+)\.\[(\d+)-(\d+)\]$/) {    
+	    #35.8.3.[34-56]
+	    my $low=$2;
+	    my $high=$3;
+	    $pattern=$1;
+	    if ($ip =~ /^\Q$pattern\E/) { 
+		my $last=(split(/\./,$ip))[3];
+		if ($last <=$high && $last >=$low) { $allowed=1; }
+	    }
+	} elsif ($pattern =~ /^\*/) {
+	    #*.msu.edu
+	    $pattern=~s/\*//;
+	    if (!defined($name)) {
+		use Socket;
+		my $netaddr=inet_aton($ip);
+		($name)=gethostbyaddr($netaddr,AF_INET);
+	    }
+	    if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
+	} elsif ($pattern =~ /\d+\.\d+\.\d+\.\d+/) {
+	    #127.0.0.1
+	    if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
+	} else {
+	    #some.name.com
+	    if (!defined($name)) {
+		use Socket;
+		my $netaddr=inet_aton($ip);
+		($name)=gethostbyaddr($netaddr,AF_INET);
+	    }
+	    if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
+	}
+	if ($allowed) { last; }
+    }
+    return $allowed;
+}
 # JB, 9/24/2002: Any changes in this function may require a change
 # in lonnavmaps::resource::getDateStatus.
 sub check_access {
@@ -160,64 +202,87 @@ sub check_access {
     my $passed;
 
     if ($ENV{'request.state'} eq "construct") {
+	if ($ENV{'form.problemstate'}) {
+	    if ($ENV{'form.problemstate'} =~ /^CANNOT_ANSWER/) {
+		if ( ! ($ENV{'form.problemstate'} eq 'CANNOT_ANSWER_correct' &&
+			lc($Apache::lonhomework::problemstatus) eq 'no')) {
+		    return ('CANNOT_ANSWER',
+			    &mt('is in this state by royal decree.'));
+		}
+	    } else {
+		return ($ENV{'form.problemstate'},
+			&mt('is in this state by royal decree.'));
+	    }
+	}
 	&Apache::lonxml::debug("in construction ignoring dates");
 	$status='CAN_ANSWER';
 	$datemsg=&mt('is in under construction');
-	return ($status,$datemsg);
+#	return ($status,$datemsg);
     }
 
     &Apache::lonxml::debug("checking for part :$id:");
     &Apache::lonxml::debug("time:".time);
-    foreach $temp ("opendate","duedate","answerdate") {
-	$lastdate = $date;
-	$date = &Apache::lonnet::EXT("resource.$id.$temp");
-	my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type");
-	if ($thistype =~ /^(con_lost|no_such_host)/ ||
-	    $date     =~ /^(con_lost|no_such_host)/) {
-	    $status='UNAVAILABLE';
-	    $date=&mt("may open later.");
+
+    if ($ENV{'request.state'} ne "construct") {
+	my $allowed=&check_ip_acc(&Apache::lonnet::EXT("resource.$id.acc"));
+	if (!$allowed && ($Apache::lonhomework::browse ne 'F')) {
+	    $status='INVALID_ACCESS';
+	    $date=&mt("can not be accessed from your location.");
 	    return($status,$date);
 	}
-	if ($thistype eq 'date_interval') {
-	    if ($temp eq 'opendate') {
-		$date=&Apache::lonnet::EXT("resource.$id.duedate")-$date;
-	    }
-	    if ($temp eq 'answerdate') {
-		$date=&Apache::lonnet::EXT("resource.$id.duedate")+$date;
+	
+	foreach $temp ("opendate","duedate","answerdate") {
+	    $lastdate = $date;
+	    $date = &Apache::lonnet::EXT("resource.$id.$temp");
+	    my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type");
+	    if ($thistype =~ /^(con_lost|no_such_host)/ ||
+		$date     =~ /^(con_lost|no_such_host)/) {
+		$status='UNAVAILABLE';
+		$date=&mt("may open later.");
+		return($status,$date);
+	    }
+	    if ($thistype eq 'date_interval') {
+		if ($temp eq 'opendate') {
+		    $date=&Apache::lonnet::EXT("resource.$id.duedate")-$date;
+		}
+		if ($temp eq 'answerdate') {
+		    $date=&Apache::lonnet::EXT("resource.$id.duedate")+$date;
+		}
 	    }
+	    &Apache::lonxml::debug("found :$date: for :$temp:");
+	    if ($date eq '') {
+		$date = &mt("an unknown date"); $passed = 0;
+	    } elsif ($date eq 'con_lost') {
+		$date = &mt("an indeterminate date"); $passed = 0;
+	    } else {
+		if (time < $date) { $passed = 0; } else { $passed = 1; }
+		$date = localtime $date;
+	    }
+	    if (!$passed) { $type=$temp; last; }
 	}
-	&Apache::lonxml::debug("found :$date: for :$temp:");
-	if ($date eq '') {
-	    $date = &mt("an unknown date"); $passed = 0;
-	} elsif ($date eq 'con_lost') {
-	    $date = &mt("an indeterminate date"); $passed = 0;
-	} else {
-	    if (time < $date) { $passed = 0; } else { $passed = 1; }
-	    $date = localtime $date;
+	&Apache::lonxml::debug("have :$type:$passed:");
+	if ($passed) {
+	    $status='SHOW_ANSWER';
+	    $datemsg=$date;
+	} elsif ($type eq 'opendate') {
+	    $status='CLOSED';
+	    $datemsg = &mt("will open on")." $date";
+	} elsif ($type eq 'duedate') {
+	    $status='CAN_ANSWER';
+	    $datemsg = &mt("is due at")." $date";
+	} elsif ($type eq 'answerdate') {
+	    $status='CLOSED';
+	    $datemsg = &mt("was due on")." $lastdate".&mt(", and answers will be available on")." $date";
 	}
-	if (!$passed) { $type=$temp; last; }
-    }
-    &Apache::lonxml::debug("have :$type:$passed:");
-    if ($passed) {
-	$status='SHOW_ANSWER';
-	$datemsg=$date;
-    } elsif ($type eq 'opendate') {
-	$status='CLOSED';
-	$datemsg = &mt("will open on")." $date";
-    } elsif ($type eq 'duedate') {
-	$status='CAN_ANSWER';
-	$datemsg = &mt("is due at")." $date";
-    } elsif ($type eq 'answerdate') {
-	$status='CLOSED';
-	$datemsg = &mt("was due on")." $lastdate".&mt(", and answers will be available on")." $date";
     }
     if ($status eq 'CAN_ANSWER') {
 	#check #tries, and if correct.
 	my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
 	my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
 	if ( $tries eq '' ) { $tries = '0'; }
-	if ( $maxtries eq '' ) { $maxtries = '2'; } 
-	if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }
+	if ( $maxtries eq '' && 
+	     $ENV{'request.state'} ne 'construct') { $maxtries = '2'; } 
+	if ($maxtries && $tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }
 	# if (correct and show prob status) or excused then CANNOT_ANSWER
 	if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/
 	    &&
@@ -307,11 +372,10 @@ sub setuppermissions {
 sub setupheader {
     my $request=$_[0];
     if ($ENV{'browser.mathml'}) {
-	$request->content_type('text/xml');
+	&Apache::loncommon::content_type($request,'text/xml');
     } else {
-	$request->content_type('text/html');
+	&Apache::loncommon::content_type($request,'text/html');
     }
-    $request->content_encoding('UTF-8');
     if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) {
 	&Apache::loncommon::no_cache($request);
     }
@@ -327,35 +391,37 @@ sub handle_save_or_undo {
     my $filetmp =$file.".tmp";
     my $error=0;
 
+    &Apache::lonnet::correct_line_ends($result);
+
     if ($ENV{'form.Undo'} eq &mt('undo')) {
 	my $error=0;
 	if (!copy($file,$filetmp)) { $error=1; }
 	if ((!$error) && (!copy($filebak,$file))) { $error=1; }
 	if ((!$error) && (!move($filetmp,$filebak))) { $error=1; }
 	if (!$error) {
-	    $request->print("<p><b>".&mt("Undid changes, Switched")." $filebak ".&mt("and")." $file</b></p>");
+	    &Apache::lonxml::info("<p><b>".&mt("Undid changes, Switched")." $filebak ".&mt("and")." $file</b></p>");
 	} else {
-	    $request->print("<p><font color=\"red\" size=\"+1\"><b>".&mt("Unable to undo, unable to switch")." $filebak ".&mt("and")." $file</b></font></p>");
+	    &Apache::lonxml::info("<p><font color=\"red\" size=\"+1\"><b>".&mt("Unable to undo, unable to switch")." $filebak ".&mt("and")." $file</b></font></p>");
 	    $error=1;
 	}
     } else {
 	my $fs=Apache::File->new(">$filebak");
 	if (defined($fs)) {
 	    print $fs $$problem;
-	    $request->print("<b>".&mt("Making Backup to").
-			    " $filebak</b><br />");
+	    &Apache::lonxml::info("<b>".&mt("Making Backup to").
+				  " $filebak</b>");
 	} else {
-	    $request->print("<font color=\"red\" size=\"+1\"><b>".&mt("Unable to make backup")." $filebak</b></font>");
+	    &Apache::lonxml::info("<font color=\"red\" size=\"+1\"><b>".&mt("Unable to make backup")." $filebak</b></font>");
 	    $error=2;
 	}
 	my $fh=Apache::File->new(">$file");
 	if (defined($fh)) {
 	    print $fh $$result;
-	    $request->print("<b>".&mt("Saving Modifications to").
-			    " $file</b><br />");
+	    &Apache::lonxml::info("<b>".&mt("Saving Modifications to").
+				  " $file</b>");
 	} else {
-	    $request->print("<font color=\"red\" size=\"+1\"><b>".
-			    &mt("Unable to write to")." $file</b></font>");
+	    &Apache::lonxml::info("<font color=\"red\" size=\"+1\"><b>".
+				  &mt("Unable to write to")." $file</b></font>");
 	    $error|=4;
 	}
     }
@@ -366,7 +432,7 @@ sub analyze_header {
     my ($request) = @_;
     my $result.='<html>
             <head><title>'.&mt("Analyzing a problem").'</title></head>
-            <body bgcolor="#FFFFFF">
+            <body bgcolor="#FFFFFF">'.&Apache::lonxml::message_location().'
             <form name="lonhomework" method="POST" action="'.
 	    $ENV{'request.uri'}.'">
             <input type="submit" name="problemmode" value="'.&mt("EditXML").'" />
@@ -376,6 +442,7 @@ sub analyze_header {
             <hr />
             '.&mt('List of possible answers').':
             </form>';
+    &Apache::lonxml::add_messages(\$result);
     $request->print($result);
     $request->rflush();
 }
@@ -440,12 +507,12 @@ sub analyze {
 	    }
 	    $request->print('</table>');
 	} else {
-	    $request->print('<p>'.&mt('Part').' '.$part.' '.
+	    $request->print('<p>'.&mt('Response').' '.$part.' '.
 			    &mt('is not analyzable at this time').'</p>');
 	}
     }
     if (scalar(keys(%allparts)) == 0 ) {
-	$request->print('<p>'.&mt('Found no analyzable parts in this problem, currently only Numerical, Formula and String response styles are supported.').'</p>');
+	$request->print('<p>'.&mt('Found no analyzable respones in this problem, currently only Numerical, Formula and String response styles are supported.').'</p>');
     }
     &Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state);
     &analyze_footer($request);
@@ -474,26 +541,32 @@ sub editxmlmode {
 	&renderpage($request,$file);
     } else {
 	my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
-	my $xml_help = Apache::loncommon::helpLatexCheatsheet("Problem_Editor_XML_Index",
-							      "Problem Editing Help");
+	my $xml_help = '<table><tr><td>'.
+	    &Apache::loncommon::helpLatexCheatsheet("Problem_Editor_XML_Index",
+						    "Problem Editing Help").
+						    '</td><td>'.
+       &Apache::loncommon::help_open_faq(5).
+       &Apache::loncommon::help_open_bug('Authoring').'</td></tr></table>';
 	if ($cols > 80) { $cols = 80; }
 	if ($cols < 70) { $cols = 70; }
 	if ($rows < 20) { $rows = 20; }
-	$result.='<html><body bgcolor="#FFFFFF">
+	$result.='<html><body bgcolor="#FFFFFF">'.
+	    &Apache::lonxml::message_location().'
             <form name="lonhomework" method="POST" action="'.
 	    $ENV{'request.uri'}.'">
             <input type="hidden" name="problemmode" value="'.&mt('EditXML').'" />
-            <input type="submit" name="problemmode" value="'.&mt('Discard Edits and View').'" />
-            <input type="submit" name="problemmode" value="'.&mt('Edit').'" />
+            <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
+            <input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />
             <hr />
-            <input type="submit" name="submit" value="'.&mt('Submit Changes').'" />
-            <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" />
-            <input type="submit" name="Undo" value="'.&mt('undo').'" />
+            <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" />
+            <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" />
+            <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
             <hr />
             ' . $xml_help . '
             <textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
-	    &HTML::Entities::encode($problem).'</textarea>
+	    &HTML::Entities::encode($problem,'<>&"').'</textarea>
             </form></body></html>';
+	&Apache::lonxml::add_messages(\$result);
 	$request->print($result);
     }
     return '';
@@ -503,7 +576,9 @@ sub renderpage {
     my ($request,$file) = @_;
 
     my (@targets) = &get_target();
+    &Apache::lonhomework::showhashsubset(\%ENV,'form.');
     &Apache::lonxml::debug("Running targets ".join(':',@targets));
+    my $overall_result;
     foreach my $target (@targets) {
 	#my $t0 = [&gettimeofday()];
 	my $problem=&Apache::lonnet::getfile($file);
@@ -535,12 +610,16 @@ sub renderpage {
 	    #$result =~ s:</body>::;
 	    #$result.="<br />Spent $td seconds processing target $target\n</body>";
 	    #}
-	    $request->print($result);
-	    $request->rflush();
+#	    $request->print($result);
+	    $overall_result.=$result;
+#	    $request->rflush();
 	}
 	#$request->print(":Result ends");
 	#my $td=&tv_interval($t0);
     }
+    &Apache::lonxml::add_messages(\$overall_result);
+    $request->print($overall_result);   
+    $request->rflush();   
 }
 
 # with no arg it returns a HTML <option> list of the template titles
@@ -590,12 +669,15 @@ sub newproblem {
 	&renderpage($request,$dest);
     } else {
 	my $url=$request->uri;
+	my $shownurl=$url;
+	$shownurl=~s-^/~-/priv/-;
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
 	my $errormsg;
 	if ($ENV{'form.newfile'}) {
 	    $errormsg='<p><font color="red">'.&mt('You did not select a template.').'</font></p>'."\n";
 	}
 	my $instructions;
+	my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
 	if ($templatelist) { $instructions=&mt(", select a template from the pull-down menu below.").'<br />'.&mt("Then");}
 	my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new',
 			  'resource' => 'resource',
@@ -606,10 +688,10 @@ sub newproblem {
 			  'Create' => 'Create',
 			  'button' => 'button');
 	$request->print(<<ENDNEWPROBLEM);
-<body bgcolor="#FFFFFF">
+$bodytag
 <h1>$lt{'create'} $extension $lt{'resource'}</h1>
 $errormsg
-$lt{'requested'} <tt>$url</tt> $lt{'not exist'}.
+$lt{'requested'} <tt>$shownurl</tt> $lt{'not exist'}.
 <p>
 <b>$lt{'createnew'} $extension$instructions $lt{'click'} "$lt{'Create'} $extension" $lt{'button'}.</b>
 </p>
@@ -635,8 +717,8 @@ sub view_or_edit_menu {
     $request->print(<<EDITMENU);
 <body bgcolor="#FFFFFF">
 <form action="$url" method="POST">
-$lt{'would'} <input type="submit" name="problemmode" value="&lt{'view'}">
-&lt{'or'} <input type="submit" name="problemmode" value="&lt{'Edit'}">
+$lt{'would'} <input type="submit" name="problemmode" accesskey="v" value="&lt{'view'}">
+&lt{'or'} <input type="submit" name="problemmode" accesskey="e" value="&lt{'Edit'}">
 &lt{'the problem'}.
 </form>
 </body>
@@ -648,7 +730,6 @@ sub handler {
     my $request=$_[0];
     
     $Apache::lonxml::debug=$ENV{'user.debug'};
-
     if (&setupheader($request)) { return OK; }
     $ENV{'request.uri'}=$request->uri;
 
@@ -672,7 +753,8 @@ sub handler {
     #check if we know where we are
     if ($ENV{'request.course.fn'} && !&Apache::lonnet::symbread()) { 
 	# if we are browsing we might not be able to know where we are
-	if ($Apache::lonhomework::browse ne 'F') {
+	if ($Apache::lonhomework::browse ne 'F' && 
+	    $ENV{'request.state'} ne "construct") {
 	    #should know where we are, so ask
 	    if ( &Apache::lonnet::mod_perl_version() == 2 ) {
 		&Apache::lonnet::cleanenv();